fix(format): sort config map items before output

containrrr · Feb 17, 2021 · 6f2e6b0 · 6f2e6b0
1 parent 3ace8d2
commit 6f2e6b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/format/format_test.go b/pkg/format/format_test.go
@@ -219,7 +219,7 @@ var _ = Describe("the format package", func() {
 					testSetAndFormat(tv, fieldMap["SubPropPtrSlice"], "@diet,@glue", "[ @diet, @glue ]")
 				})
 				It("should format prop struct slices identical to input", func() {
-					testSetAndFormat(tv, fieldMap["StrMap"], "a:1,c:3,b:2", "{ a: 1, b: 2, c: 3 }")
+					testSetAndFormat(tv, fieldMap["StrMap"], "a:1,b:2,c:3", "{ a: 1, b: 2, c: 3 }")
 				})
 			})
 		})

diff --git a/pkg/format/formatter.go b/pkg/format/formatter.go
@@ -515,9 +515,10 @@ func GetConfigFieldString(config reflect.Value, field FieldInfo) (value string,
 		kvPairs := []string{}
 		for _, key := range configField.MapKeys() {
 			value := configField.MapIndex(key).Interface()
-
 			kvPairs = append(kvPairs, fmt.Sprintf("%s:%s", key, value))
 		}
+		// Map key/value-pairs are sorted after concat as it should be identical to sorting the keys before
+		sort.Strings(kvPairs)
 		return strings.Join(kvPairs, ","), nil
 	} else if fieldKind == reflect.Slice || fieldKind == reflect.Array {
 		sliceLen := configField.Len()