Merge branch 'master' into f-aws_autoscaling_group-instance_refresh

.actrc

@@ -0,0 +1,2 @@
+# Needed for testing our workflows
+-P ubuntu-latest=nektos/act-environments-ubuntu:18.04

.github/CODEOWNERS

@@ -1,2 +1,42 @@
 # Default owner for all pull requests
-*    @terraform-providers/aws-provider
+*    @hashicorp/terraform-aws
+
+# Service specific owners
+/aws/*apigatewayv2*    @ewbankkit @hashicorp/terraform-aws
+/website/**/apigatewayv2*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*appmesh*    @ewbankkit @hashicorp/terraform-aws
+/website/**/appmesh*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*backup*    @ewbankkit @hashicorp/terraform-aws
+/website/**/backup*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*_aws_codeartifact_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/codeartifact*        @DrFaust92 @hashicorp/terraform-aws
+
+/aws/*_aws_fsx_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/fsx*        @DrFaust92 @hashicorp/terraform-aws
+
+/aws/*globalaccelerator*    @ewbankkit @hashicorp/terraform-aws
+/website/**/globalaccelerator*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*_aws_glue_*.go     @DrFaust92 @hashicorp/terraform-aws
+/website/**/glue*        @DrFaust92 @hashicorp/terraform-aws
+
+/aws/*kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesis_analytics*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
+/website/**/kinesisanalyticsv2*    @ewbankkit @hashicorp/terraform-aws
+
+/aws/*route53_resolver*    @ewbankkit @hashicorp/terraform-aws
+/website/**/route53_resolver*    @ewbankkit @hashicorp/terraform-aws
+
+/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

@@ -26,7 +26,7 @@ If you are running into one of these scenarios, we recommend opening an issue in
 
 <!--- Thank you for keeping this note for the community --->
 
-### Terraform Version
+### Terraform CLI and Terraform AWS Provider Version
 
 <!--- Please run `terraform -v` to show the Terraform core version and provider version(s). If you are not running the latest version of Terraform or the provider, please upgrade because your issue may have already been fixed. [Terraform documentation on provider versioning](https://www.terraform.io/docs/configuration/providers.html#provider-versions). --->
 

.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
@@ -12,6 +12,3 @@ contact_links:
   - name: Terraform Language or Workflow Questions
     url: https://discuss.hashicorp.com/c/terraform-core
     about: Please ask and answer language or workflow related questions through the Terraform Core Community Forum.
-  - name: Security Vulnerability
-    url: https://www.hashicorp.com/security.html
-    about: Please report security vulnerabilities responsibly.

.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

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    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/labeler-needs-triage.yml

@@ -0,0 +1,4 @@
+needs-triage:
+  - '**'
+  - '.*'
+  - '.*/**'

.github/workflows/README.md

@@ -0,0 +1,20 @@
+# GitHub Workflows
+
+## Using the `setup-terraform` action
+
+By default, the [`setup-terraform` action](https://github.com/hashicorp/setup-terraform) adds a wrapper for the `terraform` command that allows passing results to subsequent steps. This will prevent using the output of a `terraform` command as the input to another command in the same step.
+
+The wrapper can be turned off by using
+
+```yaml
+steps:
+- uses: hashicorp/setup-terraform@v1
+  with:
+    terraform_wrapper: false
+```
+
+## Testing workflows locally
+
+The tool [`act`](https://github.com/nektos/act) can be used to test GitHub workflows locally. The default container [intentionally does not have feature parity](https://github.com/nektos/act#default-runners-are-intentionally-incomplete) with the containers used in GitHub due to the size of a full container.
+
+The file `./actrc` configures `act` to use a fully-featured container.

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

@@ -0,0 +1,75 @@
+name: Acceptance Test Linting
+on:
+  push:
+    branches:
+      - master
+      - "release/**"
+  pull_request:
+    paths:
+      - .github/workflows/acctest-terraform-lint.yml
+      - 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
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - 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: terrafmt diff ./aws --check --pattern '*_test.go' --fmtcompat
+      - run: |
+          find ./aws -type f -name '*_test.go' \
+            | sort -u \
+            | grep -v resource_aws_apigatewayv2_domain_name_test.go \
+            | grep -v resource_aws_ecs_capacity_provider_test.go \
+            | grep -v resource_aws_efs_file_system_test.go \
+            | 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
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - 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: |
+          find ./aws -type f -name '*_test.go' \
+            | sort -u \
+            | grep -v resource_aws_apigatewayv2_domain_name_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

@@ -3,33 +3,57 @@ on:
   push:
     branches:
       - master
+      - 'release/**'
   pull_request:
     paths:
       - 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:
@@ -43,5 +67,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

@@ -4,38 +4,60 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    paths:
-      - go.mod
-      - go.sum
-      - vendor/**
+      - 'release/**'
+  pull_request_target:
 
 env:
   GO_VERSION: "1.14"
 
 jobs:
+  changes:
+    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:
+      changed: ${{ steps.filter.outputs.changed }}
+    steps:
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            changed:
+              - awsproviderlint/**
+              - go.mod
+              - go.sum
   comment:
-    if: github.event_name == 'pull_request' && !contains(fromJSON('["anGie44", "bflad", "breathingdust", "DrFaust92", "ewbankkit", "gdavison", "maryelizbeth", "renovate[bot]"]'), 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 typically Go dependency changes"
+      - 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:
-          check_duplicate_msg: true
-          msg: |-
+          issue-number: ${{ github.event.pull_request.number }}
+          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
@@ -51,7 +73,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)