Send map API types in a predictable order (sorted by key name)

orange-cloudfoundry · Jan 22, 2021 · 96c5f36 · 96c5f36
1 parent 6c49a69
commit 96c5f36
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/cloudstack/ResourcetagsService.go b/cloudstack/ResourcetagsService.go
@@ -25,6 +25,14 @@ import (
 	"strings"
 )
 
+func getSortedKeysFromMap(m map[string]string) (keys []string) {
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return
+}
+
 type CreateTagsParams struct {
 	p map[string]interface{}
 }
@@ -528,12 +536,3 @@ type Tag struct {
 	Resourcetype string `json:"resourcetype"`
 	Value        string `json:"value"`
 }
-
-func getSortedKeysFromMap(m map[string]string) []string {
-	var keys []string
-	for k := range m {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	return keys
-}
diff --git a/generate/generate.go b/generate/generate.go
@@ -844,6 +844,15 @@ func (s *service) GenerateCode() ([]byte, error) {
 		pn("	return json.Unmarshal(resp, result)")
 		pn("}")
 	}
+	if s.name == "ResourcetagsService" {
+		pn("func getSortedKeysFromMap(m map[string]string) (keys []string) {")
+		pn("	for k := range m {")
+		pn("		keys = append(keys, k)")
+		pn("	}")
+		pn("	sort.Strings(keys)")
+		pn("	return")
+		pn("}")
+	}
 
 	for _, a := range s.apis {
 		s.generateParamType(a)