Merge v2.7.0

Author: stack72

.circleci/config.yml

@@ -14,15 +14,15 @@ commands:
             - "/go/pkg/mod"
 
 jobs:
-  "docker-go114 build":
+  "docker-go115 build":
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
     steps:
       - get_dependencies
       - run: go build ./...
-  "docker-go114 test":
+  "docker-go115 test":
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
         environment:
           TF_ACC_TERRAFORM_VERSION: "0.12.26"
     parameters:
@@ -42,67 +42,130 @@ jobs:
           destination: raw-test-output
       - store_test_results:
           path: << parameters.test_results >>
-  "docker-go114 vet":
+  "docker-go115 vet":
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
     steps:
       - get_dependencies
       - run: go vet ./...
-  "docker-go114 gofmt":
+  "docker-go115 gofmt":
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
     steps:
       - get_dependencies
       - run: ./scripts/gofmtcheck.sh
-  "docker-go114 release":
+  "docker-go115 release":
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
     steps:
       - add_ssh_keys:
           fingerprints:
             - "3b:ec:3f:f1:0d:1a:a9:2c:a6:6f:03:cb:46:37:11:50"
       - get_dependencies
       - run: ./scripts/release/release.sh
+  "docker-go116 build":
+    docker:
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+    steps:
+      - get_dependencies
+      - run: go build ./...
+  "docker-go116 test":
+    docker:
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+        environment:
+          TF_ACC_TERRAFORM_VERSION: "0.12.26"
+    parameters:
+      test_results:
+        type: string
+        default: /tmp/test-results
+    steps:
+      - get_dependencies
+      - run: mkdir -p << parameters.test_results >>/report
+      - run:
+          command: |
+            gotestsum --junitfile << parameters.test_results >>/report/gotestsum-report.xml -- -coverprofile=cover.out ./...
+            go tool cover -html=cover.out -o coverage.html
+            mv coverage.html << parameters.test_results >>
+      - store_artifacts:
+          path: << parameters.test_results >>
+          destination: raw-test-output
+      - store_test_results:
+          path: << parameters.test_results >>
+  "docker-go116 vet":
+    docker:
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+    steps:
+      - get_dependencies
+      - run: go vet ./...
+  "docker-go116 gofmt":
+    docker:
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+    steps:
+      - get_dependencies
+      - run: ./scripts/gofmtcheck.sh
 
 workflows:
   version: 2
   pr:
     jobs:
-      - "docker-go114 build"
-      - "docker-go114 test":
+      - "docker-go115 build"
+      - "docker-go115 test":
+          requires:
+            - "docker-go115 build"
+      - "docker-go115 vet":
+          requires:
+            - "docker-go115 build"
+      - "docker-go115 gofmt":
           requires:
-            - "docker-go114 build"
-      - "docker-go114 vet":
+            - "docker-go115 build"
+      - "docker-go116 build"
+      - "docker-go116 test":
           requires:
-            - "docker-go114 build"
-      - "docker-go114 gofmt":
+            - "docker-go116 build"
+      - "docker-go116 vet":
           requires:
-            - "docker-go114 build"
+            - "docker-go116 build"
+      - "docker-go116 gofmt":
+          requires:
+            - "docker-go116 build"
   release:
     jobs:
-      - "docker-go114 build"
-      - "docker-go114 test":
+      - "docker-go115 build"
+      - "docker-go115 test":
+          requires:
+            - "docker-go115 build"
+      - "docker-go115 vet":
+          requires:
+            - "docker-go115 build"
+      - "docker-go115 gofmt":
+          requires:
+            - "docker-go115 build"
+      - "docker-go116 build"
+      - "docker-go116 test":
           requires:
-            - "docker-go114 build"
-      - "docker-go114 vet":
+            - "docker-go116 build"
+      - "docker-go116 vet":
           requires:
-            - "docker-go114 build"
-      - "docker-go114 gofmt":
+            - "docker-go116 build"
+      - "docker-go116 gofmt":
           requires:
-            - "docker-go114 build"
+            - "docker-go116 build"
       - trigger-release:
           filters:
             branches:
               only:
-                - master
+                - main
           type: approval
-      - "docker-go114 release":
+      - "docker-go115 release":
           filters:
             branches:
               only:
-                - master
+                - main
           requires:
             - trigger-release
-            - "docker-go114 test"
-            - "docker-go114 vet"
-            - "docker-go114 gofmt"
+            - "docker-go115 test"
+            - "docker-go115 vet"
+            - "docker-go115 gofmt"
+            - "docker-go116 test"
+            - "docker-go116 vet"
+            - "docker-go116 gofmt"

.github/CONTRIBUTING.md

@@ -41,10 +41,10 @@ This section describes the scope of notable repositories, which may help you
 ensure you're in the right place when reporting bugs and feature requests,
 or submitting a patch.
 
- - `hashicorp/terraform` - Terraform **Core** which implements all the low-level functionality which isn't domain specific (that's covered by providers). Read more about [distinction between core & providers in the Readme](https://github.com/hashicorp/terraform-plugin-sdk/blob/master/README.md#scope-providers-vs-core).
+ - `hashicorp/terraform` - Terraform **Core** which implements all the low-level functionality which isn't domain specific (that's covered by providers). Read more about [distinction between core & providers in the Readme](https://github.com/hashicorp/terraform-plugin-sdk/blob/main/README.md#scope-providers-vs-core).
  - `terraform-providers/*` - This organization contains all official Terraform **Providers** built on top of the Plugin SDK
  - `hashicorp/terraform-plugin-sdk` - Terraform **Plugin SDK** used to build Providers
- - `hashicorp/terraform-website` - Source code of **documentation** published on [terraform.io](https://www.terraform.io), including [Extend section](https://www.terraform.io/docs/extend/index.html) which has source in [the `extend` folder](https://github.com/hashicorp/terraform-website/tree/master/content/source/docs/extend).
+ - `hashicorp/terraform-website` - Source code of **documentation** published on [terraform.io](https://www.terraform.io), including [Extend section](https://www.terraform.io/docs/extend/index.html) which has source in [the `extend` folder](https://github.com/hashicorp/terraform-website/tree/main/content/source/docs/extend).
  - `hashicorp/hcl2` - **HCL** (HashiCorp Config Language) is the language used by users of Terraform (Core) to describe infrastructure. The parser and other features concerning the language (such as builtin functions) are found here.
  - `zclconf/go-cty` - **cty**, the type system used by both Terraform (Core) and SDK (therefore providers too) to represent data in state before and after gRPC encoding/decoding
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ labels: bug
 <!---
 Inspect your go.mod as below to find the version, and paste the result between the ``` marks below.
 
-go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk/v2")'
+go list -m github.com/hashicorp/terraform-plugin-sdk/...
 
 If you are not running the latest version of the SDK, please try upgrading
 because your bug may have already been fixed.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,7 +8,7 @@ labels: enhancement
 <!--
 Inspect your go.mod as below to find the version, and paste the result between the ``` marks below.
 
-go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk/v2")'
+go list -m github.com/hashicorp/terraform-plugin-sdk/...
 
 If you are not running the latest version of the SDK, please try upgrading
 because your feature may have already been implemented.

.github/workflows/issue-comment-created.yml

@@ -0,0 +1,15 @@
+name: Issue Comment Created Triage
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  issue_comment_triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: |
+            stale
+            waiting-reply

.github/workflows/lock.yml

@@ -0,0 +1,23 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '50 1 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-comment: >
+            I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
+
+            If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
+          issue-lock-inactive-days: '30'
+          pr-lock-comment: >
+            I'm going to lock this pull request because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active contributions.
+
+            If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
+          pr-lock-inactive-days: '30'

.go-version

@@ -1 +1 @@
-1.14.9
+1.15.8

.hashibot.hcl

@@ -1,19 +1,76 @@
-# 2.4.0 (Unreleased)
+# 2.7.0 (June 25, 2021)
+
+ENHANCEMENTS:
+
+* Added `ProtoV6ProviderFactories` to `TestCase`, so protocol version 6 providers can be used in acceptance tests ([#761](https://github.com/hashicorp/terraform-plugin-sdk/issues/761))
+* Made SDK-generated diagnostics clearer and more consistent ([#755](https://github.com/hashicorp/terraform-plugin-sdk/issues/755))
+* Upgraded to use terraform-exec v0.14.0, which is required for acceptance test compatibility with Terraform v1.0.1 ([#775](https://github.com/hashicorp/terraform-plugin-sdk/issues/775))
+
+# 2.6.1 (April 23, 2021)
+
+BUG FIXES:
+
+* Updated the GPG key used to verify Terraform installs in response to the [Terraform GPG key rotation](https://discuss.hashicorp.com/t/hcsec-2021-12-codecov-security-event-and-hashicorp-gpg-key-exposure/23512). ([#750](https://github.com/hashicorp/terraform-plugin-sdk/issues/750))
+
+# 2.6.0 (April 21, 2021)
+
+ENHANCEMENTS:
+
+* Made TF_ACC_TERRAFORM_VERSION more permissive, accepting values in either vX.Y.Z or X.Y.Z formats. ([#731](https://github.com/hashicorp/terraform-plugin-sdk/issues/731))
+* Upgraded to use terraform-plugin-go v0.3.0 ([#739](https://github.com/hashicorp/terraform-plugin-sdk/issues/739))
+
+# 2.5.0 (March 24, 2021)
+
+ENHANCEMENTS
+
+* Added the ability to opt out of context timeouts in CRUD functions ([#723](https://github.com/hashicorp/terraform-plugin-sdk/issues/723))
+
+# 2.4.4 (February 24, 2021)
+
+NOTES
+
+As per our Go version support policy, we now require Go 1.15 or higher to use the SDK.
+
+BUG FIXES
+
+* Resolved bug where Diagnostics wouldn't get associated with their configuration context in user output. ([#696](https://github.com/hashicorp/terraform-plugin-sdk/issues/696))
+
+# 2.4.3 (February 10, 2021)
+
+BUG FIXES
+
+* Make acceptance testing framework compatible with Terraform 0.15 ([#694](https://github.com/hashicorp/terraform-plugin-sdk/issues/694))
+
+# 2.4.2 (January 27, 2021)
+
+BUG FIXES
+
+* Don't panic in very specific circumstances involving CustomizeDiff and empty strings in the config ([#686](https://github.com/hashicorp/terraform-plugin-sdk/issues/686))
+
+# 2.4.1 (January 20, 2021)
+
+BUG FIXES
+
+* Don't panic during assertions when testing sets with varying levels of nesting ([#648](https://github.com/hashicorp/terraform-plugin-sdk/issues/648))
+* Prevent panics when sending Ctrl-C to Terraform ([#674](https://github.com/hashicorp/terraform-plugin-sdk/issues/674))
+* Make the error message when a "required" block is missing clearer, identifying the block in question ([#672](https://github.com/hashicorp/terraform-plugin-sdk/issues/672))
+
+# 2.4.0 (December 19, 2020)
 
 ENHANCEMENTS
 
-* Support `Unwrap` on SDK errors [GH-647]
-* Allow for `nil` errors in `diag.FromErr` [GH-623]
-* Added `validation.ToDiagFunc` helper to translate legacy validation functions into Diagnostics-aware validation functions. [GH-611]
-* Disable Checkpoint network connections during acceptance testing unless a Terraform binary needs to be installed. [GH-663]
+* Support `Unwrap` on SDK errors ([#647](https://github.com/hashicorp/terraform-plugin-sdk/issues/647))
+* Allow for `nil` errors in `diag.FromErr` ([#623](https://github.com/hashicorp/terraform-plugin-sdk/issues/623))
+* Added `validation.ToDiagFunc` helper to translate legacy validation functions into Diagnostics-aware validation functions. ([#611](https://github.com/hashicorp/terraform-plugin-sdk/issues/611))
+* Disable Checkpoint network connections during acceptance testing unless a Terraform binary needs to be installed. ([#663](https://github.com/hashicorp/terraform-plugin-sdk/issues/663))
 
 BUG FIXES
 
-* Check for `nil` errors prior to invoking `ErrorCheck` [GH-646]
-* More reliable handling of logging [GH-639]
-* Modified error text to make golint and go vet happy when a non-empty plan is found in testing and an empty plan was expected [GH-596]
-* Add `UseJSONNumber` to `helper/schema.Resource` to make it possible to represent large numbers precisely. Setting to `true` will make numbers appear as `json.Number` in `StateUpgrader`s instead of as `float64`. [GH-662]
-* Fix logs sometimes appearing in test output when running acceptance tests. [GH-665]
+* Check for `nil` errors prior to invoking `ErrorCheck` ([#646](https://github.com/hashicorp/terraform-plugin-sdk/issues/646))
+* More reliable handling of logging ([#639](https://github.com/hashicorp/terraform-plugin-sdk/issues/639))
+* Modified error text to make golint and go vet happy when a non-empty plan is found in testing and an empty plan was expected ([#596](https://github.com/hashicorp/terraform-plugin-sdk/issues/596))
+* Add `UseJSONNumber` to `helper/schema.Resource` to make it possible to represent large numbers precisely. Setting to `true` will make numbers appear as `json.Number` in `StateUpgrader`s instead of as `float64`. ([#662](https://github.com/hashicorp/terraform-plugin-sdk/issues/662))
+* Fix logs sometimes appearing in test output when running acceptance tests. ([#665](https://github.com/hashicorp/terraform-plugin-sdk/issues/665))
 
 NOTES