Merge remote-tracking branch 'upstream/master' into pulumi-master

Author: pgavlin

.circleci/config.yml

@@ -16,13 +16,13 @@ commands:
 jobs:
   "docker-go114 build":
     docker:
-      - image: circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
     steps:
       - get_dependencies
       - run: go build ./...
   "docker-go114 test":
     docker:
-      - image: circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
         environment:
           TF_ACC_TERRAFORM_VERSION: "0.12.26"
     parameters:
@@ -44,19 +44,19 @@ jobs:
           path: << parameters.test_results >>
   "docker-go114 vet":
     docker:
-      - image: circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
     steps:
       - get_dependencies
       - run: go vet ./...
   "docker-go114 gofmt":
     docker:
-      - image: circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
     steps:
       - get_dependencies
       - run: ./scripts/gofmtcheck.sh
   "docker-go114 release":
     docker:
-      - image: circleci/golang:1.14
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.14
     steps:
       - add_ssh_keys:
           fingerprints:

.go-version

@@ -1 +1 @@
-1.14.2
+1.14.9

CHANGELOG.md

@@ -1,15 +1,71 @@
-# 2.0.2 (Unreleased)
+# 2.4.0 (Unreleased)
+
+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]
+
+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]
+
+NOTES
+
+We have removed the deprecation of the non-diagnostic version of validation until the build-in validations are ported to the new format.
+
+# 2.3.0 (November 20, 2020)
+
+ENHANCEMENTS
+
+* `helper/schema.ResourceData` now has `HasChangeExcept` and `HasChangesExcept` methods to check if the resource has changes _besides_ a given key or list of keys. ([#558](https://github.com/hashicorp/terraform-plugin-sdk/issues/558))
+* `helper/resource.TestCase` now has an `ErrorCheck` property that can be set to a function, allowing the programmatic determination of whether to ignore an error or not. ([#592](https://github.com/hashicorp/terraform-plugin-sdk/issues/592))
+
+# 2.2.0 (November 02, 2020)
+
+FEATURES
+* Updated to use the new [`terraform-plugin-go`](https://github.com/hashicorp/terraform-plugin-go) library as a foundation for the SDK, enabling it to be used with [`terraform-plugin-mux`](https://github.com/hashicorp/terraform-plugin-mux) ([#630](https://github.com/hashicorp/terraform-plugin-sdk/issues/630))
+* Added the `TestCase.ProtoV5ProviderFactories` property to allow testing providers created with `terraform-plugin-go` with the `helper/resource` test framework. ([#630](https://github.com/hashicorp/terraform-plugin-sdk/issues/630))
+
+# 2.1.0 (October 27, 2020)
+
+FEATURES
+* Relaxed validation in `InternalValidate` for explicitly set `id` attributes ([#613](https://github.com/hashicorp/terraform-plugin-sdk/issues/613))
+* Ported TypeSet test check funcs essential for migrating to V2 of the SDK ([#614](https://github.com/hashicorp/terraform-plugin-sdk/issues/614))
+* Improved debug output for how to manually invoke the Terraform CLI ([#615](https://github.com/hashicorp/terraform-plugin-sdk/issues/615))
+
+# 2.0.4 (October 06, 2020)
+
+BUG FIXES
+* Fix a bug that would pass the post-destroy state to `helper/resource.TestCase.CheckDestroy` instead of the documented pre-destroy state ([#591](https://github.com/hashicorp/terraform-plugin-sdk/issues/591))
+* Clean up the final remaining places where test numbers or dangling resources warnings could be omitted from errors ([#578](https://github.com/hashicorp/terraform-plugin-sdk/issues/578))
+* Stop considering plans empty when they include data source changes ([#594](https://github.com/hashicorp/terraform-plugin-sdk/issues/594))
+
+# 2.0.3 (September 15, 2020)
+
+BUG FIXES
+
+* Fixed a bug that would incorrectly mark tests using TestStep.ImportStateVerify as failed if they tested a resource with custom timeouts ([#576](https://github.com/hashicorp/terraform-plugin-sdk/issues/576))
+* Fixed a bug where errors destroying infrastructure after tests wouldn't be reported ([#581](https://github.com/hashicorp/terraform-plugin-sdk/issues/581))
+* Fixed a bug where test steps that expected a non-empty plan would fail because they had an empty plan, erroneously ([#580](https://github.com/hashicorp/terraform-plugin-sdk/issues/580))
+* Fixed a bug where the plan output shown when an unexpected diff was encountered during testing would be shown in JSON instead of a human-readable format ([#584](https://github.com/hashicorp/terraform-plugin-sdk/issues/584))
+
+# 2.0.2 (September 10, 2020)
 
 BUG FIXES
 
-* Fixed bug where state is read from the wrong workspace during import tests. [GH-552]
-* Fixed bug where the resource could belong to another provider when finding the resource state to check during import tests [GH-522]
-* Removed excessive logging when ExpectNonEmptyPlan was successfully matched [GH-556]
-* Fixed bug where state from data sources, which can't be imported, would be surfaced during ImportStateVerify [GH-555]
-* Fixed bug that ignored ExpectError when testing state imports [GH-550]
-* Fixed bug that sometimes prevented TestStep numbers from appearing in error output [GH-557]
-* Fixed bug that would ignore `TestStep.Destroy` when running tests. [GH-563]
-* Fixed bug where reattach info would not be supplied during tests. [GH-567]
+* Fixed bug where state is read from the wrong workspace during import tests. ([#552](https://github.com/hashicorp/terraform-plugin-sdk/issues/552))
+* Fixed bug where the resource could belong to another provider when finding the resource state to check during import tests ([#522](https://github.com/hashicorp/terraform-plugin-sdk/issues/522))
+* Removed excessive logging when ExpectNonEmptyPlan was successfully matched ([#556](https://github.com/hashicorp/terraform-plugin-sdk/issues/556))
+* Fixed bug where state from data sources, which can't be imported, would be surfaced during ImportStateVerify ([#555](https://github.com/hashicorp/terraform-plugin-sdk/issues/555))
+* Fixed bug that ignored ExpectError when testing state imports ([#550](https://github.com/hashicorp/terraform-plugin-sdk/issues/550))
+* Fixed bug that sometimes prevented TestStep numbers from appearing in error output ([#557](https://github.com/hashicorp/terraform-plugin-sdk/issues/557))
+* Fixed bug that would ignore `TestStep.Destroy` when running tests. ([#563](https://github.com/hashicorp/terraform-plugin-sdk/issues/563))
 
 # 2.0.1 (August 10, 2020)
 

Makefile

@@ -8,16 +8,6 @@ test: fmtcheck generate
 generate:
 	go generate ./...
 
-# We separate the protobuf generation because most development tasks on
-# Terraform do not involve changing protobuf files and protoc is not a
-# go-gettable dependency and so getting it installed can be inconvenient.
-#
-# If you are working on changes to protobuf interfaces you may either use
-# this target or run the individual scripts below directly.
-protobuf:
-	bash scripts/protobuf-check.sh
-	bash internal/tfplugin5/generate.sh
-
 fmt:
 	gofmt -w $(GOFMT_FILES)
 

README.md

@@ -8,13 +8,19 @@ Terraform itself is a tool for building, changing, and versioning infrastructure
 
 ## Terraform CLI Compatibility
 
-| Terraform CLI | SDK v1.x | SDK v2.x |
-|---|---|---|
-| 0.11 | Yes | No |
-| 0.12 | Yes* | Yes |
-| 0.13 | Yes* | Yes |
+Terraform 0.12.0 or later is needed for version 2.0.0 and later of the Plugin SDK.
 
-_* SDK v1.x supports both Terraform 0.12 and 0.13, but in order to maintain compatibility with Terraform 0.11, it cannot take advantage of new features that are only available in newer versions._
+When running provider tests, Terraform 0.12.26 or later is needed for version 2.0.0 and later of the Plugin SDK. Users can still use any version after 0.12.0.
+
+## Go Compatibility
+
+The Terraform Plugin SDK is built in Go, and uses the [support policy](https://golang.org/doc/devel/release.html#policy) of Go as its support policy. The two latest major releases of Go are supported by the SDK.
+
+Currently, that means Go **1.14** or later must be used when building a provider with the SDK.
+
+## Getting Started
+
+See the [Call APIs with Terraform Providers](https://learn.hashicorp.com/collections/terraform/providers) guide on [learn.hashicorp.com](https://learn.hashicorp.com) for a guided tour of provider development.
 
 ## Documentation
 
@@ -49,6 +55,10 @@ See [Extending Terraform](https://www.terraform.io/docs/extend/index.html) secti
 
 Migrating to the standalone SDK v1 is covered on the [Plugin SDK section](https://www.terraform.io/docs/extend/plugin-sdk.html) of the website.
 
+## Migrating to SDK v2 from SDK v1
+
+Migrating to the v2 release of the SDK is covered in the [v2 Upgrade Guide](https://www.terraform.io/docs/extend/guides/v2-upgrade-guide.html) of the website.
+
 ## Versioning
 
 The Terraform Plugin SDK is a [Go module](https://github.com/golang/go/wiki/Modules) versioned using [semantic versioning](https://semver.org/).

diag/helpers.go

@@ -10,6 +10,9 @@ import "fmt"
 //     return diag.FromErr(err)
 //   }
 func FromErr(err error) Diagnostics {
+	if err == nil {
+		return nil
+	}
 	return Diagnostics{
 		Diagnostic{
 			Severity: Error,

go.mod

@@ -12,23 +12,22 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-test/deep v1.0.3
 	github.com/golang/mock v1.4.3
-	github.com/golang/protobuf v1.4.2
 	github.com/golang/snappy v0.0.1
-	github.com/google/go-cmp v0.5.0
+	github.com/google/go-cmp v0.5.2
 	github.com/hashicorp/errwrap v1.0.0
 	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
-	github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect
-	github.com/hashicorp/go-hclog v0.9.2
+	github.com/hashicorp/go-getter v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v0.15.0
 	github.com/hashicorp/go-multierror v1.0.0
-	github.com/hashicorp/go-plugin v1.3.0
+	github.com/hashicorp/go-plugin v1.4.0
 	github.com/hashicorp/go-uuid v1.0.1
 	github.com/hashicorp/go-version v1.2.1
 	github.com/hashicorp/hcl/v2 v2.3.0
 	github.com/hashicorp/logutils v1.0.0
-	github.com/hashicorp/terraform-exec v0.9.0
-	github.com/hashicorp/terraform-json v0.5.0
-	github.com/hashicorp/terraform-plugin-test/v2 v2.1.1
+	github.com/hashicorp/terraform-exec v0.12.0
+	github.com/hashicorp/terraform-json v0.8.0
+	github.com/hashicorp/terraform-plugin-go v0.1.0
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
 	github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -38,10 +37,8 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/mitchellh/reflectwalk v1.0.1
 	github.com/pierrec/lz4 v2.0.5+incompatible
-	github.com/ulikunitz/xz v0.5.7 // indirect
-	github.com/vmihailenco/msgpack v4.0.1+incompatible // indirect
 	github.com/zclconf/go-cty v1.2.1
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed
-	google.golang.org/grpc v1.30.0
+	google.golang.org/grpc v1.32.0
 )