From 9a5b628001049d4976ce3d77b63816397db3bfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Thu, 4 Jun 2020 12:22:26 +0200 Subject: [PATCH] Ensure consistent order of yaml keys in `migrateConfig` --- internal/config/config_file.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/config/config_file.go b/internal/config/config_file.go index 779980c72..49a2770d3 100644 --- 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 } }