Merge branch 'master' into b-fix-aws_elasticache_replication_group-arn

Author: gdavison

.github/CODEOWNERS

@@ -1,36 +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/*route53_resolver*    @ewbankkit @terraform-providers/aws-provider
-/website/**/route53_resolver*    @ewbankkit @terraform-providers/aws-provider
+/aws/*kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_storagegateway_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/storagegateway*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_sagemaker_*.go     @DrFaust92 @terraform-providers/aws-provider
-/website/**/sagemaker*        @DrFaust92 @terraform-providers/aws-provider
+/aws/*route53_resolver*    @ewbankkit @hashicorp/terraform-aws
+/website/**/route53_resolver*    @ewbankkit @hashicorp/terraform-aws
 
-/aws/*_aws_workspaces_*.go     @Tensho @terraform-providers/aws-provider
-/website/**/workspaces*        @Tensho @terraform-providers/aws-provider
+/aws/*_aws_storagegateway_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/storagegateway*        @DrFaust92 @hashicorp/terraform-aws
+
+/aws/*_aws_sagemaker_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/sagemaker*        @DrFaust92 @hashicorp/terraform-aws
+
+/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/master/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/master/docs/CONTRIBUTING.md --->
 
 <!--- Please keep this note for the community --->
 
@@ -12,7 +12,7 @@
 <!--- 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):
+Release note for [CHANGELOG](https://github.com/hashicorp/terraform-provider-aws/blob/master/CHANGELOG.md):
 <!--
 If change is not user facing, just write "NONE" in the release-note block below.
 -->

.github/dependabot.yml

@@ -4,3 +4,28 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    ignore:
+      - dependency-name: "golang.org/x/tools"
+      - dependency-name: "google.golang.org/grpc"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/awsproviderlint"
+    ignore:
+      - dependency-name: "golang.org/x/tools"
+      - dependency-name: "google.golang.org/grpc"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/tools"
+    ignore:
+      - dependency-name: "golang.org/x/tools"
+      - dependency-name: "google.golang.org/grpc"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "terraform"
+    directory: "/infrastructure/repository"
+    schedule:
+      interval: "daily"

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

@@ -3,24 +3,25 @@ on:
   push:
     branches:
       - master
-      - 'release/**'
+      - "release/**"
   pull_request:
     paths:
       - .github/workflows/acctest-terraform-lint.yml
-      - aws/core_acceptance_test.go
-      - aws/data_source_aws_*_test.go
-      - aws/resource_aws_[a-g]*_test.go
+      - .go-version
+      - aws/*_test.go
+      - scripts/validate-terraform.sh
+      - tools/go.mod
 
 env:
-  GO_VERSION: "1.14"
   GO111MODULE: on
-  TFLINT_VERSION: "v0.20.0" # Not yet available
 
 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,72 +31,49 @@ jobs:
         with:
           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' --fmtcompat
       - run: |
-          # go get github.com/katbyte/terrafmt
-          git clone --branch tracking-main --single-branch https://github.com/gdavison/terrafmt terrafmt
-          cd terrafmt
-          go install
-      # - run: terrafmt diff ./aws --check --pattern '*_test.go' --quiet --fmtcompat
-      - run: |
-          find ./aws -type f \( \
-            -name 'core_acceptance_test.go' \
-            -o -name 'data_source_aws_*_test.go' \
-            -o -name 'resource_aws_a*_test.go' \
-            -o -name 'resource_aws_b*_test.go' \
-            -o -name 'resource_aws_c*_test.go' \
-            -o -name 'resource_aws_d*_test.go' \
-            -o -name 'resource_aws_e*_test.go' \
-            -o -name 'resource_aws_f*_test.go' \
-            -o -name 'resource_aws_g*_test.go' \
-            \) \
+          find ./aws -type f -name '*_test.go' \
             | sort -u \
             | grep -v resource_aws_apigatewayv2_domain_name_test.go \
-            | grep -v resource_aws_dynamodb_table_test.go \
             | grep -v resource_aws_ecs_capacity_provider_test.go \
             | grep -v resource_aws_efs_file_system_test.go \
-            | xargs -I {} terrafmt diff --check --quiet --fmtcompat {}
+            | grep -v resource_aws_kinesis_stream_test.go \
+            | grep -v resource_aws_kms_grant_test.go \
+            | 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 --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 }}
+          go-version: ${{ steps.go-version.outputs.content }}
       - uses: actions/cache@v2
         continue-on-error: true
         timeout-minutes: 2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
+      - run: cd tools && go install github.com/katbyte/terrafmt
+      - run: cd tools && go install github.com/terraform-linters/tflint
       - run: |
-          # go get github.com/katbyte/terrafmt
-          git clone --branch tracking-main --single-branch https://github.com/gdavison/terrafmt terrafmt
-          cd terrafmt
-          go install
-      # - run: curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | sh
-      - run: |
-          git clone --no-checkout https://github.com/terraform-linters/tflint tflint
-          cd tflint
-          git checkout --recurse-submodules 5a002e926848899d4bfbb006f95c39285a5e9afa
-          go install
-      - run: |
-          find ./aws -type f \( \
-            -name 'core_acceptance_test.go' \
-            -o -name 'data_source_aws_*_test.go' \
-            -o -name 'resource_aws_a*_test.go' \
-            -o -name 'resource_aws_b*_test.go' \
-            -o -name 'resource_aws_c*_test.go' \
-            -o -name 'resource_aws_d*_test.go' \
-            -o -name 'resource_aws_e*_test.go' \
-            -o -name 'resource_aws_f*_test.go' \
-            -o -name 'resource_aws_g*_test.go' \
-            \) \
+          find ./aws -type f -name '*_test.go' \
             | sort -u \
             | grep -v resource_aws_apigatewayv2_domain_name_test.go \
-            | grep -v resource_aws_dynamodb_table_test.go \
             | grep -v resource_aws_ecs_capacity_provider_test.go \
             | grep -v resource_aws_efs_file_system_test.go \
             | grep -v resource_aws_elasticache_cluster_test.go \
+            | grep -v resource_aws_kinesis_stream_test.go \
+            | grep -v resource_aws_kms_grant_test.go \
+            | grep -v resource_aws_lambda_permission_test.go \
+            | 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 \
             | ./scripts/validate-terraform.sh
-          

.github/workflows/changelog.yml

@@ -6,35 +6,60 @@ on:
       - 'release/**'
   pull_request:
     paths:
+      - .go-version
       - CHANGELOG.md
+  pull_request_target:
 
 env:
-  GO_VERSION: "1.14"
   GO111MODULE: on
 
 jobs:
+  changes:
+    if: github.event_name == 'pull_request_target' && !contains(fromJSON('["anGie44", "bflad", "breathingdust", "gdavison", "maryelizbeth", "YakDriver"]'), github.actor)
+    name: Filter Changes
+    runs-on: ubuntu-latest
+    outputs:
+      changed: ${{ steps.filter.outputs.changed }}
+    steps:
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            changed:
+              - CHANGELOG.md
   comment:
-    if: github.event_name == 'pull_request' && !contains(fromJSON('["bflad", "breathingdust", "ewbankkit", "gdavison", "maryelizbeth"]'), github.actor)
+    needs: changes
+    if: ${{ needs.changes.outputs.changed == 'true' }}
     name: Comment
     runs-on: ubuntu-latest
     steps:
+      - name: Find Existing PR Comment
+        id: prc
+        uses: peter-evans/find-comment@v1
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: "Please note that the `CHANGELOG.md` file contents are handled by the maintainers during merge"
+      - run: echo ${{ steps.prc.outputs.comment-id }}
       - name: PR Comment
-        uses: unsplash/comment-on-pr@v1.2.0
+        if: ${{ steps.prc.outputs.comment-id == '' }}
+        uses: peter-evans/create-or-update-comment@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          msg: |-
+          issue-number: ${{ github.event.pull_request.number }}
+          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/.github/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/master/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.
-      - name: Fail the check
-        run: exit 1
   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 }}
@@ -44,5 +69,5 @@ jobs:
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
-      - run: go install github.com/client9/misspell/cmd/misspell
+      - run: cd tools && go install github.com/client9/misspell/cmd/misspell
       - run: misspell -error -source text CHANGELOG.md

.github/workflows/dependencies.yml

@@ -7,12 +7,9 @@ on:
       - 'release/**'
   pull_request_target:
 
-env:
-  GO_VERSION: "1.14"
-
 jobs:
   changes:
-    if: github.event_name == 'pull_request_target' && !contains(fromJSON('["anGie44", "bflad", "breathingdust", "DrFaust92", "ewbankkit", "gdavison", "maryelizbeth", "YakDriver", "renovate[bot]"]'), github.actor)
+    if: github.event_name == 'pull_request_target' && !contains(fromJSON('["anGie44", "bflad", "breathingdust", "dependabot[bot]", "DrFaust92", "ewbankkit", "gdavison", "maryelizbeth", "YakDriver"]'), github.actor)
     name: Filter Changes
     runs-on: ubuntu-latest
     outputs:
@@ -26,7 +23,6 @@ jobs:
               - awsproviderlint/**
               - go.mod
               - go.sum
-              - vendor/**
   comment:
     needs: changes
     if: ${{ needs.changes.outputs.changed == 'true' }}
@@ -51,20 +47,22 @@ jobs:
           body: |-
             Thank you for your contribution! :rocket:
 
-            Please note that typically Go dependency changes are handled in this repository by Renovate Bot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the `go.mod`, `go.sum`, and `vendor/` files and commit them into this pull request.
+            Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the `go.mod` or `go.sum` files and commit them into this pull request.
 
             Additional details:
 
-            * Check [open pull requests with the `dependencies` label](https://github.com/terraform-providers/terraform-provider-aws/pulls?q=is%3Aopen+is%3Apr+label%3Adependencies) to view other dependency updates.
-            * If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via Renovate Bot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via Renovate Bot has been merged for this pull request to be reviewed.
+            * Check [open pull requests with the `dependencies` label](https://github.com/hashicorp/terraform-provider-aws/pulls?q=is%3Aopen+is%3Apr+label%3Adependencies) to view other dependency updates.
+            * If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
             * If this pull request is for supporting a new AWS service:
-              * Ensure the new AWS service changes are following the [Contributing Guide section on new services](https://github.com/terraform-providers/terraform-provider-aws/blob/master/docs/contributing/contribution-checklists.md#new-service), in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
+              * Ensure the new AWS service changes are following the [Contributing Guide section on new services](https://github.com/hashicorp/terraform-provider-aws/blob/master/docs/contributing/contribution-checklists.md#new-service), in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
               * If this pull request is already a separate pull request from the above item, you can ignore this message.
   go_mod:
     name: go mod
     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 }}
@@ -74,7 +72,3 @@ jobs:
           go mod tidy
           git diff --exit-code -- go.mod go.sum || \
             (echo; echo "Unexpected difference in go.mod/go.sum files. Run 'go mod tidy' command or revert any go.mod/go.sum changes and commit."; exit 1)
-          echo "==> Checking source code with go mod vendor..."
-          go mod vendor
-          git diff --compact-summary --exit-code -- vendor || \
-            (echo; echo "Unexpected difference in vendor/ directory. Run 'go mod vendor' command or revert any go.mod/go.sum/vendor changes and commit."; exit 1)