Merge branch 'master' into new_sechub_resources

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -21,7 +21,7 @@ If you are running into one of these scenarios, we recommend opening an issue in
 ### Community Note
 
 * Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
-* Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request
+* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
 * If you are interested in working on this issue or have submitted a pull request, please leave a comment
 
 <!--- Thank you for keeping this note for the community --->

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -9,7 +9,7 @@ labels: enhancement
 ### Community Note
 
 * Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
-* Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request
+* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
 * If you are interested in working on this issue or have submitted a pull request, please leave a comment
 
 <!--- Thank you for keeping this note for the community --->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Terraform AWS Provider Questions
+    url: https://discuss.hashicorp.com/c/terraform-providers/tf-aws
+    about: GitHub issues in this repository are only intended for bug reports and feature requests. Other issues will be closed. Please ask and answer questions through the Terraform AWS Provider Community Forum.
+  - name: Terraform Core Bug Reports and Feature Requests
+    url: https://github.com/hashicorp/terraform/issues/new/choose
+    about: Terraform Core, which handles the Terraform configuration language, CLI commands, and resource dependency graph, has its own codebase. Bug reports and feature requests for those pieces of functionality should be directed to that repository.
+  - 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/MAINTAINING.md

@@ -6,7 +6,11 @@
     - [Pull Request Review Process](#pull-request-review-process)
         - [Dependency Updates](#dependency-updates)
             - [AWS Go SDK Updates](#aws-go-sdk-updates)
-            - [Terraform Updates](#terraform-updates)
+            - [golangci-lint Updates](#golangci-lint-updates)
+            - [Terraform Plugin SDK Updates](#terraform-plugin-sdk-updates)
+            - [tfproviderdocs Updates](#tfproviderdocs-updates)
+            - [tfproviderlint Updates](#tfproviderlint-updates)
+            - [yaml.v2 Updates](#yaml-v2-updates)
     - [Pull Request Merge Process](#pull-request-merge-process)
     - [Pull Request Types to CHANGELOG](#pull-request-types-to-changelog)
 - [Release Process](#release-process)
@@ -241,9 +245,25 @@ ENHANCEMENTS:
 * backend/s3: Support automatic region validation for `XX-XXXXX-#` [GH-####]
 ```
 
-##### Terraform Updates
+##### golangci-lint Updates
 
-Run the full acceptance testing suite against the pull request and verify there are no new or unexpected failures.
+Merge if CI passes.
+
+##### Terraform Plugin SDK Updates
+
+Except for trivial changes, run the full acceptance testing suite against the pull request and verify there are no new or unexpected failures.
+
+##### tfproviderdocs Updates
+
+Merge if CI passes.
+
+##### tfproviderlint Updates
+
+Merge if CI passes.
+
+##### yaml.v2 Updates
+
+Run the acceptance testing pattern, `TestAccAWSCloudFormationStack(_dataSource)?_yaml`, and merge if passing.
 
 ### Pull Request Merge Process
 
@@ -285,6 +305,6 @@ Changes that should _not_ have a CHANGELOG entry:
 - Create a milestone for the next release after this release (generally, the next milestone will be a minor version increase unless previously decided for a major or patch version)
 - Check the existing release milestone for open items and either work through them or move them to the next milestone
 - Run the HashiCorp (non-OSS) TeamCity release job with the `DEPLOYMENT_TARGET_VERSION` matching the expected release milestone and `DEPLOYMENT_NEXT_VERSION` matching the next release milestone
-- Wait for the TeamCity release job and TeamCity website deployment jobs to complete either by watching the build logs or Slack notifications
+- Wait for the TeamCity release job and CircleCI website deployment jobs to complete either by watching the build logs or Slack notifications
 - Close the release milestone
-- Create a new GitHub release with the release title exactly matching the tag and milestone (e.g. `v2.22.0`). This will trigger [HashiBot](https://github.com/apps/hashibot) release comments.
+- Create a new GitHub release with the release title exactly matching the tag and milestone (e.g. `v2.22.0`) and copy the notes from the CHANGELOG to the release notes. This will trigger [HashiBot](https://github.com/apps/hashibot) release comments.

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@
 ### Community Note
 
 * Please vote on this pull request by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original pull request comment to help the community and maintainers prioritize this request
-* Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request
+* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request
 
 <!--- Thank you for keeping this note for the community --->
 
@@ -23,6 +23,11 @@ If change is not user facing, just write "NONE" in the release-note block below.
 
 Output from acceptance testing:
 
+<!--
+Replace TestAccXXX with a pattern that matches the tests affected by this PR.
+
+For more information on the `-run` flag, see the `go test` documentation at https://tip.golang.org/cmd/go/#hdr-Testing_flags.
+-->
 ```
 $ make testacc TESTARGS='-run=TestAccXXX'
 

.github/workflows/changelog_checks.yml

@@ -0,0 +1,24 @@
+name: CHANGELOG Checks
+on:
+  pull_request:
+    paths:
+      - CHANGELOG.md
+
+jobs:
+  PRCheck:
+    name: PR Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Comment
+        uses: unsplash/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          msg: |-
+            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.
+
+            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

.github/workflows/issues.yml

@@ -1,14 +1,22 @@
 on: issues
 name: Issue triage
 jobs:
-  applyTriageLabel:
-    name: Apply Triage Label
+  markIssuesForTriage:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]
-    - uses: actions/[email protected]
+    - name: Apply Issue Triage Label
+      uses: actions/[email protected]
       if: github.event.action == 'opened'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         args: label needs-triage
+
+    - name: Add new issue into Triage Board
+      uses: alex-page/[email protected]
+      if: github.event.action == 'opened'
+      with:
+        project: AWS Provider Triage
+        column:  Needs Triage
+        repo-token: ${{ secrets.GITHUB_ACTIONS_TOKEN }}

.go-version

@@ -0,0 +1 @@
+1.13.7

.golangci.yml

@@ -1,4 +1,9 @@
 issues:
+  exclude-rules:
+    # Exclude issues bypassing staticcheck.conf
+    - linters:
+        - staticcheck
+      text: "SA1019:"
   max-per-linter: 0
   max-same-issues: 0
 
@@ -20,8 +25,8 @@ 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
   modules-download-mode: vendor
+  timeout: 10m