Upgrade to use TF SDK v2 (#1175)

- upgrade to TF sdk v2.8.0 - update test config to HCL2 - resource_auth_backend: drop deprecated inputs - ci: bump no_output_timeout to 20m - pin terraform version for tests - use hashicorp/vault Docker repo - bump go test timeout to 20m * fix: ci: use make target for acceptance tests - ci: move acceptance test environment to the test run - ci: use terraform-v1.0.7
hashicorp · Sep 29, 2021 · e349937 · e349937
1 parent ebd7b95
commit e349937
Show file tree

Hide file tree

Showing 257 changed files with 1,630 additions and 1,653 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,7 +19,7 @@ jobs:
       - image: circleci/mysql:latest
         environment:
           - MYSQL_ROOT_PASSWORD=mysql
-      - image: vault:latest
+      - image: hashicorp/vault:latest
         environment:
           - VAULT_DEV_ROOT_TOKEN_ID=root
     working_directory: /go/src/github.com/hashicorp/terraform-provider-vault
@@ -31,20 +31,21 @@ jobs:
       - run:
           name: "Set Environment Variables"
           command: |
-            echo 'export VAULT_TOKEN="root"' >> $BASH_ENV
-            echo 'export VAULT_ADDR="http://127.0.0.1:8200"' >> $BASH_ENV
-            echo 'export TF_ACC="1"' >> $BASH_ENV
             echo 'GO111MODULE=on' >> $BASH_ENV
             echo 'export GOBIN=$GOPATH/bin' >> $BASH_ENV
-            echo 'export MYSQL_URL="root:mysql@tcp(127.0.0.1:3306)/"' >> $BASH_ENV
-            echo 'export MYSQL_CONNECTION_URL="{{username}}:{{password}}@tcp(127.0.0.1:3306)/"' >> $BASH_ENV
-            echo 'export MYSQL_CONNECTION_USERNAME="root"' >> $BASH_ENV
-            echo 'export MYSQL_CONNECTION_PASSWORD="mysql"' >> $BASH_ENV
-            echo 'export MONGODB_URL="mongodb://root:mongodb@localhost:27017/admin?ssl=false"' >> $BASH_ENV
       - run:
           name: "Run Tests"
+          no_output_timeout: 30m
           command: |
-            go test -v ./...
+            export VAULT_TOKEN="root"
+            export VAULT_ADDR="http://127.0.0.1:8200"
+            export TF_ACC_TERRAFORM_VERSION="1.0.7"
+            export MYSQL_URL="root:mysql@tcp(127.0.0.1:3306)/"
+            export MYSQL_CONNECTION_URL="{{username}}:{{password}}@tcp(127.0.0.1:3306)/"
+            export MYSQL_CONNECTION_USERNAME="root"
+            export MYSQL_CONNECTION_PASSWORD="mysql"
+            export MONGODB_URL="mongodb://root:mongodb@localhost:27017/admin?ssl=false"
+            make testacc TESTARGS='-v'
       - run:
           name: "Run Build"
           command: |

diff --git a/GNUmakefile b/GNUmakefile
@@ -14,7 +14,7 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 20m
 
 dev: fmtcheck
 	go build -o terraform-provider-vault

diff --git a/generated/datasources/transform/decode/role_name.go b/generated/datasources/transform/decode/role_name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/datasources/transform/decode/role_name_test.go b/generated/datasources/transform/decode/role_name_test.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role"
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation"
 	"github.com/hashicorp/terraform-provider-vault/schema"
@@ -27,8 +28,8 @@ func TestDecodeBasic(t *testing.T) {
 	path := acctest.RandomWithPrefix("transform")
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": roleNameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": roleNameTestProvider.SchemaProvider(),
 		},
 		Steps: []resource.TestStep{
 			{
@@ -72,8 +73,8 @@ func TestDecodeBatch(t *testing.T) {
 	path := acctest.RandomWithPrefix("transform")
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": roleNameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": roleNameTestProvider.SchemaProvider(),
 		},
 		Steps: []resource.TestStep{
 			{

diff --git a/generated/datasources/transform/encode/role_name.go b/generated/datasources/transform/encode/role_name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/datasources/transform/encode/role_name_test.go b/generated/datasources/transform/encode/role_name_test.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/role"
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/transformation"
 	"github.com/hashicorp/terraform-provider-vault/schema"
@@ -27,8 +28,8 @@ func TestEncodeBasic(t *testing.T) {
 	path := acctest.RandomWithPrefix("transform")
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": roleNameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": roleNameTestProvider.SchemaProvider(),
 		},
 		Steps: []resource.TestStep{
 			{
@@ -72,8 +73,8 @@ func TestEncodeBatch(t *testing.T) {
 	path := acctest.RandomWithPrefix("transform")
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": roleNameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": roleNameTestProvider.SchemaProvider(),
 		},
 		Steps: []resource.TestStep{
 			{

diff --git a/generated/resources/transform/alphabet/name.go b/generated/resources/transform/alphabet/name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/resources/transform/alphabet/name_test.go b/generated/resources/transform/alphabet/name_test.go
@@ -4,13 +4,15 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/vault/api"
+
 	"github.com/hashicorp/terraform-provider-vault/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/terraform-provider-vault/vault"
-	"github.com/hashicorp/vault/api"
 )
 
 var nameTestProvider = func() *schema.Provider {
@@ -25,8 +27,8 @@ func TestAlphabetName(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": nameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": nameTestProvider.SchemaProvider(),
 		},
 		CheckDestroy: destroy,
 		Steps: []resource.TestStep{

diff --git a/generated/resources/transform/role/name.go b/generated/resources/transform/role/name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/resources/transform/role/name_test.go b/generated/resources/transform/role/name_test.go
@@ -4,13 +4,15 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/vault/api"
+
 	"github.com/hashicorp/terraform-provider-vault/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/terraform-provider-vault/vault"
-	"github.com/hashicorp/vault/api"
 )
 
 var nameTestProvider = func() *schema.Provider {
@@ -26,8 +28,8 @@ func TestRoleName(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": nameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": nameTestProvider.SchemaProvider(),
 		},
 		CheckDestroy: destroy,
 		Steps: []resource.TestStep{

diff --git a/generated/resources/transform/template/name.go b/generated/resources/transform/template/name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/resources/transform/template/name_test.go b/generated/resources/transform/template/name_test.go
@@ -4,14 +4,16 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/vault/api"
+
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet"
 	"github.com/hashicorp/terraform-provider-vault/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/terraform-provider-vault/vault"
-	"github.com/hashicorp/vault/api"
 )
 
 var nameTestProvider = func() *schema.Provider {
@@ -27,8 +29,8 @@ func TestTemplateName(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": nameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": nameTestProvider.SchemaProvider(),
 		},
 		CheckDestroy: destroy,
 		Steps: []resource.TestStep{

diff --git a/generated/resources/transform/transformation/name.go b/generated/resources/transform/transformation/name.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/vault/api"
 )

diff --git a/generated/resources/transform/transformation/name_test.go b/generated/resources/transform/transformation/name_test.go
@@ -4,13 +4,15 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdk_schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/vault/api"
+
 	"github.com/hashicorp/terraform-provider-vault/schema"
 	"github.com/hashicorp/terraform-provider-vault/util"
 	"github.com/hashicorp/terraform-provider-vault/vault"
-	"github.com/hashicorp/vault/api"
 )
 
 var nameTestProvider = func() *schema.Provider {
@@ -25,8 +27,8 @@ func TestTransformationName(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { util.TestEntPreCheck(t) },
-		Providers: map[string]terraform.ResourceProvider{
-			"vault": nameTestProvider.ResourceProvider(),
+		Providers: map[string]*sdk_schema.Provider{
+			"vault": nameTestProvider.SchemaProvider(),
 		},
 		CheckDestroy: destroy,
 		Steps: []resource.TestStep{
@@ -51,7 +53,7 @@ func TestTransformationName(t *testing.T) {
 						return fmt.Errorf("expected 1 state but received %+v", states)
 					}
 					state := states[0]
-					if len(state.Attributes) != 9 {
+					if state.Attributes["%"] != "9" {
 						t.Fatalf("expected 9 attributes but received %d", len(state.Attributes))
 					}
 					if state.Attributes["templates.#"] != "1" {

diff --git a/generated/terraform_registry.go b/generated/terraform_registry.go
@@ -1,7 +1,7 @@
 package generated
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/decode"
 	"github.com/hashicorp/terraform-provider-vault/generated/datasources/transform/encode"
 	"github.com/hashicorp/terraform-provider-vault/generated/resources/transform/alphabet"

diff --git a/go.mod b/go.mod
@@ -17,11 +17,11 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1
-	github.com/hashicorp/terraform-plugin-sdk v1.9.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0
 	github.com/hashicorp/vault v1.2.0
 	github.com/hashicorp/vault/api v1.1.2-0.20210719211531-6b31c12b0af2
 	github.com/hashicorp/vault/sdk v0.2.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 )