Fix #294 - Reliable indication of Azure (#312)

* DatabricksClient.IsAzure is checking for both resource id and workspace hostname
* Added more unit test coverage for ClustersAPI
* Fixed version linking

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

Author: nfx

.goreleaser.yml

@@ -10,7 +10,7 @@ builds:
   binary: terraform-provider-databricks_{{ .Tag }}
   ldflags:
     # sets client version, not the default main.version
-    - '-X "common.version={{ replace .Version "v" "" }}"'
+    - '-X github.com/databrickslabs/databricks-terraform/common.version={{ replace .Version "v" "" }}'
   goos:
     - windows
     - linux

Makefile

@@ -18,23 +18,25 @@ coverage: test
 	@echo "✓ Opening coverage for unit tests..."
 	@go tool cover -html=coverage.txt
 
+VERSION = $(shell git describe --long --always | sed 's/v//')
+
 build:
 	@echo "✓ Building source code with go build..."
-	@go build -mod vendor -v -ldflags="-X 'common.version=$(git describe --long --always | sed 's/v//')'" -o terraform-provider-databricks
+	@go build -mod vendor -v -ldflags="-X github.com/databrickslabs/databricks-terraform/common.version=${VERSION}" -o terraform-provider-databricks
 
 install: build
 	@echo "✓ Installing provider into ~/.terraform.d/plugins ..."
 	@test -d $(HOME)/.terraform.d/plugins && rm $(HOME)/.terraform.d/plugins/terraform-provider-databricks* || mkdir -p $(HOME)/.terraform.d/plugins
 	@cp terraform-provider-databricks $(HOME)/.terraform.d/plugins
-	@mkdir -p '$(HOME)/.terraform.d/plugins/registry.terraform.io/databrickslabs/databricks/$(shell git describe --long --always | sed 's/v//')/$(shell go version | awk '{print $$4}' | sed 's#/#_#')'
-	@cp terraform-provider-databricks '$(HOME)/.terraform.d/plugins/registry.terraform.io/databrickslabs/databricks/$(shell git describe --long --always | sed 's/v//')/$(shell go version | awk '{print $$4}' | sed 's#/#_#')'
+	@mkdir -p '$(HOME)/.terraform.d/plugins/registry.terraform.io/databrickslabs/databricks/${VERSION}/$(shell go version | awk '{print $$4}' | sed 's#/#_#')'
+	@cp terraform-provider-databricks '$(HOME)/.terraform.d/plugins/registry.terraform.io/databrickslabs/databricks/${VERSION}/$(shell go version | awk '{print $$4}' | sed 's#/#_#')'
 	@echo "✓ Use the following configuration to enable the version you've built"
 	@echo 
 	@echo "terraform {"
 	@echo "  required_providers {"
 	@echo "    databricks = {"
 	@echo '      source = "databrickslabs/databricks"'
-	@echo '      version = "$(shell git describe --long --always | sed 's/v//')"'
+	@echo '      version = "${VERSION}"'
 	@echo "    }"
 	@echo "  }"
 	@echo "}"

common/client.go

@@ -210,7 +210,7 @@ func (c *DatabricksClient) configureHTTPCLient() {
 	}
 }
 
-// IsUsingAzureAuth returns true if Azure authentication is configured, this is not a valid check to determine if we are running on Azure
-func (c *DatabricksClient) IsUsingAzureAuth() bool {
-	return c.AzureAuth.resourceID() != ""
+// IsAzure returns true if client is configured for Azure Databricks - either by using AAD auth or with host+token combination
+func (c *DatabricksClient) IsAzure() bool {
+	return c.AzureAuth.resourceID() != "" || strings.Contains(c.Host, "azuredatabricks.net")
 }

compute/clusters.go

@@ -230,9 +230,7 @@ func (a ClustersAPI) Unpin(clusterID string) error {
 // up to 70 of the most recently terminated interactive clusters in the past 30 days,
 // and up to 30 of the most recently terminated job clusters in the past 30 days
 func (a ClustersAPI) List() ([]ClusterInfo, error) {
-	var clusterList = struct {
-		Clusters []ClusterInfo `json:"clusters,omitempty" url:"clusters,omitempty"`
-	}{}
+	var clusterList ClusterList
 	err := a.client.Get("/clusters/list", nil, &clusterList)
 	return clusterList.Clusters, err
 }
@@ -281,7 +279,7 @@ func (a ClustersAPI) GetOrCreateRunningCluster(name string, custom ...Cluster) (
 		NodeTypeID:             smallestNodeType,
 		AutoterminationMinutes: 10,
 	}
-	if !a.client.IsUsingAzureAuth() {
+	if !a.client.IsAzure() {
 		r.AwsAttributes = &AwsAttributes{
 			Availability: "SPOT",
 		}
@@ -296,7 +294,7 @@ func (a ClustersAPI) GetOrCreateRunningCluster(name string, custom ...Cluster) (
 func (a ClustersAPI) GetSmallestNodeTypeWithStorage() string {
 	nodeTypes, err := a.ListNodeTypes()
 	if err != nil || len(nodeTypes) == 0 {
-		if a.client.IsUsingAzureAuth() {
+		if a.client.IsAzure() {
 			return "Standard_D3_v2"
 		}
 		return "i3.xlarge"