Merge pull request #58 from shwstppr/fix-api-nestedresponse

generate: fix for nested api response

Author: Marcus Sorensen

cloudstack/CloudIdentifierService.go

@@ -75,10 +75,13 @@ func (s *CloudIdentifierService) GetCloudIdentifier(p *GetCloudIdentifierParams)
 		return nil, err
 	}
 
-	var r GetCloudIdentifierResponse
-	if err := json.Unmarshal(resp, &r); err != nil {
+	var nested struct {
+		Response GetCloudIdentifierResponse `json:"cloudidentifier"`
+	}
+	if err := json.Unmarshal(resp, &nested); err != nil {
 		return nil, err
 	}
+	r := nested.Response
 
 	return &r, nil
 }

cloudstack/KubernetesService.go

@@ -874,10 +874,13 @@ func (s *KubernetesService) GetKubernetesClusterConfig(p *GetKubernetesClusterCo
 		return nil, err
 	}
 
-	var r GetKubernetesClusterConfigResponse
-	if err := json.Unmarshal(resp, &r); err != nil {
+	var nested struct {
+		Response GetKubernetesClusterConfigResponse `json:"clusterconfig"`
+	}
+	if err := json.Unmarshal(resp, &nested); err != nil {
 		return nil, err
 	}
+	r := nested.Response
 
 	return &r, nil
 }

cloudstack/RoleService.go

@@ -151,10 +151,13 @@ func (s *RoleService) CreateRole(p *CreateRoleParams) (*CreateRoleResponse, erro
 		return nil, err
 	}
 
-	var r CreateRoleResponse
-	if err := json.Unmarshal(resp, &r); err != nil {
+	var nested struct {
+		Response CreateRoleResponse `json:"role"`
+	}
+	if err := json.Unmarshal(resp, &nested); err != nil {
 		return nil, err
 	}
+	r := nested.Response
 
 	return &r, nil
 }
@@ -271,10 +274,13 @@ func (s *RoleService) CreateRolePermission(p *CreateRolePermissionParams) (*Crea
 		return nil, err
 	}
 
-	var r CreateRolePermissionResponse
-	if err := json.Unmarshal(resp, &r); err != nil {
+	var nested struct {
+		Response CreateRolePermissionResponse `json:"rolepermission"`
+	}
+	if err := json.Unmarshal(resp, &nested); err != nil {
 		return nil, err
 	}
+	r := nested.Response
 
 	return &r, nil
 }

cloudstack/VolumeService.go

@@ -1247,10 +1247,13 @@ func (s *VolumeService) GetPathForVolume(p *GetPathForVolumeParams) (*GetPathFor
 		return nil, err
 	}
 
-	var r GetPathForVolumeResponse
-	if err := json.Unmarshal(resp, &r); err != nil {
+	var nested struct {
+		Response GetPathForVolumeResponse `json:"apipathforvolume"`
+	}
+	if err := json.Unmarshal(resp, &nested); err != nil {
 		return nil, err
 	}
+	r := nested.Response
 
 	return &r, nil
 }

generate/generate.go

@@ -78,6 +78,11 @@ var mapRequireList = map[string]map[string]bool{
 var nestedResponse = map[string]string{
 	"getUploadParamsForTemplate": "getuploadparams",
 	"getUploadParamsForVolume":   "getuploadparams",
+	"createRole":                 "role",
+	"createRolePermission":       "rolepermission",
+	"getCloudIdentifier":         "cloudidentifier",
+	"getKubernetesClusterConfig": "clusterconfig",
+	"getPathForVolume":           "apipathforvolume",
 }
 
 // longToStringConvertedParams is a prefilled map with the list of

test/testdata/KubernetesService.json

@@ -363,5 +363,14 @@
           }
         ]
       }
+    },
+    "getKubernetesClusterConfig": {
+      "getkubernetesclusterconfigresponse": {
+        "clusterconfig": {
+          "id": "0ba3e755-940a-467c-a67f-a3404eb13da8",
+          "name": "sample-name",
+          "configdata": "some config data"
+        }
+      }
     }
-  }
+  }