Merge pull request #13670 from terraform-providers/ap_unparam_linting…

…_expandApiGatewayMethodParametersOperations tech-debt/structure: remove always nil param from expandApiGatewayMethodParametersOperations func
hashicorp · Jun 12, 2020 · a56cfac · a56cfac
2 parents 7c24737 + e779859
commit a56cfac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/aws/resource_aws_api_gateway_method.go b/aws/resource_aws_api_gateway_method.go
@@ -234,10 +234,7 @@ func resourceAwsApiGatewayMethodUpdate(d *schema.ResourceData, meta interface{})
 				parameters[k] = value
 			}
 		}
-		ops, err := expandApiGatewayMethodParametersOperations(d, "request_parameters", "requestParameters")
-		if err != nil {
-			return err
-		}
+		ops := expandApiGatewayMethodParametersOperations(d, "request_parameters", "requestParameters")
 		operations = append(operations, ops...)
 	}
 

diff --git a/aws/resource_aws_api_gateway_method_response.go b/aws/resource_aws_api_gateway_method_response.go
@@ -172,10 +172,7 @@ func resourceAwsApiGatewayMethodResponseUpdate(d *schema.ResourceData, meta inte
 	}
 
 	if d.HasChange("response_parameters") {
-		ops, err := expandApiGatewayMethodParametersOperations(d, "response_parameters", "responseParameters")
-		if err != nil {
-			return err
-		}
+		ops := expandApiGatewayMethodParametersOperations(d, "response_parameters", "responseParameters")
 		operations = append(operations, ops...)
 	}
 

diff --git a/aws/structure.go b/aws/structure.go
@@ -1916,7 +1916,7 @@ func deprecatedExpandApiGatewayMethodParametersJSONOperations(d *schema.Resource
 	return operations, nil
 }
 
-func expandApiGatewayMethodParametersOperations(d *schema.ResourceData, key string, prefix string) ([]*apigateway.PatchOperation, error) {
+func expandApiGatewayMethodParametersOperations(d *schema.ResourceData, key string, prefix string) []*apigateway.PatchOperation {
 	operations := make([]*apigateway.PatchOperation, 0)
 
 	oldParameters, newParameters := d.GetChange(key)
@@ -1966,7 +1966,7 @@ func expandApiGatewayMethodParametersOperations(d *schema.ResourceData, key stri
 		}
 	}
 
-	return operations, nil
+	return operations
 }
 
 func expandCloudWatchLogMetricTransformations(m map[string]interface{}) []*cloudwatchlogs.MetricTransformation {