Ensure consistent order of yaml keys in migrateConfig

mislav · mislav · commit 9a5b62800104 · 2020-06-04T12:22:26.000+02:00
diff --git a/internal/config/config_file.go b/internal/config/config_file.go
@@ -108,7 +108,7 @@ func migrateConfig(filename string) error {
 		return err
 	}
 
-	var hosts map[string][]map[string]string
+	var hosts map[string][]yaml.Node
 	err = yaml.Unmarshal(b, &hosts)
 	if err != nil {
 		return fmt.Errorf("error decoding legacy format: %w", err)
@@ -119,8 +119,9 @@ func migrateConfig(filename string) error {
 		if len(entries) < 1 {
 			continue
 		}
-		for key, value := range entries[0] {
-			if err := cfg.Set(hostname, key, value); err != nil {
+		mapContent := entries[0].Content
+		for i := 0; i < len(mapContent)-1; i += 2 {
+			if err := cfg.Set(hostname, mapContent[i].Value, mapContent[i+1].Value); err != nil {
 				return err
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func migrateConfig(filename string) error {`
`108`	`108`	`return err`
`109`	`109`	`}`
`110`	`110`
`111`		`- var hosts map[string][]map[string]string`
	`111`	`+ var hosts map[string][]yaml.Node`
`112`	`112`	`err = yaml.Unmarshal(b, &hosts)`
`113`	`113`	`if err != nil {`
`114`	`114`	`return fmt.Errorf("error decoding legacy format: %w", err)`
`@@ -119,8 +119,9 @@ func migrateConfig(filename string) error {`
`119`	`119`	`if len(entries) < 1 {`
`120`	`120`	`continue`
`121`	`121`	`}`
`122`		`- for key, value := range entries[0] {`
`123`		`- if err := cfg.Set(hostname, key, value); err != nil {`
	`122`	`+ mapContent := entries[0].Content`
	`123`	`+ for i := 0; i < len(mapContent)-1; i += 2 {`
	`124`	`+ if err := cfg.Set(hostname, mapContent[i].Value, mapContent[i+1].Value); err != nil {`
`124`	`125`	`return err`
`125`	`126`	`}`
`126`	`127`	`}`