Re-create purged cluster for databricks_mount for Google Storage (#…

…1333)
databricks · May 31, 2022 · e1cb79a · e1cb79a
1 parent 15ee5b6
commit e1cb79a
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 1 deletion.
diff --git a/storage/gs.go b/storage/gs.go
@@ -63,6 +63,13 @@ func createOrValidateClusterForGoogleStorage(ctx context.Context, m interface{},
 	clustersAPI := clusters.NewClustersAPI(ctx, m)
 	if clusterID != "" {
 		clusterInfo, err := clustersAPI.Get(clusterID)
+		if common.IsMissing(err) {
+			cluster, err := GetOrCreateMountingClusterWithGcpServiceAccount(clustersAPI, serviceAccount)
+			if err != nil {
+				return fmt.Errorf("cannot re-create mounting cluster: %w", err)
+			}
+			return d.Set("cluster_id", cluster.ClusterID)
+		}
 		if err != nil {
 			return fmt.Errorf("cannot get mounting cluster: %w", err)
 		}

diff --git a/storage/gs_test.go b/storage/gs_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/databrickslabs/terraform-provider-databricks/clusters"
 	"github.com/databrickslabs/terraform-provider-databricks/common"
 	"github.com/databrickslabs/terraform-provider-databricks/qa"
 	"github.com/stretchr/testify/assert"
@@ -20,9 +21,95 @@ func TestCreateOrValidateClusterForGoogleStorage_Failures(t *testing.T) {
 	}, func(ctx context.Context, client *common.DatabricksClient) {
 		d := ResourceMount().TestResourceData()
 		err := createOrValidateClusterForGoogleStorage(ctx, client, d, "a", "")
-		assert.EqualError(t, err, "cannot get mounting cluster: nope")
+		assert.EqualError(t, err, "cannot re-create mounting cluster: nope")
 
 		err = createOrValidateClusterForGoogleStorage(ctx, client, d, "", "b")
 		assert.EqualError(t, err, "cannot create mounting cluster: nope")
 	})
 }
+
+func TestCreateOrValidateClusterForGoogleStorage_WorksOnDeletedCluster(t *testing.T) {
+	qa.HTTPFixturesApply(t, []qa.HTTPFixture{
+		{
+			Method:   "GET",
+			Resource: "/api/2.0/clusters/get?cluster_id=removed-cluster",
+			Status:   404,
+			Response: common.NotFound("cluster deleted"),
+		},
+		{
+			Method:   "GET",
+			Resource: "/api/2.0/clusters/list",
+			Response: clusters.ClusterList{
+				Clusters: []clusters.ClusterInfo{},
+			},
+		},
+		{
+			ReuseRequest: true,
+			Method:       "GET",
+			Resource:     "/api/2.0/clusters/spark-versions",
+		},
+		{
+			ReuseRequest: true,
+			Method:       "GET",
+			Resource:     "/api/2.0/clusters/list-node-types",
+		},
+		{
+			Method:   "POST",
+			Resource: "/api/2.0/clusters/create",
+			ExpectedRequest: clusters.Cluster{
+				CustomTags: map[string]string{
+					"ResourceClass": "SingleNode",
+				},
+				ClusterName: "terraform-mount-gcs-03a56ec1d1576b505aabf088337cbf36",
+				GcpAttributes: &clusters.GcpAttributes{
+					GoogleServiceAccount: "service-account",
+				},
+				SparkVersion:           "7.3.x-scala2.12",
+				NumWorkers:             0,
+				NodeTypeID:             "i3.xlarge",
+				AutoterminationMinutes: 10,
+				SparkConf: map[string]string{
+					"spark.databricks.cluster.profile": "singleNode",
+					"spark.master":                     "local[*]",
+					"spark.scheduler.mode":             "FIFO",
+				},
+			},
+			Response: clusters.ClusterID{
+				ClusterID: "new-cluster",
+			},
+		},
+		{
+			Method:   "GET",
+			Resource: "/api/2.0/clusters/get?cluster_id=new-cluster",
+			Response: clusters.ClusterInfo{
+				ClusterID:    "new-cluster",
+				State:        "RUNNING",
+				StateMessage: "created",
+			},
+		},
+	}, func(ctx context.Context, client *common.DatabricksClient) {
+		d := ResourceMount().TestResourceData()
+		err := createOrValidateClusterForGoogleStorage(ctx, client, d, "removed-cluster", "service-account")
+		assert.NoError(t, err)
+		assert.Equal(t, "new-cluster", d.Get("cluster_id"))
+	})
+}
+
+func TestCreateOrValidateClusterForGoogleStorage_FailsOnErrorGettingCluster(t *testing.T) {
+	qa.HTTPFixturesApply(t, []qa.HTTPFixture{
+		{
+			Method:   "GET",
+			Resource: "/api/2.0/clusters/get?cluster_id=my-cluster",
+			Status:   500,
+			Response: common.APIError{
+				ErrorCode:  "SERVER_ERROR",
+				StatusCode: 500,
+				Message:    "Server error",
+			},
+		},
+	}, func(ctx context.Context, client *common.DatabricksClient) {
+		d := ResourceMount().TestResourceData()
+		err := createOrValidateClusterForGoogleStorage(ctx, client, d, "my-cluster", "service-account")
+		assert.EqualError(t, err, "cannot get mounting cluster: Server error")
+	})
+}