Fix registerTemplate/updateTemplate details map (#44)

Signed-off-by: Marcus Sorensen <[email protected]>

Signed-off-by: Marcus Sorensen <[email protected]>
Co-authored-by: Marcus Sorensen <[email protected]>

Author: mlsorensen

cloudstack/TemplateService.go

@@ -2322,8 +2322,8 @@ func (p *RegisterTemplateParams) toURLValues() url.Values {
 	}
 	if v, found := p.p["details"]; found {
 		m := v.(map[string]string)
-		for i, k := range getSortedKeysFromMap(m) {
-			u.Set(fmt.Sprintf("details[%d].%s", i, k), m[k])
+		for _, k := range getSortedKeysFromMap(m) {
+			u.Set(fmt.Sprintf("details[0].%s", k), m[k])
 		}
 	}
 	if v, found := p.p["directdownload"]; found {
@@ -2906,8 +2906,8 @@ func (p *UpdateTemplateParams) toURLValues() url.Values {
 	}
 	if v, found := p.p["details"]; found {
 		m := v.(map[string]string)
-		for i, k := range getSortedKeysFromMap(m) {
-			u.Set(fmt.Sprintf("details[%d].%s", i, k), m[k])
+		for _, k := range getSortedKeysFromMap(m) {
+			u.Set(fmt.Sprintf("details[0].%s", k), m[k])
 		}
 	}
 	if v, found := p.p["displaytext"]; found {

generate/generate.go

@@ -49,6 +49,13 @@ var detailsRequireKeyValue = map[string]bool{
 	"updateZone":                  true,
 }
 
+// detailsRequireZeroIndex is a prefilled map with a list of details
+// that need to be encoded using zero indexing
+var detailsRequireZeroIndex = map[string]bool{
+	"registerTemplate": true,
+	"updateTemplate":   true,
+}
+
 var mapRequireList = map[string]map[string]bool{
 	"deployVirtualMachine": map[string]bool{
 		"dhcpoptionsnetworklist": true,
@@ -1295,14 +1302,23 @@ func (s *service) generateConvertCode(cmd, name, typ string) {
 		pn("}")
 	case "map[string]string":
 		pn("m := v.(map[string]string)")
-		pn("for i, k := range getSortedKeysFromMap(m) {")
+		zeroIndex := detailsRequireZeroIndex[cmd]
+		if zeroIndex {
+			pn("for _, k := range getSortedKeysFromMap(m) {")
+		} else {
+			pn("for i, k := range getSortedKeysFromMap(m) {")
+		}
 		switch name {
 		case "details":
 			if detailsRequireKeyValue[cmd] {
 				pn("	u.Set(fmt.Sprintf(\"%s[%%d].key\", i), k)", name)
 				pn("	u.Set(fmt.Sprintf(\"%s[%%d].value\", i), m[k])", name)
 			} else {
-				pn("	u.Set(fmt.Sprintf(\"%s[%%d].%%s\", i, k), m[k])", name)
+				if zeroIndex {
+					pn("	u.Set(fmt.Sprintf(\"%s[0].%%s\", k), m[k])", name)
+				} else {
+					pn("	u.Set(fmt.Sprintf(\"%s[%%d].%%s\", i, k), m[k])", name)
+				}
 			}
 		case "serviceproviderlist":
 			pn("	u.Set(fmt.Sprintf(\"%s[%%d].service\", i), k)", name)