Merge pull request #2 from terraform-providers/master

pull changes

.github/CONTRIBUTING.md

@@ -291,6 +291,35 @@ into Terraform.
     `quicksightconn: quicksight.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["quicksight"])})),`
   - In `website/docs/guides/custom-service-endpoints.html.md`: Add the service
     name in the list of customizable endpoints.
+  - In `.hashibot.hcl`: Add the new service to automated issue and pull request labeling. e.g. with the `quicksight` service
+
+  ```hcl
+  behavior "regexp_issue_labeler_v2" "service_labels" {
+    # ... other configuration ...
+
+    label_map = {
+      # ... other services ...
+      "service/quicksight" = [
+        "aws_quicksight_",
+      ],
+      # ... other services ...
+    }
+  }
+
+  behavior "pull_request_path_labeler" "service_labels"
+    # ... other configuration ...
+
+    label_map = {
+      # ... other services ...
+      "service/quicksight" = [
+        "**/*_quicksight_*",
+        "**/quicksight_*",
+      ],
+      # ... other services ...
+    }
+  }
+  ```
+
   - Run the following then submit the pull request:
 
   ```sh
@@ -449,7 +478,7 @@ The below are location-based items that _may_ be noted during review and are rec
   ```
 
 - [ ] __Uses aws_availability_zones Data Source__: Any hardcoded AWS Availability Zone configuration, e.g. `us-west-2a`, should be replaced with the [`aws_availability_zones` data source](https://www.terraform.io/docs/providers/aws/d/availability_zones.html). A common pattern is declaring `data "aws_availability_zones" "current" {}` and referencing it via `data.aws_availability_zones.current.names[0]` or `data.aws_availability_zones.current.names[count.index]` in resources utilizing `count`.
-- [ ] __Uses aws_region Data Source__: Any hardcoded AWS Region configuration, e.g. `us-west-2`, should be replaced with the [`aws_region` data source](https://www.terraform.io/docs/providers/aws/d/region.html). A common pattern is declaring `data "aws_region" "cname}` and referencing it via `data.aws_region.current.name`
+- [ ] __Uses aws_region Data Source__: Any hardcoded AWS Region configuration, e.g. `us-west-2`, should be replaced with the [`aws_region` data source](https://www.terraform.io/docs/providers/aws/d/region.html). A common pattern is declaring `data "aws_region" "current" {}` and referencing it via `data.aws_region.current.name`
 - [ ] __Uses aws_partition Data Source__: Any hardcoded AWS Partition configuration, e.g. the `aws` in a `arn:aws:SERVICE:REGION:ACCOUNT:RESOURCE` ARN, should be replaced with the [`aws_partition` data source](https://www.terraform.io/docs/providers/aws/d/partition.html). A common pattern is declaring `data "aws_partition" "current" {}` and referencing it via `data.aws_partition.current.partition`
 - [ ] __Uses Builtin ARN Check Functions__: Tests should utilize available ARN check functions, e.g. `testAccMatchResourceAttrRegionalARN()`, to validate ARN attribute values in the Terraform state over `resource.TestCheckResourceAttrSet()` and `resource.TestMatchResourceAttr()`
 - [ ] __Uses testAccCheckResourceAttrAccountID()__: Tests should utilize the available AWS Account ID check function, `testAccCheckResourceAttrAccountID()` to validate account ID attribute values in the Terraform state over `resource.TestCheckResourceAttrSet()` and `resource.TestMatchResourceAttr()`

.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/checkout@v1.0.0
-    - uses: actions/github@v1.0.0
+    - name: Apply Triage Label
+      uses: actions/github@v1.0.0
       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/github-project-automation-plus@v0.1.1
+      if: github.event.action == 'opened'
+      with:
+        project: AWS Provider Triage
+        column:  Needs Triage
+        repo-token: ${{ secrets.GITHUB_ACTIONS_TOKEN }}

.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
 
@@ -11,8 +16,7 @@ linters:
     - gosimple
     - ineffassign
     - misspell
-    # Run separately for TravisCI memory issues
-    # - staticcheck
+    - staticcheck
     - structcheck
     - unconvert
     - unused
@@ -24,5 +28,5 @@ linters-settings:
     ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
 
 run:
-  deadline: 5m
   modules-download-mode: vendor
+  timeout: 10m

.hashibot.hcl

@@ -93,6 +93,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/autoscalingplans" = [
       "aws_autoscalingplans_",
     ],
+    "service/backup" = [
+      "aws_backup_",
+    ],
     "service/batch" = [
       "aws_batch_",
     ],
@@ -174,6 +177,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/dlm" = [
       "aws_dlm_",
     ],
+    "service/docdb" = [
+      "aws_docdb_",
+    ],
     "service/dynamodb" = [
       "aws_dynamodb_",
     ],
@@ -243,6 +249,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/fms" = [
       "aws_fms_",
     ],
+    "service/forecast" = [
+      "aws_forecast_",
+    ],
     "service/fsx" = [
       "aws_fsx_",
     ],
@@ -337,6 +346,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/organizations" = [
       "aws_organizations_",
     ],
+    "service/personalize" = [
+      "aws_personalize_",
+    ],
     "service/pinpoint" = [
       "aws_pinpoint_",
     ],
@@ -346,6 +358,12 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/pricing" = [
       "aws_pricing_",
     ],
+    "service/qldb" = [
+      "aws_qldb_",
+    ],
+    "service/quicksight" = [
+      "aws_quicksight_",
+    ],
     "service/ram" = [
       "aws_ram_",
     ],
@@ -440,6 +458,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/workdocs" = [
       "aws_workdocs_",
     ],
+    "service/worklink" = [
+      "aws_worklink_",
+    ],
     "service/workmail" = [
       "aws_workmail_",
     ],
@@ -540,6 +561,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_autoscalingplans_*",
       "**/autoscalingplans_*"
     ]
+    "service/backup" = [
+      "**/*backup_*",
+      "**/backup_*"
+    ]
     "service/batch" = [
       "**/*_batch_*",
       "**/batch_*"
@@ -612,7 +637,11 @@ behavior "pull_request_path_labeler" "service_labels" {
     ]
     "service/cognito" = [
       "**/*_cognito_*",
-      "**/_cognito_*"
+      "**/cognito_*"
+    ]
+    "service/comprehend" = [
+      "**/*_comprehend_*",
+      "**/comprehend_*"
     ]
     "service/configservice" = [
       "aws/*_aws_config_*",
@@ -650,6 +679,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_dlm_*",
       "**/dlm_*"
     ]
+    "service/docdb" = [
+      "**/*_docdb_*",
+      "**/docdb_*"
+    ]
     "service/dynamodb" = [
       "**/*_dynamodb_*",
       "**/dynamodb_*"
@@ -917,6 +950,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_pricing_*",
       "**/pricing_*"
     ]
+    "service/quicksight" = [
+      "**/*_quicksight_*",
+      "**/quicksight_*"
+    ]
     "service/ram" = [
       "**/*_ram_*",
       "**/ram_*"
@@ -935,6 +972,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_resourcegroups_*",
       "**/resourcegroups_*"
     ]
+    "service/robomaker" = [
+      "**/*_robomaker_*",
+      "**/robomaker_*",
+    ]
     "service/route53" = [
       "**/*_route53_delegation_set*",
       "**/*_route53_health_check*",
@@ -947,14 +988,14 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/route53_record*",
       "**/route53_zone*"
     ]
-    "service/robomaker" = [
-      "**/*_robomaker_*",
-      "**/robomaker_*",
-    ]
     "service/route53domains" = [
       "**/*_route53_domains_*",
       "**/route53_domains_*"
     ]
+    "service/route53resolver" = [
+      "**/*_route53resolver_*",
+      "**/route53resolver_*"
+    ]
     "service/s3" = [
       "**/*_s3_bucket*",
       "**/s3_bucket*",
@@ -1047,6 +1088,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_workdocs_*",
       "**/workdocs_*"
     ]
+    "service/worklink" = [
+      "**/*_worklink_*",
+      "**/worklink_*"
+    ]
     "service/workmail" = [
       "**/*_workmail_*",
       "**/workmail_*"

CHANGELOG.md

@@ -1,12 +1,32 @@
-## 2.32.0 (Unreleased)
+## 2.33.0 (Unreleased)
+
+FEATURES:
+
+* **New Data Source:** `aws_waf_rate_based_rule` [GH-10124]
+* **New Data Source:** `aws_wafregional_rate_based_rule` [GH-10125]
+* **New Resource:** `aws_quicksight_user` [GH-10401]
+
+BUG FIXES:
+
+* resource/aws_gamelift_fleet: Increase default deletion timeout to 20 minutes to match service timing [GH-10443]
+
+## 2.32.0 (October 10, 2019)
 
 NOTES:
 
-* provider: The underlying Terraform codebase dependency for the provider SDK and acceptance testing framework has been migrated from `github.com/hashicorp/terraform` to `github.com/hashicorp/terraform-plugin-sdk`. They are functionality equivalent and this should only impact codebase development to switch imports. For more information see the [Terraform Plugin SDK page in the Extending Terraform documentation](https://www.terraform.io/docs/extend/plugin-sdk.html). [GH-10367]
+* provider: The underlying Terraform codebase dependency for the provider SDK and acceptance testing framework has been migrated from `github.com/hashicorp/terraform` to `github.com/hashicorp/terraform-plugin-sdk`. They are functionality equivalent and this should only impact codebase development to switch imports. For more information see the [Terraform Plugin SDK page in the Extending Terraform documentation](https://www.terraform.io/docs/extend/plugin-sdk.html). ([#10367](https://github.com/terraform-providers/terraform-provider-aws/issues/10367))
+
+ENHANCEMENTS:
+
+* resource/aws_emr_instance_group: Add `configurations_json` argument ([#10426](https://github.com/terraform-providers/terraform-provider-aws/issues/10426))
 
 BUG FIXES:
 
-* resource/aws_s3_bucket: Prevent infinite deletion recursion with `force_destroy` argument and object keys with empty "directory" prefixes present since version 2.29.0 [GH-10388]
+* provider: Fix session handling to correctly validate and use assume_role credentials ([#10379](https://github.com/terraform-providers/terraform-provider-aws/issues/10379))
+* resource/aws_autoscaling_group: Batch ALB/NLB attachments and detachments by 10 to prevent API and rate limiting errors ([#10435](https://github.com/terraform-providers/terraform-provider-aws/issues/10435))
+* resource/aws_emr_instance_group: Remove terminated instance groups from the Terraform state ([#10425](https://github.com/terraform-providers/terraform-provider-aws/issues/10425))
+* resource/aws_s3_bucket: Prevent infinite deletion recursion with `force_destroy` argument and object keys with empty "directory" prefixes present since version 2.29.0 ([#10388](https://github.com/terraform-providers/terraform-provider-aws/issues/10388))
+* resource/aws_vpc_endpoint_route_table_association: Fix resource import support ([#10454](https://github.com/terraform-providers/terraform-provider-aws/issues/10454))
 
 ## 2.31.0 (October 03, 2019)
 

GNUmakefile

@@ -36,7 +36,6 @@ websitefmtcheck:
 
 lint:
 	@echo "==> Checking source code against linters..."
-	@golangci-lint run --no-config --deadline 5m --disable-all --enable staticcheck --exclude SA1019 --max-issues-per-linter 0 --max-same-issues 0 ./$(PKG_NAME)/...
 	@golangci-lint run ./$(PKG_NAME)/...
 	@tfproviderlint \
 		-c 1 \