CLI JSON updates (#962)

See Changelog for details.

internal/api/genapi/templates.go

@@ -548,20 +548,6 @@ type {{ .Name }} struct { {{ range .Fields }}
 {{ end }}
 }
 
-{{ if ( or .CreateResponseTypes ( eq .Name "Error" ) ) }}
-func (n {{ .Name }}) ResponseBody() *bytes.Buffer {
-	return n.response.Body
-}
-
-func (n {{ .Name }}) ResponseMap() map[string]interface{} {
-	return n.response.Map
-}
-
-func (n {{ .Name }}) ResponseStatus() int {
-	return n.response.HttpResponse().StatusCode
-}
-{{ end }}
-
 {{ if .CreateResponseTypes }}
 type {{ .Name }}ReadResult struct {
 	Item *{{ .Name }}
@@ -572,12 +558,8 @@ func (n {{ .Name }}ReadResult) GetItem() interface{} {
 	return n.Item
 }
 
-func (n {{ .Name }}ReadResult) GetResponseBody() *bytes.Buffer {
-	return n.response.Body
-}
-
-func (n {{ .Name }}ReadResult) GetResponseMap() map[string]interface{} {
-	return n.response.Map
+func (n {{ .Name }}ReadResult) GetResponse() *api.Response {
+	return n.response
 }
 
 type {{ .Name }}CreateResult = {{ .Name }}ReadResult
@@ -587,12 +569,8 @@ type {{ .Name }}DeleteResult struct {
 	response *api.Response
 }
 
-func (n {{ .Name }}DeleteResult) GetResponseBody() *bytes.Buffer {
-	return n.response.Body
-}
-
-func (n {{ .Name }}DeleteResult) GetResponseMap() map[string]interface{} {
-	return n.response.Map
+func (n {{ .Name }}DeleteResult) GetResponse() *api.Response {
+	return n.response
 }
 
 type {{ .Name }}ListResult struct {
@@ -604,12 +582,8 @@ func (n {{ .Name }}ListResult) GetItems() interface{} {
 	return n.Items
 }
 
-func (n {{ .Name }}ListResult) GetResponseBody() *bytes.Buffer {
-	return n.response.Body
-}
-
-func (n {{ .Name }}ListResult) GetResponseMap() map[string]interface{} {
-	return n.response.Map
+func (n {{ .Name }}ListResult) GetResponse() *api.Response {
+	return n.response
 }
 {{ end }}
 `)))