Bump vendor versions (#286)

Bump vendor versions:

* github.com/Azure/go-autorest/autorest v0.11.4
* github.com/Azure/go-autorest/autorest/adal v0.9.2
* github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
* github.com/aws/aws-sdk-go v1.34.13
* gopkg.in/ini.v1 v1.60.2

Co-authored-by: Serge Smertin <[email protected]>

Author: nfx

access/acceptance/secret_test.go

@@ -10,25 +10,20 @@ import (
 
 	"github.com/databrickslabs/databricks-terraform/common"
 	"github.com/databrickslabs/databricks-terraform/internal/acceptance"
+	"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/stretchr/testify/assert"
 )
 
 func TestAccSecretResource(t *testing.T) {
-	// TODO: refactor for common instance pool & AZ CLI
 	if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
 		t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
 	}
-	//var secretScope Secre
 	var secret SecretMetadata
-	// generate a random name for each tokenInfo test run, to avoid
-	// collisions from multiple concurrent tests.
-	// the acctest package includes many helpers such as RandStringFromCharSet
-	// See https://godoc.org/github.com/hashicorp/terraform-plugin-sdk/helper/acctest
-	//scope := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
-	scope := "terraform_acc_test_secret"
-	key := "my_cool_key"
+	randomName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	scope := fmt.Sprintf("tf-scope-%s", randomName)
+	key := fmt.Sprintf("tf-key-%s", randomName)
 	stringValue := "my super secret key"
 
 	acceptance.AccTest(t, resource.TestCase{

common/http.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -413,6 +414,11 @@ func (c *DatabricksClient) genericQuery(method, requestURL string, data interfac
 		return nil, err
 	}
 	resp, err := c.httpClient.Do(r)
+	// retryablehttp library now returns only wrapped errors
+	var ae APIError
+	if errors.As(err, &ae) {
+		return nil, ae
+	}
 	if err != nil {
 		return nil, err
 	}

compute/acceptance/cluster_test.go

@@ -243,7 +243,6 @@ func TestAwsAccClusterResource_CreateClusterViaInstancePool(t *testing.T) {
 	randomStr := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 	instanceProfileRName := "my-tf-test-instance-profile"
 	instanceProfile := fmt.Sprintf("arn:aws:iam::999999999999:instance-profile/tf-test-%s", randomStr)
-	var clusterInfo ClusterInfo
 	awsAttrCluster := map[string]string{
 		"instance_profile_arn": fmt.Sprintf("${databricks_instance_profile.%s.id}", instanceProfileRName),
 	}
@@ -273,35 +272,34 @@ func TestAwsAccClusterResource_CreateClusterViaInstancePool(t *testing.T) {
 			{
 				Config: clusterNoInstanceProfileConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testClusterCheckAndTerminateForFutureTests(randomClusterId, &clusterInfo, t),
+					testClusterCheckAndTerminateForFutureTests(randomClusterId, t),
 				),
 			},
 			{
 				Config: clusterWithInstanceProfileConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testClusterCheckAndTerminateForFutureTests(randomClusterId, &clusterInfo, t),
+					testClusterCheckAndTerminateForFutureTests(randomClusterId, t),
 				),
 			},
 			{
 				Config: clusterNoInstanceProfileConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testClusterCheckAndTerminateForFutureTests(randomClusterId, &clusterInfo, t),
+					testClusterCheckAndTerminateForFutureTests(randomClusterId, t),
 				),
 				PlanOnly:           true,
 				ExpectNonEmptyPlan: true,
 			},
 			{
 				Config: clusterNoInstanceProfileConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testClusterCheckAndTerminateForFutureTests(randomClusterId, &clusterInfo, t),
+					testClusterCheckAndTerminateForFutureTests(randomClusterId, t),
 				),
 			},
 		},
 	})
 }
 
 func TestAzureAccClusterResource_CreateClusterViaInstancePool(t *testing.T) {
-	var clusterInfo ClusterInfo
 	randomInstancePoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
 	randomInstancePoolInterpolation := fmt.Sprintf("databricks_instance_pool.%s.id", randomInstancePoolName)
 	randomClusterSuffix := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
@@ -320,7 +318,7 @@ func TestAzureAccClusterResource_CreateClusterViaInstancePool(t *testing.T) {
 			{
 				Config: defaultAzureInstancePoolClusterTest,
 				Check: resource.ComposeTestCheckFunc(
-					testClusterCheckAndTerminateForFutureTests(randomClusterId, &clusterInfo, t),
+					testClusterCheckAndTerminateForFutureTests(randomClusterId, t),
 				),
 			},
 		},
@@ -331,7 +329,7 @@ func TestAccClusterResource_CreateClusterWithLibraries(t *testing.T) {
 	if os.Getenv("CLOUD_ENV") == "" {
 		return
 	}
-	randomName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	randomName := fmt.Sprintf("cluster-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	randomClusterID := fmt.Sprintf("databricks_cluster.%s", randomName)
 	var clusterInfo ClusterInfo
 
@@ -365,19 +363,15 @@ func TestAccClusterResource_CreateClusterWithLibraries(t *testing.T) {
 func testClusterCheckExists(n string, cluster *ClusterInfo, t *testing.T) resource.TestCheckFunc {
 	return acceptance.ResourceCheck(n, func(client *common.DatabricksClient, id string) error {
 		clusters := NewClustersAPI(client)
-		_, err := clusters.Get(id)
+		c, err := clusters.Get(id)
+		*cluster = c
 		return err
 	})
 }
 
-func testClusterCheckAndTerminateForFutureTests(n string, cluster *ClusterInfo, t *testing.T) resource.TestCheckFunc {
+func testClusterCheckAndTerminateForFutureTests(n string, t *testing.T) resource.TestCheckFunc {
 	return acceptance.ResourceCheck(n, func(client *common.DatabricksClient, id string) error {
-		clusters := NewClustersAPI(client)
-		_, err := clusters.Get(id)
-		if err != nil {
-			return err
-		}
-		return clusters.Terminate(id)
+		return NewClustersAPI(client).Terminate(id)
 	})
 }
 

docs/changelog.md

@@ -14,6 +14,14 @@
 * [Migrated all documentation](https://github.com/databrickslabs/terraform-provider-databricks/pull/250) to Terraform Registry format, therefore having a single always-accurate place for end-user guides.
 * Internally, codebase [has been split](https://github.com/databrickslabs/terraform-provider-databricks/pull/224) into multiple packages, which should make further contributions simpler.
 
+Updated dependency versions:
+
+* github.com/Azure/go-autorest/autorest v0.11.4
+* github.com/Azure/go-autorest/autorest/adal v0.9.2
+* github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
+* github.com/aws/aws-sdk-go v1.34.13
+* gopkg.in/ini.v1 v1.60.2
+
 **Deprecations**
 * `library_*` is no longer receiving fixes and will be removed in `0.3`, please rewrite cluster & job resources to use [`library` configuration block](https://github.com/databrickslabs/terraform-provider-databricks/blob/master/docs/resources/cluster.md#library-configuration-block).
 * `basic_auth` provider block is no longer receiving fixesand will be removed in `0.3`, please use `username` and `password` options

go.mod

@@ -3,25 +3,24 @@ module github.com/databrickslabs/databricks-terraform
 go 1.13
 
 require (
-	github.com/Azure/go-autorest/autorest v0.11.2
-	github.com/Azure/go-autorest/autorest/adal v0.9.0
-	github.com/Azure/go-autorest/autorest/azure/auth v0.5.0
+	github.com/Azure/go-autorest/autorest v0.11.4
+	github.com/Azure/go-autorest/autorest/adal v0.9.2
+	github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
 	github.com/Azure/go-autorest/autorest/azure/cli v0.4.0
-	github.com/aws/aws-sdk-go v1.33.11
+	github.com/aws/aws-sdk-go v1.34.13
 	github.com/fatih/color v1.9.0 // indirect
-	github.com/go-kit/kit v0.10.0
 	github.com/google/go-querystring v1.0.0
-	github.com/hashicorp/go-retryablehttp v0.6.6
+	github.com/hashicorp/go-retryablehttp v0.6.7
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/terraform-plugin-sdk v1.15.0
-	github.com/joho/godotenv v1.3.0
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/r3labs/diff v1.1.0
 	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect
-	gopkg.in/ini.v1 v1.57.0
-	gotest.tools v2.2.0+incompatible
+	go.opencensus.io v0.22.2 // indirect
+	golang.org/x/sys v0.0.0-20200828194041-157a740278f4 // indirect
+	gopkg.in/ini.v1 v1.60.2
 )