chore: sort maps by key (#791)

Closes #757 Co-authored-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
eddycharly · Nov 3, 2022 · 59419aa · 59419aa
1 parent 8957125
commit 59419aa
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 7 deletions.
diff --git a/hack/gen-tf-code/templates/schema.tpl b/hack/gen-tf-code/templates/schema.tpl
@@ -286,8 +286,16 @@ func (in map[string]{{ qualifiedName .Elem }}) []interface{} {
 	if in == nil {
 		return nil
 	}
+	keys := make([]string, 0, len(in))
+	for key := range in {
+		keys = append(keys, key)
+	}
+	sort.SliceStable(keys, func(i, j int) bool {
+		return keys[i] < keys[j]
+	})
 	var out []interface{}
-	for key, in := range in {
+	for _, key := range keys {
+	  in := in[key]
 		out = append(out, map[string]interface{}{
 			"key": key,
 			"value": {{ template "flattenElem" .Elem }},

diff --git a/pkg/schemas/kops/DataSource_ClusterSpec.generated.go b/pkg/schemas/kops/DataSource_ClusterSpec.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -1317,8 +1318,16 @@ func FlattenDataSourceClusterSpecInto(in kops.ClusterSpec, out map[string]interf
 					if in == nil {
 						return nil
 					}
+					keys := make([]string, 0, len(in))
+					for key := range in {
+						keys = append(keys, key)
+					}
+					sort.SliceStable(keys, func(i, j int) bool {
+						return keys[i] > keys[j]
+					})
 					var out []interface{}
-					for key, in := range in {
+					for _, key := range keys {
+						in := in[key]
 						out = append(out, map[string]interface{}{
 							"key": key,
 							"value": func(in []string) []interface{} {

diff --git a/pkg/schemas/kops/DataSource_ContainerdConfig.generated.go b/pkg/schemas/kops/DataSource_ContainerdConfig.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -289,8 +290,16 @@ func FlattenDataSourceContainerdConfigInto(in kops.ContainerdConfig, out map[str
 			if in == nil {
 				return nil
 			}
+			keys := make([]string, 0, len(in))
+			for key := range in {
+				keys = append(keys, key)
+			}
+			sort.SliceStable(keys, func(i, j int) bool {
+				return keys[i] > keys[j]
+			})
 			var out []interface{}
-			for key, in := range in {
+			for _, key := range keys {
+				in := in[key]
 				out = append(out, map[string]interface{}{
 					"key": key,
 					"value": func(in []string) []interface{} {

diff --git a/pkg/schemas/kops/DataSource_KubeDNSConfig.generated.go b/pkg/schemas/kops/DataSource_KubeDNSConfig.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	coreschemas "github.com/eddycharly/terraform-provider-kops/pkg/schemas/core"
@@ -277,8 +278,16 @@ func FlattenDataSourceKubeDNSConfigInto(in kops.KubeDNSConfig, out map[string]in
 			if in == nil {
 				return nil
 			}
+			keys := make([]string, 0, len(in))
+			for key := range in {
+				keys = append(keys, key)
+			}
+			sort.SliceStable(keys, func(i, j int) bool {
+				return keys[i] > keys[j]
+			})
 			var out []interface{}
-			for key, in := range in {
+			for _, key := range keys {
+				in := in[key]
 				out = append(out, map[string]interface{}{
 					"key": key,
 					"value": func(in []string) []interface{} {

diff --git a/pkg/schemas/kops/Resource_ClusterSpec.generated.go b/pkg/schemas/kops/Resource_ClusterSpec.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	"k8s.io/kops/pkg/apis/kops"
@@ -1235,8 +1236,16 @@ func FlattenResourceClusterSpecInto(in kops.ClusterSpec, out map[string]interfac
 					if in == nil {
 						return nil
 					}
+					keys := make([]string, 0, len(in))
+					for key := range in {
+						keys = append(keys, key)
+					}
+					sort.SliceStable(keys, func(i, j int) bool {
+						return keys[i] > keys[j]
+					})
 					var out []interface{}
-					for key, in := range in {
+					for _, key := range keys {
+						in := in[key]
 						out = append(out, map[string]interface{}{
 							"key": key,
 							"value": func(in []string) []interface{} {

diff --git a/pkg/schemas/kops/Resource_ContainerdConfig.generated.go b/pkg/schemas/kops/Resource_ContainerdConfig.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -289,8 +290,16 @@ func FlattenResourceContainerdConfigInto(in kops.ContainerdConfig, out map[strin
 			if in == nil {
 				return nil
 			}
+			keys := make([]string, 0, len(in))
+			for key := range in {
+				keys = append(keys, key)
+			}
+			sort.SliceStable(keys, func(i, j int) bool {
+				return keys[i] > keys[j]
+			})
 			var out []interface{}
-			for key, in := range in {
+			for _, key := range keys {
+				in := in[key]
 				out = append(out, map[string]interface{}{
 					"key": key,
 					"value": func(in []string) []interface{} {

diff --git a/pkg/schemas/kops/Resource_KubeDNSConfig.generated.go b/pkg/schemas/kops/Resource_KubeDNSConfig.generated.go
@@ -2,6 +2,7 @@ package schemas
 
 import (
 	"reflect"
+	"sort"
 
 	. "github.com/eddycharly/terraform-provider-kops/pkg/schemas"
 	coreschemas "github.com/eddycharly/terraform-provider-kops/pkg/schemas/core"
@@ -277,8 +278,16 @@ func FlattenResourceKubeDNSConfigInto(in kops.KubeDNSConfig, out map[string]inte
 			if in == nil {
 				return nil
 			}
+			keys := make([]string, 0, len(in))
+			for key := range in {
+				keys = append(keys, key)
+			}
+			sort.SliceStable(keys, func(i, j int) bool {
+				return keys[i] > keys[j]
+			})
 			var out []interface{}
-			for key, in := range in {
+			for _, key := range keys {
+				in := in[key]
 				out = append(out, map[string]interface{}{
 					"key": key,
 					"value": func(in []string) []interface{} {