mounts now handle deleted cluster correctly

databricks · Jun 9, 2020 · babef36 · babef36
1 parent 6f6fc0b
commit babef36
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 23 deletions.
diff --git a/databricks/resource_databricks_azure_adls_gen2_mount.go b/databricks/resource_databricks_azure_adls_gen2_mount.go
@@ -2,9 +2,11 @@ package databricks
 
 import (
 	"fmt"
+	"log"
+	"strings"
+
 	"github.com/databrickslabs/databricks-terraform/client/service"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"strings"
 )
 
 func resourceAzureAdlsGen2Mount() *schema.Resource {
@@ -129,10 +131,6 @@ func resourceAzureAdlsGen2Create(d *schema.ResourceData, m interface{}) error {
 func resourceAzureAdlsGen2Read(d *schema.ResourceData, m interface{}) error {
 	client := m.(*service.DBApiClient)
 	clusterID := d.Get("cluster_id").(string)
-	err := changeClusterIntoRunningState(clusterID, client)
-	if err != nil {
-		return err
-	}
 	containerName := d.Get("container_name").(string)
 	storageAccountName := d.Get("storage_account_name").(string)
 	directory := d.Get("directory").(string)
@@ -143,6 +141,16 @@ func resourceAzureAdlsGen2Read(d *schema.ResourceData, m interface{}) error {
 	clientSecretKey := d.Get("client_secret_key").(string)
 	initializeFileSystem := d.Get("initialize_file_system").(bool)
 
+	err := changeClusterIntoRunningState(clusterID, client)
+	if err != nil {
+		if isClusterMissing(err.Error(), clusterID) {
+			log.Printf("Unable to refresh mount '%s' as cluster '%s' is missing", mountName, clusterID)
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
 	adlsGen2Mount := NewAzureADLSGen2Mount(containerName, storageAccountName, directory, mountName, clientID, tenantID,
 		clientSecretScope, clientSecretKey, initializeFileSystem)
 

diff --git a/databricks/resource_databricks_azure_adls_gen2_mount_test.go b/databricks/resource_databricks_azure_adls_gen2_mount_test.go
@@ -6,13 +6,18 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/databrickslabs/databricks-terraform/client/model"
+	"github.com/databrickslabs/databricks-terraform/client/service"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAccAzureAdlsGen2Mount_correctly_mounts(t *testing.T) {
 	terraformToApply := testAccAzureAdlsGen2Mount_correctly_mounts()
 
 	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
@@ -22,6 +27,29 @@ func TestAccAzureAdlsGen2Mount_correctly_mounts(t *testing.T) {
 	})
 }
 
+func TestAccAzureAdlsGen2Mount_cluster_deleted_correctly_mounts(t *testing.T) {
+	terraformToApply := testAccAzureAdlsGen2Mount_correctly_mounts()
+	var cluster model.ClusterInfo
+
+	resource.Test(t, resource.TestCase{
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: terraformToApply,
+				Check:  testClusterResourceExists("databricks_cluster.cluster", &cluster, t),
+			},
+			{
+				PreConfig: func() {
+					client := testAccProvider.Meta().(*service.DBApiClient)
+					err := client.Clusters().Delete(cluster.ClusterID)
+					assert.NoError(t, err, err)
+				},
+				Config: terraformToApply,
+			},
+		},
+	})
+}
+
 func TestAccAzureAdlsGen2Mount_capture_error(t *testing.T) {
 	terraformToApply := testAccAzureAdlsGen2Mount_capture_error()
 
@@ -39,7 +67,7 @@ func TestAccAzureAdlsGen2Mount_capture_error(t *testing.T) {
 }
 
 func testAccAzureAdlsGen2Mount_correctly_mounts() string {
-	clientID := os.Getenv("ARM_CLIENT_ID")
+	clientID := os.Getenv("DATABRICKS_AZURE_CLIENT_ID")
 	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	tenantID := os.Getenv("ARM_TENANT_ID")
 	subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID")
@@ -103,7 +131,7 @@ func testAccAzureAdlsGen2Mount_correctly_mounts() string {
 }
 
 func testAccAzureAdlsGen2Mount_capture_error() string {
-	clientID := os.Getenv("ARM_CLIENT_ID")
+	clientID := os.Getenv("DATABRICKS_AZURE_CLIENT_ID")
 	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	tenantID := os.Getenv("ARM_TENANT_ID")
 	subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID")
@@ -165,3 +193,23 @@ func testAccAzureAdlsGen2Mount_capture_error() string {
 `, clientID, clientSecret, tenantID, subscriptionID, workspaceName, resourceGroupName, managedResourceGroupName, location, gen2AdalName)
 	return definition
 }
+
+// testClusterResourceExists queries the API and retrieves the matching Cluster.
+func testClusterResourceExists(n string, cluster *model.ClusterInfo, t *testing.T) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		// find the corresponding state object
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		conn := testAccProvider.Meta().(*service.DBApiClient)
+		resp, err := conn.Clusters().Get(rs.Primary.ID)
+		if err != nil {
+			return err
+		}
+
+		*cluster = resp
+		return nil
+	}
+}
diff --git a/databricks/resource_databricks_azure_blob_mount.go b/databricks/resource_databricks_azure_blob_mount.go
@@ -2,10 +2,12 @@ package databricks
 
 import (
 	"fmt"
+	"log"
+	"strings"
+
 	"github.com/databrickslabs/databricks-terraform/client/service"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"strings"
 )
 
 func resourceAzureBlobMount() *schema.Resource {
@@ -121,10 +123,6 @@ func resourceAzureBlobMountCreate(d *schema.ResourceData, m interface{}) error {
 func resourceAzureBlobMountRead(d *schema.ResourceData, m interface{}) error {
 	client := m.(*service.DBApiClient)
 	clusterID := d.Get("cluster_id").(string)
-	err := changeClusterIntoRunningState(clusterID, client)
-	if err != nil {
-		return err
-	}
 	containerName := d.Get("container_name").(string)
 	storageAccountName := d.Get("storage_account_name").(string)
 	directory := d.Get("directory").(string)
@@ -133,6 +131,16 @@ func resourceAzureBlobMountRead(d *schema.ResourceData, m interface{}) error {
 	tokenSecretScope := d.Get("token_secret_scope").(string)
 	tokenSecretKey := d.Get("token_secret_key").(string)
 
+	err := changeClusterIntoRunningState(clusterID, client)
+	if err != nil {
+		if isClusterMissing(err.Error(), clusterID) {
+			log.Printf("Unable to refresh mount '%s' as cluster '%s' is missing", mountName, clusterID)
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
 	blobMount := NewAzureBlobMount(containerName, storageAccountName, directory, mountName, authType,
 		tokenSecretScope, tokenSecretKey)
 

diff --git a/databricks/resource_databricks_azure_blob_mount_test.go b/databricks/resource_databricks_azure_blob_mount_test.go
@@ -42,6 +42,36 @@ func TestAccAzureBlobMount_correctly_mounts(t *testing.T) {
 	})
 }
 
+func TestAccAzureBlobMount_cluster_deleted_correctly_mounts(t *testing.T) {
+	terraformToApply := testAccAzureBlobMount_correctly_mounts()
+	var clusterInfo model.ClusterInfo
+	var azureBlobMount AzureBlobMount
+
+	resource.Test(t, resource.TestCase{
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: terraformToApply,
+				Check: resource.ComposeTestCheckFunc(
+					testAccAzureBlobMount_cluster_exists("databricks_cluster.cluster", &clusterInfo),
+					testAccAzureBlobMount_mount_exists("databricks_azure_blob_mount.mount", &azureBlobMount, &clusterInfo),
+				),
+			},
+			{
+				PreConfig: func() {
+					client := testAccProvider.Meta().(*service.DBApiClient)
+					err := client.Clusters().Delete(clusterInfo.ClusterID)
+					assert.NoError(t, err, err)
+				},
+				Config: terraformToApply,
+				Check: resource.ComposeTestCheckFunc(
+					testAccAzureBlobMount_mount_exists("databricks_azure_blob_mount.mount", &azureBlobMount, &clusterInfo),
+				),
+			},
+		},
+	})
+}
+
 func testAccAzureBlobMount_cluster_exists(n string, clusterInfo *model.ClusterInfo) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		// find the corresponding state object

diff --git a/databricks/resource_databricks_cluster.go b/databricks/resource_databricks_cluster.go
@@ -2,13 +2,13 @@ package databricks
 
 import (
 	"errors"
-	"fmt"
-	"github.com/databrickslabs/databricks-terraform/client/model"
-	"github.com/databrickslabs/databricks-terraform/client/service"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strings"
 	"time"
+
+	"github.com/databrickslabs/databricks-terraform/client/model"
+	"github.com/databrickslabs/databricks-terraform/client/service"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceCluster() *schema.Resource {
@@ -1453,8 +1453,3 @@ func getMapFromOneItemSet(input interface{}) map[string]interface{} {
 	}
 	return nil
 }
-
-func isClusterMissing(errorMsg, resourceID string) bool {
-	return strings.Contains(errorMsg, "INVALID_PARAMETER_VALUE") &&
-		strings.Contains(errorMsg, fmt.Sprintf("Cluster %s does not exist", resourceID))
-}
diff --git a/databricks/utils.go b/databricks/utils.go
@@ -2,10 +2,11 @@ package databricks
 
 import (
 	"fmt"
-	"github.com/databrickslabs/databricks-terraform/client/model"
-	"github.com/databrickslabs/databricks-terraform/client/service"
 	"strings"
 	"time"
+
+	"github.com/databrickslabs/databricks-terraform/client/model"
+	"github.com/databrickslabs/databricks-terraform/client/service"
 )
 
 func changeClusterIntoRunningState(clusterID string, client *service.DBApiClient) error {
@@ -68,3 +69,8 @@ func changeClusterIntoRunningState(clusterID string, client *service.DBApiClient
 	return fmt.Errorf("cluster is in a non recoverable state: %s", currentState)
 
 }
+
+func isClusterMissing(errorMsg, resourceID string) bool {
+	return strings.Contains(errorMsg, "INVALID_PARAMETER_VALUE") &&
+		strings.Contains(errorMsg, fmt.Sprintf("Cluster %s does not exist", resourceID))
+}
diff --git a/databricks/utils_test.go b/databricks/utils_test.go
@@ -0,0 +1,31 @@
+package databricks
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsClusterMissingTrueWhenClusterIdSpecifiedPresent(t *testing.T) {
+	errorMessage := "{\"error_code\":\"INVALID_PARAMETER_VALUE\",\"message\":\"Cluster 123 does not exist\"}"
+
+	result := isClusterMissing(errorMessage, "123")
+
+	assert.True(t, result)
+}
+
+func TestIsClusterMissingFalseWhenClusterIdSpecifiedNotPresent(t *testing.T) {
+	errorMessage := "{\"error_code\":\"INVALID_PARAMETER_VALUE\",\"message\":\"Cluster 123 does not exist\"}"
+
+	result := isClusterMissing(errorMessage, "xyz")
+
+	assert.False(t, result)
+}
+
+func TestIsClusterMissingFalseWhenErrorNotInCorrectFormat(t *testing.T) {
+	errorMessage := "{\"error_code\":\"INVALID_PARAMETER_VALUE\",\"message\":\"Something random went bang xyz\"}"
+
+	result := isClusterMissing(errorMessage, "xyz")
+
+	assert.False(t, result)
+}