move the generic helper func to cloudstack file

cloudstack/ResourcetagsService.go

@@ -20,19 +20,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
-	"sort"
 	"strconv"
 	"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{}
 }

cloudstack/cloudstack.go

@@ -428,6 +428,15 @@ func getRawValue(b json.RawMessage) (json.RawMessage, error) {
 	return nil, fmt.Errorf("Unable to extract the raw value from:\n\n%s\n\n", string(b))
 }
 
+// getSortedKeysFromMap returns the keys from m in increasing order.
+func getSortedKeysFromMap(m map[string]string) (keys []string) {
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return
+}
+
 // WithAsyncTimeout takes a custom timeout to be used by the CloudStackClient
 func WithAsyncTimeout(timeout int64) ClientOption {
 	return func(cs *CloudStackClient) {

generate/generate.go

@@ -503,6 +503,15 @@ func (as *allServices) GeneralCode() ([]byte, error) {
 	pn("	return nil, fmt.Errorf(\"Unable to extract the raw value from:\\n\\n%%s\\n\\n\", string(b))")
 	pn("}")
 	pn("")
+	pn("// getSortedKeysFromMap returns the keys from m in increasing order.")
+	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("}")
+	pn("")
 	pn("// WithAsyncTimeout takes a custom timeout to be used by the CloudStackClient")
 	pn("func WithAsyncTimeout(timeout int64) ClientOption {")
 	pn("	return func(cs *CloudStackClient) {")
@@ -832,15 +841,6 @@ 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)