Merge branch 'main' into fix/optimize-binary-writer

Author: kyasbal

pkg/core/inspection/metadata/form_metadata.go

@@ -17,6 +17,7 @@ package inspectionmetadata
 import (
 	"fmt"
 	"slices"
+	"strings"
 	"sync"
 
 	"github.com/GoogleCloudPlatform/khi/pkg/common/typedmap"
@@ -148,7 +149,14 @@ func (f *FormFieldSetMetadata) SetField(newField ParameterFormField) error {
 	}
 	f.fields = append(f.fields, newField)
 	slices.SortFunc(f.fields, func(a, b ParameterFormField) int {
-		return GetParameterFormFieldBase(b).Priority - GetParameterFormFieldBase(a).Priority
+		paramBBase := GetParameterFormFieldBase(b)
+		paramABase := GetParameterFormFieldBase(a)
+		priorityDiff := paramBBase.Priority - paramABase.Priority
+		if priorityDiff != 0 {
+			return priorityDiff
+		} else {
+			return strings.Compare(paramABase.ID, paramBBase.ID)
+		}
 	})
 	return nil
 }

pkg/core/inspection/metadata/form_metadata_test.go

@@ -35,10 +35,12 @@ func TestFormFieldSetShouldSortOnAddingNewField(t *testing.T) {
 	fsActual.SetField(fieldWithIdAndPriorityForTest("foo", 1))
 	fsActual.SetField(fieldWithIdAndPriorityForTest("bar", 3))
 	fsActual.SetField(fieldWithIdAndPriorityForTest("qux", 2))
+	fsActual.SetField(fieldWithIdAndPriorityForTest("aqux", 2))
 
 	fsExpected := &FormFieldSetMetadata{
 		fields: []ParameterFormField{
 			fieldWithIdAndPriorityForTest("bar", 3),
+			fieldWithIdAndPriorityForTest("aqux", 2),
 			fieldWithIdAndPriorityForTest("qux", 2),
 			fieldWithIdAndPriorityForTest("foo", 1),
 		},

pkg/task/inspection/googlecloudlogcsm/impl/form_task.go

@@ -26,7 +26,7 @@ import (
 	googlecloudlogcsm_contract "github.com/GoogleCloudPlatform/khi/pkg/task/inspection/googlecloudlogcsm/contract"
 )
 
-const priorityForCSMGroup = googlecloudcommon_contract.FormBasePriority + 30000
+const priorityForCSMGroup = googlecloudcommon_contract.FormBasePriority + 40000
 
 var inputCSMAliasMap gcpqueryutil.SetFilterAliasToItemsMap = map[string][]string{}