Merge branch 'master' into td-vpc-keyvaluetags

.golangci.yml

@@ -21,7 +21,7 @@ linters:
 
 linters-settings:
   errcheck:
-    ignore: github.com/hashicorp/terraform/helper/schema:ForceNew|Set,fmt:.*,io:Close
+    ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
 
 run:
   deadline: 5m

.hashibot.hcl

@@ -8,6 +8,30 @@ queued_behavior "release_commenter" "releases" {
   EOF
 }
 
+behavior "deprecated_import_commenter" "hashicorp_terraform" {
+  import_regexp = "github.com/hashicorp/terraform/"
+  marker_label  = "terraform-plugin-sdk-migration"
+
+  message = <<-EOF
+    Hello, and thank you for your contribution!
+
+    This project recently migrated to the [standalone Terraform Plugin SDK](https://www.terraform.io/docs/extend/plugin-sdk.html). While the migration helps speed up future feature requests and bug fixes to the Terraform AWS Provider's interface with Terraform, it has the unfortunate consequence of requiring minor changes to pull requests created using the old SDK.
+
+    This pull request appears to include the Go import path `${var.import_path}`, which was from the older SDK. The newer SDK uses import paths beginning with `github.com/hashicorp/terraform-plugin-sdk/`.
+
+    To resolve this situation without losing any existing work, you may be able to Git rebase your branch against the current master branch (example below); replacing any remaining old import paths with the newer ones.
+
+    ```console
+    $ git fetch --all
+    $ git rebase origin/master
+    ```
+
+    Another option is to create a new branch from the current master with the same code changes (replacing the import paths), submit a new pull request, and close this existing pull request.
+
+    We apologize for this inconvenience and appreciate your effort. Thank you for contributing and helping make the Terraform AWS Provider better for everyone.
+  EOF
+}
+
 # Catch the following in issues:
 # *aws_XXX
 # * aws_XXX
@@ -456,13 +480,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     # label services
     "service/acm" = [
       "**/*_acm_*",
-      "**/acm_*",
-      "aws/tagsACM*"
+      "**/acm_*"
     ]
     "service/acmpca" = [
       "**/*_acmpca_*",
-      "**/acmpca_*",
-      "aws/tagsACMPCA*"
+      "**/acmpca_*"
     ]
     "service/alexaforbusiness" = [
       "**/*_alexaforbusiness_*",
@@ -474,13 +496,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/apigateway" = [
       "**/*_api_gateway_[^v][^2][^_]*",
-      "**/api_gateway_[^v][^2][^_]*",
-      "aws/tags_apigateway[^v][^2]*"
+      "**/api_gateway_[^v][^2][^_]*"
     ]
     "service/apigatewayv2" = [
       "**/*_api_gateway_v2_*",
-      "**/api_gateway_v2_*",
-      "aws/tags_apigatewayv2*"
+      "**/api_gateway_v2_*"
     ]
     "service/applicationautoscaling" = [
       "**/*_appautoscaling_*",
@@ -542,8 +562,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/cloudfront" = [
       "**/*_cloudfront_*",
-      "**/cloudfront_*",
-      "aws/tagsCloudFront*"
+      "**/cloudfront_*"
     ]
     "service/cloudhsmv2" = [
       "**/*_cloudhsm_v2_*",
@@ -555,8 +574,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/cloudtrail" = [
       "**/*_cloudtrail_*",
-      "**/cloudtrail_*",
-      "aws/tagsCloudtrail*"
+      "**/cloudtrail_*"
     ]
     "service/cloudwatch" = [
       "**/*_cloudwatch_dashboard*",
@@ -574,8 +592,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/codebuild" = [
       "**/*_codebuild_*",
-      "**/codebuild_*",
-      "aws/tagsCodeBuild*"
+      "**/codebuild_*"
     ]
     "service/codecommit" = [
       "**/*_codecommit_*",
@@ -603,8 +620,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/databasemigrationservice" = [
       "**/*_dms_*",
-      "**/dms_*",
-      "aws/tags_dms*"
+      "**/dms_*"
     ]
     "service/datapipeline" = [
       "**/*_datapipeline_*",
@@ -616,22 +632,19 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/dax" = [
       "**/*_dax_*",
-      "**/dax_*",
-      "aws/tagsDAX*"
+      "**/dax_*"
     ]
     "service/devicefarm" = [
       "**/*_devicefarm_*",
       "**/devicefarm_*"
     ]
     "service/directconnect" = [
       "**/*_dx_*",
-      "**/dx_*",
-      "aws/tagsDX*"
+      "**/dx_*"
     ]
     "service/directoryservice" = [
       "**/*_directory_service_*",
-      "**/directory_service_*",
-      "aws/tagsDS*"
+      "**/directory_service_*"
     ]
     "service/dlm" = [
       "**/*_dlm_*",
@@ -711,8 +724,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/efs" = [
       "**/*_efs_*",
-      "**/efs_*",
-      "aws/tagsEFS*"
+      "**/efs_*"
     ]
     "service/eks" = [
       "**/*_eks_*",
@@ -724,13 +736,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/elasticache" = [
       "**/*_elasticache_*",
-      "**/elasticache_*",
-      "aws/tagsEC*"
+      "**/elasticache_*"
     ]
     "service/elasticbeanstalk" = [
       "**/*_elastic_beanstalk_*",
-      "**/elastic_beanstalk_*",
-      "aws/tagsBeanstalk*"
+      "**/elastic_beanstalk_*"
     ]
     "service/elasticsearch" = [
       "**/*_elasticsearch_*",
@@ -744,7 +754,6 @@ behavior "pull_request_path_labeler" "service_labels" {
       "aws/*_aws_lb_ssl_negotiation_policy*",
       "aws/*_aws_load_balancer*",
       "aws/*_aws_proxy_protocol_policy*",
-      "aws/tagsELB*",
       "website/**/app_cookie_stickiness_policy*",
       "website/**/elb*",
       "website/**/lb_cookie_stickiness_policy*",
@@ -806,8 +815,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/inspector" = [
       "**/*_inspector_*",
-      "**/inspector_*",
-      "aws/tagsInspector*"
+      "**/inspector_*"
     ]
     "service/iot" = [
       "**/*_iot_*",
@@ -819,7 +827,6 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/kinesis" = [
       "aws/*_aws_kinesis_stream*",
-      "aws/tags_kinesis*",
       "website/kinesis_stream*"
     ]
     "service/kinesisanalytics" = [
@@ -828,13 +835,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/kms" = [
       "**/*_kms_*",
-      "**/kms_*",
-      "aws/tagsKMS*"
+      "**/kms_*"
     ]
     "service/lambda" = [
       "**/*_lambda_*",
-      "**/lambda_*",
-      "aws/tagsLambda*"
+      "**/lambda_*"
     ]
     "service/lexmodelbuildingservice" = [
       "**/*_lex_*",
@@ -890,13 +895,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/neptune" = [
       "**/*_neptune_*",
-      "**/neptune_*",
-      "aws/tagsNeptune*"
+      "**/neptune_*"
     ]
     "service/opsworks" = [
       "**/*_opsworks_*",
-      "**/opsworks_*",
-      "aws/tagsOpsworks*"
+      "**/opsworks_*"
     ]
     "service/organizations" = [
       "**/*_organizations_*",
@@ -921,14 +924,12 @@ behavior "pull_request_path_labeler" "service_labels" {
     "service/rds" = [
       "aws/*_aws_db_*",
       "aws/*_aws_rds_*",
-      "aws/tagsRDS*",
       "website/**/db_*",
       "website/**/rds_*"
     ]
     "service/redshift" = [
       "**/*_redshift_*",
-      "**/redshift_*",
-      "aws/tagsRedshift*"
+      "**/redshift_*"
     ]
     "service/resourcegroups" = [
       "**/*_resourcegroups_*",
@@ -944,8 +945,7 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/route53_health_check*",
       "**/route53_query_log*",
       "**/route53_record*",
-      "**/route53_zone*",
-      "aws/tags_route53*"
+      "**/route53_zone*"
     ]
     "service/robomaker" = [
       "**/*_robomaker_*",
@@ -971,8 +971,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/secretsmanager" = [
       "**/*_secretsmanager_*",
-      "**/secretsmanager_*",
-      "aws/tagsSecretsManager*"
+      "**/secretsmanager_*"
     ]
     "service/securityhub" = [
       "**/*_securityhub_*",
@@ -992,8 +991,7 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/ses" = [
       "**/*_ses_*",
-      "**/ses_*",
-      "aws/tagsSSM*"
+      "**/ses_*"
     ]
     "service/sfn" = [
       "**/*_sfn_*",

CHANGELOG.md

@@ -1,19 +1,41 @@
-## 2.31.0 (Unreleased)
+## 2.32.0 (Unreleased)
+
+NOTES:
+
+* provider: The underlying Terraform codebase dependency for the provider SDK and acceptance testing framework has been migrated from `github.com/hashicorp/terraform` to `github.com/hashicorp/terraform-plugin-sdk`. They are functionality equivalent and this should only impact codebase development to switch imports. For more information see the [Terraform Plugin SDK page in the Extending Terraform documentation](https://www.terraform.io/docs/extend/plugin-sdk.html). [GH-10367]
+
+BUG FIXES:
+
+* resource/aws_s3_bucket: Prevent infinite deletion recursion with `force_destroy` argument and object keys with empty "directory" prefixes present since version 2.29.0 [GH-10388]
+
+## 2.31.0 (October 03, 2019)
+
+NOTES:
+
+* resource/aws_lambda_function: Environments using Lambda functions with VPC configurations should upgrade their Terraform AWS Provider to this version or later to appropriately handle the networking changes introduced by the [improved VPC networking for AWS Lambda functions](https://aws.amazon.com/blogs/compute/announcing-improved-vpc-networking-for-aws-lambda-functions/) deployment. These changes prevent proper deletion of EC2 Subnets and Security Groups for accounts and regions updated to the new Lambda networking infrastructure in older versions of the Terraform AWS Provider. Additional information and configuration workarounds for prior versions can be found in [this GitHub issue](https://github.com/terraform-providers/terraform-provider-aws/issues/10329).
 
 ENHANCEMENTS:
 
-* resource_aws_efs_filesystem: Support tag-on-create [GH-10254]
-* resource/aws_mq_broker: Add `encryption_options` configuration block (support AWS and customer managed KMS CMKs) [GH-10276]
+* data-source/aws_eks_cluster: Add `tags` attribute ([#10307](https://github.com/terraform-providers/terraform-provider-aws/issues/10307))
+* resource/aws_efs_filesystem: Support tag-on-create ([#10254](https://github.com/terraform-providers/terraform-provider-aws/issues/10254))
+* resource/aws_eks_cluster: Add `tags` argument ([#10307](https://github.com/terraform-providers/terraform-provider-aws/issues/10307))
+* resource/aws_mq_broker: Add `encryption_options` configuration block (support AWS and customer managed KMS CMKs) ([#10276](https://github.com/terraform-providers/terraform-provider-aws/issues/10276))
 
 BUG FIXES:
 
-* resource/aws_lb_listener_certificate: Retry `CertificateNotFound` errors on creation for eventual consistency [GH-10294]
-* resource/aws_vpc_peering_connection: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering [GH-7627]
-* resource/aws_vpc_peering_connection_accepter: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering [GH-7627]
-* resource/aws_vpc_peering_connection_options: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering [GH-7627]
-* resource/aws_wafregional_web_acl_association: Ensure missing resource triggers state removal [GH-10216]
-* service/waf: Prevent incorrect `Error getting WAF change token` errors for API calls that should be retried or specially handled [GH-10242]
-* service/wafregional: Prevent incorrect `Error getting WAF regional change token` errors for API calls that should be retried or specially handled [GH-10242]
+* provider: Upstream AWS Go SDK fix for parsing AWS shared credentials files missing right-hand values ([#10310](https://github.com/terraform-providers/terraform-provider-aws/issues/10310))
+* resource/aws_lb_listener_certificate: Retry `CertificateNotFound` errors on creation for eventual consistency ([#10294](https://github.com/terraform-providers/terraform-provider-aws/issues/10294))
+* resource/aws_s3_bucket_object: Fix object deletion for non-versioned objects ([#10352](https://github.com/terraform-providers/terraform-provider-aws/issues/10352))
+* resource/aws_security_group: Handle updated ENI description and longer deletion timeframe for new Lambda Hyperplane ENIs ([#10114](https://github.com/terraform-providers/terraform-provider-aws/issues/10114)] / [[#10347](https://github.com/terraform-providers/terraform-provider-aws/issues/10347))
+* resource/aws_subnet: Handle updated ENI description and longer deletion timeframe for new Lambda Hyperplane ENIs ([#10114](https://github.com/terraform-providers/terraform-provider-aws/issues/10114)] / [[#10347](https://github.com/terraform-providers/terraform-provider-aws/issues/10347))
+* resource/aws_vpc_peering_connection: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering ([#7627](https://github.com/terraform-providers/terraform-provider-aws/issues/7627))
+* resource/aws_vpc_peering_connection_accepter: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering ([#7627](https://github.com/terraform-providers/terraform-provider-aws/issues/7627))
+* resource/aws_vpc_peering_connection_options: Ensure `allow_remote_vpc_dns_resolution` usage works with inter-region peering ([#7627](https://github.com/terraform-providers/terraform-provider-aws/issues/7627))
+* resource/aws_waf_rate_based_rule: Upstream AWS Go SDK fix to allow `rate_limit` arguments between 100 and 1999 ([#10310](https://github.com/terraform-providers/terraform-provider-aws/issues/10310))
+* resource/aws_wafregional_rate_based_rule: Upstream AWS Go SDK fix to allow `rate_limit` arguments between 100 and 1999 ([#10310](https://github.com/terraform-providers/terraform-provider-aws/issues/10310))
+* resource/aws_wafregional_web_acl_association: Ensure missing resource triggers state removal ([#10216](https://github.com/terraform-providers/terraform-provider-aws/issues/10216))
+* service/waf: Prevent incorrect `Error getting WAF change token` errors for API calls that should be retried or specially handled ([#10242](https://github.com/terraform-providers/terraform-provider-aws/issues/10242))
+* service/wafregional: Prevent incorrect `Error getting WAF regional change token` errors for API calls that should be retried or specially handled ([#10242](https://github.com/terraform-providers/terraform-provider-aws/issues/10242))
 
 ## 2.30.0 (September 26, 2019)
 

aws/autoscaling_tags.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
-	"github.com/hashicorp/terraform/helper/hashcode"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 // autoscalingTagSchema returns the schema to use for the tag element.

aws/autoscaling_tags_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestDiffAutoscalingTags(t *testing.T) {

aws/aws_sweeper_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestMain(m *testing.M) {

aws/awserr.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 // Returns true if the error matches all these conditions:

aws/cloudfront_distribution_configuration_structure.go

@@ -14,9 +14,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudfront"
-	"github.com/hashicorp/terraform/helper/hashcode"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/flatmap"
 )
 

aws/cloudfront_distribution_configuration_structure_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudfront"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func defaultCacheBehaviorConf() map[string]interface{} {