Generate account details correctly (accountdetails[0].somekey=someval) (#46)

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

Author: mlsorensen

cloudstack/AccountService.go

@@ -68,9 +68,8 @@ func (p *CreateAccountParams) toURLValues() url.Values {
 	}
 	if v, found := p.p["accountdetails"]; found {
 		m := v.(map[string]string)
-		for i, k := range getSortedKeysFromMap(m) {
-			u.Set(fmt.Sprintf("accountdetails[%d].key", i), k)
-			u.Set(fmt.Sprintf("accountdetails[%d].value", i), m[k])
+		for _, k := range getSortedKeysFromMap(m) {
+			u.Set(fmt.Sprintf("accountdetails[0].%s", k), m[k])
 		}
 	}
 	if v, found := p.p["accountid"]; found {
@@ -2114,9 +2113,8 @@ func (p *UpdateAccountParams) toURLValues() url.Values {
 	}
 	if v, found := p.p["accountdetails"]; found {
 		m := v.(map[string]string)
-		for i, k := range getSortedKeysFromMap(m) {
-			u.Set(fmt.Sprintf("accountdetails[%d].key", i), k)
-			u.Set(fmt.Sprintf("accountdetails[%d].value", i), m[k])
+		for _, k := range getSortedKeysFromMap(m) {
+			u.Set(fmt.Sprintf("accountdetails[0].%s", k), m[k])
 		}
 	}
 	if v, found := p.p["domainid"]; found {

cloudstack/BigSwitchBCFService.go

@@ -237,7 +237,7 @@ func (s *BigSwitchBCFService) NewDeleteBigSwitchBcfDeviceParams(bcfdeviceid stri
 	return p
 }
 
-//  delete a BigSwitch BCF Controller device
+// delete a BigSwitch BCF Controller device
 func (s *BigSwitchBCFService) DeleteBigSwitchBcfDevice(p *DeleteBigSwitchBcfDeviceParams) (*DeleteBigSwitchBcfDeviceResponse, error) {
 	resp, err := s.cs.newRequest("deleteBigSwitchBcfDevice", p.toURLValues())
 	if err != nil {

cloudstack/BrocadeVCSService.go

@@ -218,7 +218,7 @@ func (s *BrocadeVCSService) NewDeleteBrocadeVcsDeviceParams(vcsdeviceid string)
 	return p
 }
 
-//  delete a Brocade VCS Switch
+// delete a Brocade VCS Switch
 func (s *BrocadeVCSService) DeleteBrocadeVcsDevice(p *DeleteBrocadeVcsDeviceParams) (*DeleteBrocadeVcsDeviceResponse, error) {
 	resp, err := s.cs.newRequest("deleteBrocadeVcsDevice", p.toURLValues())
 	if err != nil {

cloudstack/FirewallService.go

@@ -1438,7 +1438,7 @@ func (s *FirewallService) NewDeletePaloAltoFirewallParams(fwdeviceid string) *De
 	return p
 }
 
-//  delete a Palo Alto firewall device
+// delete a Palo Alto firewall device
 func (s *FirewallService) DeletePaloAltoFirewall(p *DeletePaloAltoFirewallParams) (*DeletePaloAltoFirewallResponse, error) {
 	resp, err := s.cs.newRequest("deletePaloAltoFirewall", p.toURLValues())
 	if err != nil {

cloudstack/LoadBalancerService.go

@@ -2582,7 +2582,7 @@ func (s *LoadBalancerService) NewDeleteNetscalerLoadBalancerParams(lbdeviceid st
 	return p
 }
 
-//  delete a netscaler load balancer device
+// delete a netscaler load balancer device
 func (s *LoadBalancerService) DeleteNetscalerLoadBalancer(p *DeleteNetscalerLoadBalancerParams) (*DeleteNetscalerLoadBalancerResponse, error) {
 	resp, err := s.cs.newRequest("deleteNetscalerLoadBalancer", p.toURLValues())
 	if err != nil {

cloudstack/NiciraNVPService.go

@@ -272,7 +272,7 @@ func (s *NiciraNVPService) NewDeleteNiciraNvpDeviceParams(nvpdeviceid string) *D
 	return p
 }
 
-//  delete a nicira nvp device
+// delete a nicira nvp device
 func (s *NiciraNVPService) DeleteNiciraNvpDevice(p *DeleteNiciraNvpDeviceParams) (*DeleteNiciraNvpDeviceResponse, error) {
 	resp, err := s.cs.newRequest("deleteNiciraNvpDevice", p.toURLValues())
 	if err != nil {

generate/generate.go

@@ -54,6 +54,8 @@ var detailsRequireKeyValue = map[string]bool{
 var detailsRequireZeroIndex = map[string]bool{
 	"registerTemplate": true,
 	"updateTemplate":   true,
+	"createAccount":    true,
+	"updateAccount":    true,
 }
 
 var mapRequireList = map[string]map[string]bool{
@@ -1336,8 +1338,12 @@ func (s *service) generateConvertCode(cmd, name, typ string) {
 				pn("	u.Set(fmt.Sprintf(\"%s[%%d].value\", i), m[k])", name)
 			}
 		default:
-			pn("	u.Set(fmt.Sprintf(\"%s[%%d].key\", i), k)", name)
-			pn("	u.Set(fmt.Sprintf(\"%s[%%d].value\", i), m[k])", name)
+			if zeroIndex && !detailsRequireKeyValue[cmd] {
+				pn("	u.Set(fmt.Sprintf(\"%s[0].%%s\", k), m[k])", name)
+			} else {
+				pn("	u.Set(fmt.Sprintf(\"%s[%%d].key\", i), k)", name)
+				pn("	u.Set(fmt.Sprintf(\"%s[%%d].value\", i), m[k])", name)
+			}
 		}
 		pn("}")
 	}