From e779859a3c290efa0c8226c600ff002a6d63b6c9 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 8 Jun 2020 15:49:57 -0400 Subject: [PATCH] remove always nil error param from expandApiGatewayMethodParametersOperations func --- aws/resource_aws_api_gateway_method.go | 5 +---- aws/resource_aws_api_gateway_method_response.go | 5 +---- aws/structure.go | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_api_gateway_method.go b/aws/resource_aws_api_gateway_method.go index a8efcafa52b5..bfbe5af1dcb5 100644 --- 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 index 39239eb03ec3..cf8e9319f3f4 100644 --- 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 index 46aa1b877e8a..d481baa7a205 100644 --- 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 {