Merge branch 'master' into body_base_path

.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). --->
 
@@ -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,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Terraform AWS Provider Roadmap
+    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
     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.
@@ -9,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/.github/CONTRIBUTING.md#pull-requests --->
+<!--- 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.
 -->