hashicorp · appilon · Jul 13, 2020 · Jun 30, 2020
diff --git a/aws/data_source_aws_iam_role.go b/aws/data_source_aws_iam_role.go
@@ -21,11 +21,6 @@ func dataSourceAwsIAMRole() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"assume_role_policy_document": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Removed:  "Use `assume_role_policy` instead",
-			},
 			"assume_role_policy": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -38,11 +33,6 @@ func dataSourceAwsIAMRole() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"role_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Removed:  "Use `unique_id` instead",
-			},
 			"unique_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -51,11 +41,6 @@ func dataSourceAwsIAMRole() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"role_name": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `name` instead",
-			},
 			"name": {
 				Type:     schema.TypeString,
 				Required: true,

diff --git a/aws/data_source_aws_region.go b/aws/data_source_aws_region.go
@@ -19,13 +19,6 @@ func dataSourceAwsRegion() *schema.Resource {
 				Computed: true,
 			},
 
-			"current": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Computed: true,
-				Removed:  "Defaults to current provider region if no other filtering is enabled",
-			},
-
 			"endpoint": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/aws/resource_aws_api_gateway_api_key.go b/aws/resource_aws_api_gateway_api_key.go
@@ -42,25 +42,6 @@ func resourceAwsApiGatewayApiKey() *schema.Resource {
 				Default:  true,
 			},
 
-			"stage_key": {
-				Type:     schema.TypeSet,
-				Optional: true,
-				Removed:  "Since the API Gateway usage plans feature was launched on August 11, 2016, usage plans are now required to associate an API key with an API stage",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"rest_api_id": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-
-						"stage_name": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-					},
-				},
-			},
-
 			"created_date": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/aws/resource_aws_api_gateway_integration.go b/aws/resource_aws_api_gateway_integration.go
@@ -114,12 +114,6 @@ func resourceAwsApiGatewayIntegration() *schema.Resource {
 				Optional: true,
 			},
 
-			"request_parameters_in_json": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `request_parameters` argument instead",
-			},
-
 			"content_handling": {
 				Type:         schema.TypeString,
 				Optional:     true,

diff --git a/aws/resource_aws_api_gateway_integration_response.go b/aws/resource_aws_api_gateway_integration_response.go
@@ -78,12 +78,6 @@ func resourceAwsApiGatewayIntegrationResponse() *schema.Resource {
 				Optional: true,
 			},
 
-			"response_parameters_in_json": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `response_parameters` argument instead",
-			},
-
 			"content_handling": {
 				Type:         schema.TypeString,
 				Optional:     true,

diff --git a/aws/resource_aws_api_gateway_method.go b/aws/resource_aws_api_gateway_method.go
@@ -90,12 +90,6 @@ func resourceAwsApiGatewayMethod() *schema.Resource {
 				Optional: true,
 			},
 
-			"request_parameters_in_json": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `request_parameters` argument instead",
-			},
-
 			"request_validator_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -216,14 +210,6 @@ func resourceAwsApiGatewayMethodUpdate(d *schema.ResourceData, meta interface{})
 		operations = append(operations, expandApiGatewayRequestResponseModelOperations(d, "request_models", "requestModels")...)
 	}
 
-	if d.HasChange("request_parameters_in_json") {
-		ops, err := deprecatedExpandApiGatewayMethodParametersJSONOperations(d, "request_parameters_in_json", "requestParameters")
-		if err != nil {
-			return err
-		}
-		operations = append(operations, ops...)
-	}
-
 	if d.HasChange("request_parameters") {
 		parameters := make(map[string]bool)
 		var ok bool

diff --git a/aws/resource_aws_api_gateway_method_response.go b/aws/resource_aws_api_gateway_method_response.go
@@ -76,12 +76,6 @@ func resourceAwsApiGatewayMethodResponse() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeBool},
 				Optional: true,
 			},
-
-			"response_parameters_in_json": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `response_parameters` argument instead",
-			},
 		},
 	}
 }

diff --git a/aws/resource_aws_appautoscaling_policy.go b/aws/resource_aws_appautoscaling_policy.go
@@ -102,47 +102,6 @@ func resourceAwsAppautoscalingPolicy() *schema.Resource {
 					},
 				},
 			},
-			"adjustment_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `step_scaling_policy_configuration` configuration block `adjustment_type` argument instead",
-			},
-			"cooldown": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Removed:  "Use `step_scaling_policy_configuration` configuration block `cooldown` argument instead",
-			},
-			"metric_aggregation_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Removed:  "Use `step_scaling_policy_configuration` configuration block `metric_aggregation_type` argument instead",
-			},
-			"min_adjustment_magnitude": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Removed:  "Use `step_scaling_policy_configuration` configuration block `min_adjustment_magnitude` argument instead",
-			},
-			"step_adjustment": {
-				Type:     schema.TypeSet,
-				Optional: true,
-				Removed:  "Use `step_scaling_policy_configuration` configuration block `step_adjustment` configuration block instead",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"metric_interval_lower_bound": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-						"metric_interval_upper_bound": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-						"scaling_adjustment": {
-							Type:     schema.TypeInt,
-							Required: true,
-						},
-					},
-				},
-			},
 			"target_tracking_scaling_policy_configuration": {
 				Type:     schema.TypeList,
 				MaxItems: 1,

diff --git a/aws/resource_aws_appmesh_virtual_node.go b/aws/resource_aws_appmesh_virtual_node.go
@@ -51,14 +51,6 @@ func resourceAwsAppmeshVirtualNode() *schema.Resource {
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"backends": {
-							Type:     schema.TypeSet,
-							Removed:  "Use `backend` configuration blocks instead",
-							Optional: true,
-							Computed: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-
 						"backend": {
 							Type:     schema.TypeSet,
 							Optional: true,
@@ -256,13 +248,6 @@ func resourceAwsAppmeshVirtualNode() *schema.Resource {
 										ConflictsWith: []string{"spec.0.service_discovery.0.aws_cloud_map"},
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
-												"service_name": {
-													Type:     schema.TypeString,
-													Removed:  "Use `hostname` argument instead",
-													Optional: true,
-													Computed: true,
-												},
-
 												"hostname": {
 													Type:         schema.TypeString,
 													Required:     true,

diff --git a/aws/resource_aws_appmesh_virtual_router.go b/aws/resource_aws_appmesh_virtual_router.go
@@ -49,14 +49,6 @@ func resourceAwsAppmeshVirtualRouter() *schema.Resource {
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"service_names": {
-							Type:     schema.TypeSet,
-							Removed:  "Use `aws_appmesh_virtual_service` resources instead",
-							Optional: true,
-							Computed: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-
 						"listener": {
 							Type:     schema.TypeList,
 							Required: true,

diff --git a/aws/resource_aws_autoscaling_policy.go b/aws/resource_aws_autoscaling_policy.go
@@ -71,11 +71,6 @@ func resourceAwsAutoscalingPolicy() *schema.Resource {
 				Optional:     true,
 				ValidateFunc: validation.IntAtLeast(1),
 			},
-			"min_adjustment_step": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Removed:  "Use `min_adjustment_magnitude` argument instead",
-			},
 			"scaling_adjustment": {
 				Type:          schema.TypeInt,
 				Optional:      true,

diff --git a/aws/resource_aws_batch_compute_environment.go b/aws/resource_aws_batch_compute_environment.go
@@ -174,11 +174,6 @@ func resourceAwsBatchComputeEnvironment() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"ecc_cluster_arn": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Removed:  "Use `ecs_cluster_arn` attribute instead",
-			},
 			"ecs_cluster_arn": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go
@@ -38,133 +38,6 @@ func resourceAwsCloudFrontDistribution() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      aliasesHash,
 			},
-			"cache_behavior": {
-				Type:     schema.TypeSet,
-				Optional: true,
-				Removed:  "Use `ordered_cache_behavior` configuration block(s) instead",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"allowed_methods": {
-							Type:     schema.TypeList,
-							Required: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-						"cached_methods": {
-							Type:     schema.TypeList,
-							Required: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-						"compress": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Default:  false,
-						},
-						"default_ttl": {
-							Type:     schema.TypeInt,
-							Optional: true,
-							Default:  86400,
-						},
-						"field_level_encryption_id": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-						"forwarded_values": {
-							Type:     schema.TypeList,
-							Required: true,
-							MaxItems: 1,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"cookies": {
-										Type:     schema.TypeList,
-										Required: true,
-										MaxItems: 1,
-										Elem: &schema.Resource{
-											Schema: map[string]*schema.Schema{
-												"forward": {
-													Type:     schema.TypeString,
-													Required: true,
-												},
-												"whitelisted_names": {
-													Type:     schema.TypeSet,
-													Optional: true,
-													Elem:     &schema.Schema{Type: schema.TypeString},
-												},
-											},
-										},
-									},
-									"headers": {
-										Type:     schema.TypeSet,
-										Optional: true,
-										Elem:     &schema.Schema{Type: schema.TypeString},
-									},
-									"query_string": {
-										Type:     schema.TypeBool,
-										Required: true,
-									},
-									"query_string_cache_keys": {
-										Type:     schema.TypeList,
-										Optional: true,
-										Elem:     &schema.Schema{Type: schema.TypeString},
-									},
-								},
-							},
-						},
-						"lambda_function_association": {
-							Type:     schema.TypeSet,
-							Optional: true,
-							MaxItems: 4,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"event_type": {
-										Type:     schema.TypeString,
-										Required: true,
-									},
-									"lambda_arn": {
-										Type:     schema.TypeString,
-										Required: true,
-									},
-									"include_body": {
-										Type:     schema.TypeBool,
-										Optional: true,
-										Default:  false,
-									},
-								},
-							},
-						},
-						"max_ttl": {
-							Type:     schema.TypeInt,
-							Optional: true,
-							Default:  31536000,
-						},
-						"min_ttl": {
-							Type:     schema.TypeInt,
-							Optional: true,
-							Default:  0,
-						},
-						"path_pattern": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"smooth_streaming": {
-							Type:     schema.TypeBool,
-							Optional: true,
-						},
-						"target_origin_id": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"trusted_signers": {
-							Type:     schema.TypeList,
-							Optional: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-						},
-						"viewer_protocol_policy": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-					},
-				},
-			},
 			"ordered_cache_behavior": {
 				Type:     schema.TypeList,
 				Optional: true,