Merge branch 'main' into elasticache_global_replication_group

.changelog/12645.txt

@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_glacier_vault: Prevent crash with `GetVaultAccessPolicy` API errors
+```
+
+```release-note:bug
+resource/aws_glacier_vault: Properly remove from state when resource does not exist
+```
+
+```release-note:enhancement
+resource/aws_glacier_vault: Add plan-time validation for `notification` configuration block `events` and `sns_topic_arn` arguments
+```

.changelog/13420.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_vpc_peering_connection: Add `cidr_block_set` and `peer_cidr_block_set` attributes
+```

.changelog/15348.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_elasticache_replication_group: Adds `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_elasticache_replication_group: Adds `arn` attribute
+```

.changelog/16656.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_vpc_endpoint: Return unsuccessful deletion information immediately as an error instead of timing out while waiting for deletion
+```
+
+```release-note:bug
+resource/aws_vpc_endpoint_service: Return unsuccessful deletion information immediately as an error instead of timing out while waiting for deletion
+```

.changelog/16676.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_subnet: Add `customer_owned_ipv4_pool` and `map_customer_owned_ip_on_launch` attributes
+```
+
+```release-note:enhancement
+resource/aws_subnet: Add `customer_owned_ipv4_pool` and `map_customer_owned_ip_on_launch` attributes
+```

.changelog/16710.txt

@@ -0,0 +1,7 @@
+```release-note:new-data-source
+aws_imagebuilder_image
+```
+
+```release-note:new-resource
+aws_imagebuilder_image
+```

.changelog/16823.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_ec2_transit_gateway_prefix_list_reference
+```

.changelog/16840.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_route53_key_signing_key
+```

.changelog/16882.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_prometheus_workspace
+```

.changelog/17002.txt

@@ -0,0 +1,7 @@
+```release-note:note
+data-source/aws_route53_zone: The Route 53 `ListResourceRecordSets` API call has been implemented to support the `name_servers` attribute for private Hosted Zones similar to the resource implementation. Environments using restrictive IAM permissions may require updates.
+```
+
+```release-note:bug
+data-source/aws_route53_zone: Ensure `name_servers` is populated for private Hosted Zones
+```

.changelog/17030.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_cloudwatch_event_rule: Prevent perpetual differences with `name_prefix` argument values beginning with `terraform-`
+```
+
+```release-note:bug
+resource/aws_security_group: Prevent perpetual differences with `name_prefix` argument values beginning with `terraform-`
+```

.changelog/17142.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_partition: Correct `reverse_dns_prefix` value in AWS China, C2S, and SC2S
+```

.changelog/17189.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/lakeformation_permissions: Handle resources with multiple permissions
+```
+
+```release-note:bug
+resource/lakeformation_data_lake_settings: Avoid unnecessary resource cycling
+```

.changelog/17201.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_elasticache_replication_group: Correctly update computed `member_clusters` values
+```

.changelog/17221.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_sagemaker_app_image_config
+```
+
+```release-note:bug
+resource/aws_sagemaker_code_repository: fix doc name
+```

.changelog/17226.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_elb_hosted_zone_id: Correct values for `cn-north-1` and `cn-northwest-1` regions
+```

.changelog/17234.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_api_gateway_method_settings: Prevent confusing Terraform error on resource disappearance during creation
+```
+
+```release-note:bug
+resource/aws_api_gateway_method_settings: Ignore non-existent resource errors during deletion
+```

.changelog/17238.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_lb_listener: Prevent error when retrieving a listener whose default action contains weighted target groups
+```

.changelog/17243.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ebs_volume: Allow both `size` and `snapshot_id` attributes to be specified
+```

.changelog/17254.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_kinesis_firehose_delivery_stream: Use standard retry timeout for IAM eventual consistency and retry on LakeFormation access errors
+```

.changelog/17256.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_glue_crawler: Use standard retry timeout for IAM eventual consistency and retry on LakeFormation permissions errors
+```

.changelog/17262.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_codeartifact_domain: Make `encryption_key` optional
+```

.changelog/17301.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_elasticache_replication_group: Allow changing `cluster_mode.replica_count` without re-creation
+```

.changelog/17318.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iam_access_key: Add `create_date` attribute
+```

.changelog/17320.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_elasticache_replication_group: Add `multi_az_enabled` argument
+```
+
+```release-note:enhancement
+resource/aws_elasticache_replication_group: Add `multi_az_enabled` argument
+```

.changelog/17321.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iam_access_key: Support resource import
+```

.changelog/17322.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_iam_access_key: Ensure `Inactive` `status` is properly configured during resource creation
+```

.changelog/17335.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_glue_catalog_table: Adds support for specifying schema from schema registry.
+```

.changelog/17340.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+provider: Support AWS Single-Sign On (SSO) cached credentials
+```

.changelog/17344.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_glue_partition: Fix `partition_values` to preserve order.
+```

.changelog/17423.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ssoadmin_permission_set: Properly update resource with `relay_state` argument
+```

.changelog/17469.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+provider: Only validate AWS shared configuration profile SSO configuration when attempting to use SSO cached credentials
+```

.github/CODEOWNERS

@@ -1,42 +1,42 @@
 # Default owner for all pull requests
-*    @terraform-providers/aws-provider
+*    @hashicorp/terraform-aws
 
 # Service specific owners
-/aws/*apigatewayv2*    @ewbankkit @terraform-providers/aws-provider
-/website/**/apigatewayv2*    @ewbankkit @terraform-providers/aws-provider
+/aws/*apigatewayv2*    @ewbankkit @hashicorp/terraform-aws
+/website/**/apigatewayv2*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*appmesh*    @ewbankkit @terraform-providers/aws-provider
-/website/**/appmesh*    @ewbankkit @terraform-providers/aws-provider
+/aws/*appmesh*    @ewbankkit @hashicorp/terraform-aws
+/website/**/appmesh*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*backup*    @ewbankkit @terraform-providers/aws-provider
-/website/**/backup*    @ewbankkit @terraform-providers/aws-provider
+/aws/*backup*    @ewbankkit @hashicorp/terraform-aws
+/website/**/backup*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_codeartifact_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/codeartifact*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*_aws_codeartifact_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/codeartifact*        @DrFaust92 @hashicorp/terraform-aws
 
-/aws/*_aws_fsx_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/fsx*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*_aws_fsx_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/fsx*        @DrFaust92 @hashicorp/terraform-aws
 
-/aws/*globalaccelerator*    @ewbankkit @terraform-providers/aws-provider
-/website/**/globalaccelerator*    @ewbankkit @terraform-providers/aws-provider
+/aws/*globalaccelerator*    @ewbankkit @hashicorp/terraform-aws
+/website/**/globalaccelerator*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_glue_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/glue*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*_aws_glue_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/glue*        @DrFaust92 @hashicorp/terraform-aws
 
-/aws/*kinesis_analytics*    @ewbankkit @terraform-providers/aws-provider
-/website/**/kinesis_analytics*    @ewbankkit @terraform-providers/aws-provider
+/aws/*kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*kinesisanalyticsv2*    @ewbankkit @terraform-providers/aws-provider
-/website/**/kinesisanalyticsv2*    @ewbankkit @terraform-providers/aws-provider
+/aws/*kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*route53_resolver*    @ewbankkit @terraform-providers/aws-provider
-/website/**/route53_resolver*    @ewbankkit @terraform-providers/aws-provider
+/aws/*route53_resolver*    @ewbankkit @hashicorp/terraform-aws
+/website/**/route53_resolver*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_storagegateway_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/storagegateway*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*_aws_storagegateway_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/storagegateway*        @DrFaust92 @hashicorp/terraform-aws
 
-/aws/*_aws_sagemaker_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/sagemaker*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*_aws_sagemaker_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/sagemaker*        @DrFaust92 @hashicorp/terraform-aws
 
-/aws/*_aws_workspaces_*.go     @Tensho @terraform-providers/aws-provider
-/website/**/workspaces*        @Tensho @terraform-providers/aws-provider
+/aws/*_aws_workspaces_*.go     @Tensho @hashicorp/terraform-aws
+/website/**/workspaces*        @Tensho @hashicorp/terraform-aws

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -40,6 +40,8 @@ If you are running into one of these scenarios, we recommend opening an issue in
 
 <!--- Information about code formatting: https://help.github.com/articles/basic-writing-and-formatting-syntax/#quoting-code --->
 
+Please include all Terraform configurations required to reproduce the bug. Bug reports without a functional reproduction may be closed without investigation.
+
 ```hcl
 # Copy-paste your Terraform configurations here - for large Terraform configs,
 # please use a service like Dropbox and share a link to the ZIP file. For

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Terraform AWS Provider Roadmap
-    url: https://github.com/terraform-providers/terraform-provider-aws/blob/master/ROADMAP.md
+    url: https://github.com/hashicorp/terraform-provider-aws/blob/main/ROADMAP.md
     about: View the Roadmap for the upcoming work planned on the AWS provider.
   - name: Terraform AWS Provider Questions
     url: https://discuss.hashicorp.com/c/terraform-providers/tf-aws

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!--- See what makes a good Pull Request at : https://github.com/terraform-providers/terraform-provider-aws/blob/master/docs/CONTRIBUTING.md --->
+<!--- See what makes a good Pull Request at : https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md --->
 
 <!--- Please keep this note for the community --->
 
@@ -12,15 +12,6 @@
 <!--- If your PR fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates --->
 Relates OR Closes #0000
 
-Release note for [CHANGELOG](https://github.com/terraform-providers/terraform-provider-aws/blob/master/CHANGELOG.md):
-<!--
-If change is not user facing, just write "NONE" in the release-note block below.
--->
-
-```release-note
-
-```
-
 Output from acceptance testing:
 
 <!--

.github/workflows/acctest-terraform-lint.yml

@@ -2,24 +2,26 @@ name: Acceptance Test Linting
 on:
   push:
     branches:
-      - master
+      - main
       - "release/**"
   pull_request:
     paths:
       - .github/workflows/acctest-terraform-lint.yml
+      - .go-version
       - aws/*_test.go
       - scripts/validate-terraform.sh
       - tools/go.mod
 
 env:
-  GO_VERSION: "1.15"
   GO111MODULE: on
 
 jobs:
   terrafmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      # See also: https://github.com/actions/setup-go/pull/62
+      - run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -30,7 +32,7 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
       - run: cd tools && go install github.com/katbyte/terrafmt
-      # - run: terrafmt diff ./aws --check --pattern '*_test.go' --quiet --fmtcompat
+      # - run: terrafmt diff ./aws --check --pattern '*_test.go' --fmtcompat
       - run: |
           find ./aws -type f -name '*_test.go' \
             | sort -u \
@@ -42,12 +44,14 @@ jobs:
             | grep -v resource_aws_quicksight_user_test.go \
             | grep -v resource_aws_s3_bucket_object_test.go \
             | grep -v resource_aws_sns_platform_application_test.go \
-            | xargs -I {} terrafmt diff --check --quiet --fmtcompat {}
+            | xargs -I {} terrafmt diff --check --fmtcompat {}
 
   validate-terraform:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      # See also: https://github.com/actions/setup-go/pull/62
+      - run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}

.github/workflows/changelog.yml

@@ -2,15 +2,16 @@ name: CHANGELOG Checks
 on:
   push:
     branches:
-      - master
+      - main
       - 'release/**'
   pull_request:
     paths:
+      - .changelog/*
+      - .go-version
       - CHANGELOG.md
   pull_request_target:
 
 env:
-  GO_VERSION: "1.14"
   GO111MODULE: on
 
 jobs:
@@ -51,13 +52,15 @@ jobs:
           body: |-
             Thank you for your contribution! :rocket:
 
-            Please note that the `CHANGELOG.md` file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the [Contributing Guide](https://github.com/terraform-providers/terraform-provider-aws/blob/master/docs/CONTRIBUTING.md) for additional pull request review items.
+            Please note that the `CHANGELOG.md` file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the [Contributing Guide](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md) for additional pull request review items.
 
             Remove any changes to the `CHANGELOG.md` file and commit them in this pull request to prevent delays with reviewing and potentially merging this pull request.
   misspell:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      # See also: https://github.com/actions/setup-go/pull/62
+      - run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -68,4 +71,4 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
       - run: cd tools && go install github.com/client9/misspell/cmd/misspell
-      - run: misspell -error -source text CHANGELOG.md
+      - run: misspell -error -source text CHANGELOG.md .changelog