Merge pull request #7700 from terraform-providers/td-aws_api_gateway_…

…integration_response-remove-deprecated

resource/aws_api-gateway_integration_response: Remove deprecated response_parameters_in_json argument

aws/resource_aws_api_gateway_integration_response.go

@@ -1,16 +1,13 @@
 package aws
 
 import (
- "encoding/json"
  "fmt"
  "log"
  "strings"
- "time"
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/awserr"
  "github.com/aws/aws-sdk-go/service/apigateway"
- "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/helper/schema"
 )
 
@@ -76,17 +73,15 @@ func resourceAwsApiGatewayIntegrationResponse() *schema.Resource {
  },
 
  "response_parameters": {
- Type: schema.TypeMap,
- Elem: &schema.Schema{Type: schema.TypeString},
- Optional: true,
- ConflictsWith: []string{"response_parameters_in_json"},
+ Type: schema.TypeMap,
+ Elem: &schema.Schema{Type: schema.TypeString},
+ Optional: true,
  },
 
  "response_parameters_in_json": {
- Type: schema.TypeString,
- Optional: true,
- ConflictsWith: []string{"response_parameters"},
- Deprecated: "Use field response_parameters instead",
+ Type: schema.TypeString,
+ Optional: true,
+ Removed: "Use `response_parameters` argument instead",
  },
 
  "content_handling": {
@@ -112,11 +107,7 @@ func resourceAwsApiGatewayIntegrationResponseCreate(d *schema.ResourceData, meta
  parameters[k] = v.(string)
  }
  }
- if v, ok := d.GetOk("response_parameters_in_json"); ok {
- if err := json.Unmarshal([]byte(v.(string)), &parameters); err != nil {
- return fmt.Errorf("Error unmarshaling response_parameters_in_json: %s", err)
- }
- }
+
  var contentHandling *string
  if val, ok := d.GetOk("content_handling"); ok {
  contentHandling = aws.String(val.(string))
@@ -173,14 +164,6 @@ func resourceAwsApiGatewayIntegrationResponseRead(d *schema.ResourceData, meta i
  return fmt.Errorf("error setting response_parameters: %s", err)
  }
 
- // KNOWN ISSUE: This next d.Set() is broken as it should be a JSON string of the map,
- // however leaving as-is since this attribute has been deprecated
- // for a very long time and will be removed soon in the next major release.
- // Not worth the effort of fixing, acceptance testing, and potential JSON equivalence bugs.
- if _, ok := d.GetOk("response_parameters_in_json"); ok {
- d.Set("response_parameters_in_json", aws.StringValueMap(integrationResponse.ResponseParameters))
- }
-
  // We need to explicitly convert key = nil values into key = "", which aws.StringValueMap() removes
  responseTemplateMap := make(map[string]string)
  for key, valuePointer := range integrationResponse.ResponseTemplates {
@@ -199,26 +182,20 @@ func resourceAwsApiGatewayIntegrationResponseDelete(d *schema.ResourceData, meta
  conn := meta.(*AWSClient).apigateway
  log.Printf("[DEBUG] Deleting API Gateway Integration Response: %s", d.Id())
 
- return resource.Retry(5*time.Minute, func() *resource.RetryError {
- _, err := conn.DeleteIntegrationResponse(&apigateway.DeleteIntegrationResponseInput{
- HttpMethod: aws.String(d.Get("http_method").(string)),
- ResourceId: aws.String(d.Get("resource_id").(string)),
- RestApiId: aws.String(d.Get("rest_api_id").(string)),
- StatusCode: aws.String(d.Get("status_code").(string)),
- })
- if err == nil {
- return nil
- }
+ _, err := conn.DeleteIntegrationResponse(&apigateway.DeleteIntegrationResponseInput{
+ HttpMethod: aws.String(d.Get("http_method").(string)),
+ ResourceId: aws.String(d.Get("resource_id").(string)),
+ RestApiId: aws.String(d.Get("rest_api_id").(string)),
+ StatusCode: aws.String(d.Get("status_code").(string)),
+ })
 
- apigatewayErr, ok := err.(awserr.Error)
- if apigatewayErr.Code() == "NotFoundException" {
- return nil
- }
+ if isAWSErr(err, apigateway.ErrCodeNotFoundException, "") {
+ return nil
+ }
 
-  if !ok {
-  return resource.NonRetryableError(err)
-  }
+ if err != nil {
+ return fmt.Errorf("error deleting API Gateway Integration Response (%s): %s", d.Id(), err)
+ }
 
- return resource.NonRetryableError(err)
- })
+ return nil
 }

website/docs/r/api_gateway_integration_response.html.markdown

@@ -81,8 +81,7 @@ The following arguments are supported:
  For all other `HTTP` and `AWS` backends, the HTTP status code is matched.
 * `response_templates` - (Optional) A map specifying the templates used to transform the integration response body
 * `response_parameters` - (Optional) A map of response parameters that can be read from the backend response.
- For example: `response_parameters = { "method.response.header.X-Some-Header" = "integration.response.header.X-Some-Other-Header" }`,
-* `response_parameters_in_json` - **Deprecated**, use `response_parameters` instead.
+ For example: `response_parameters = { "method.response.header.X-Some-Header" = "integration.response.header.X-Some-Other-Header" }`
 * `content_handling` - (Optional) Specifies how to handle request payload content type conversions. Supported values are `CONVERT_TO_BINARY` and `CONVERT_TO_TEXT`. If this property is not defined, the response payload will be passed through from the integration response to the method response without modification.
 
 ## Import