Merge pull request #3826 from hashicorp/bugfix/resp-model-unmarshaling

Improve unmarshalling for binary payloads
hashicorp · Feb 23, 2024 · 54ec352 · 54ec352
2 parents 6a68c0b + 857c82e
commit 54ec352
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/tools/data-api/internal/commands/serve.go b/tools/data-api/internal/commands/serve.go
@@ -59,6 +59,10 @@ func (c ServeCommand) Run(args []string) int {
 		serviceNames = pointer.To(strings.Split(serviceNamesRaw, ","))
 	}
 
+	if logLevel := strings.TrimSpace(os.Getenv("LOG_LEVEL")); logLevel != "" {
+		c.Log.SetLevel(hclog.LevelFromString(logLevel))
+	}
+
 	var port int
 	if portVar != 0 {
 		port = portVar

diff --git a/tools/generator-go-sdk/internal/generator/templater_methods.go b/tools/generator-go-sdk/internal/generator/templater_methods.go
@@ -618,11 +618,27 @@ func (c methodsPandoraTemplater) unmarshalerTemplate(data ServiceGeneratorData)
 	result.Model = &model
 `, discriminatedTypeParentName)
 		} else {
-			output = fmt.Sprintf(`
-	if err = resp.Unmarshal(&result.Model); err != nil {
+			responseModelType, err := helpers.GolangTypeForSDKObjectDefinition(*c.operation.ResponseObject, nil)
+			if err != nil {
+				return nil, fmt.Errorf("determing golang type name for response object: %+v", err)
+			}
+			if responseModelType != nil {
+				if c.operation.FieldContainingPaginationDetails != nil {
+					output = fmt.Sprintf(`
+	var model []%s`, *responseModelType)
+				} else {
+					output = fmt.Sprintf(`
+	var model %s`, *responseModelType)
+				}
+				output = fmt.Sprintf(`%s
+	result.Model = &model`, output)
+			}
+			output = fmt.Sprintf(`%s
+
+	if err = resp.Unmarshal(result.Model); err != nil {
 		return
 	}
-`)
+`, output)
 		}
 	}
 

diff --git a/tools/generator-go-sdk/internal/generator/templater_methods_discriminators_test.go b/tools/generator-go-sdk/internal/generator/templater_methods_discriminators_test.go
@@ -106,7 +106,10 @@ func (c pandaClient) Get(ctx context.Context ) (result GetOperationResponse, err
 		return
 	}
 
-	if err = resp.Unmarshal(&result.Model); err != nil {
+	var model PandaPop
+	result.Model = &model
+
+	if err = resp.Unmarshal(result.Model); err != nil {
 		return
 	}
 	return

diff --git a/tools/generator-go-sdk/internal/generator/templater_methods_test.go b/tools/generator-go-sdk/internal/generator/templater_methods_test.go
@@ -75,7 +75,9 @@ func (c pandaClient) Get(ctx context.Context , id PandaPop) (result GetOperation
 		return
 	}
 
-	if err = resp.Unmarshal(&result.Model); err != nil {
+	var model string
+	result.Model = &model
+	if err = resp.Unmarshal(result.Model); err != nil {
 		return
 	}
 
@@ -104,7 +106,7 @@ func TestTemplateMethodsGetAsTextPowerShell(t *testing.T) {
 			Method:              "GET",
 			ResourceIDName:      stringPointer("PandaPop"),
 			ResponseObject: &models.SDKObjectDefinition{
-				Type: models.StringSDKObjectDefinitionType,
+				Type: models.RawFileSDKObjectDefinitionType,
 			},
 		},
 		operationName: "Get",
@@ -118,7 +120,7 @@ func TestTemplateMethodsGetAsTextPowerShell(t *testing.T) {
 type GetOperationResponse struct {
 	HttpResponse *http.Response
 	OData *odata.OData
-	Model *string
+	Model *[]byte
 }
 
 // Get ...
@@ -147,7 +149,9 @@ func (c pandaClient) Get(ctx context.Context , id PandaPop) (result GetOperation
 		return
 	}
 
-	if err = resp.Unmarshal(&result.Model); err != nil {
+	var model []byte
+	result.Model = &model
+	if err = resp.Unmarshal(result.Model); err != nil {
 		return
 	}