tidy up

databricks · Jul 2, 2024 · dd78ab8 · dd78ab8
1 parent 57b73d8
commit dd78ab8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/catalog/resource_sql_table_test.go b/catalog/resource_sql_table_test.go
@@ -1254,6 +1254,10 @@ var baseClusterFixture = []qa.HTTPFixture{
 					Key:  "7.1.x-cpu-ml-scala2.12",
 					Name: "7.1 ML (includes Apache Spark 3.0.0, Scala 2.12)",
 				},
+				{
+					Key:  "7.3.x-scala2.12",
+					Name: "7.3 LTS (includes Apache Spark 3.0.1, Scala 2.12)",
+				},
 			},
 		},
 	},

diff --git a/clusters/clusters_api.go b/clusters/clusters_api.go
@@ -881,7 +881,6 @@ var getOrCreateClusterMutex sync.Mutex
 
 // GetOrCreateRunningCluster creates an autoterminating cluster if it doesn't exist
 func (a ClustersAPI) GetOrCreateRunningCluster(name string, custom ...Cluster) (c ClusterInfo, err error) {
-	w, err := a.client.WorkspaceClient()
 	getOrCreateClusterMutex.Lock()
 	defer getOrCreateClusterMutex.Unlock()
 
@@ -915,14 +914,13 @@ func (a ClustersAPI) GetOrCreateRunningCluster(name string, custom ...Cluster) (
 		LocalDisk: true,
 	})
 	log.Printf("[INFO] Creating an autoterminating cluster with node type %s", smallestNodeType)
-	latestVersion, _ := w.Clusters.SelectSparkVersion(a.context, compute.SparkVersionRequest{
-		Latest:          true,
-		LongTermSupport: true,
-	})
 	r := Cluster{
-		NumWorkers:             1,
-		ClusterName:            name,
-		SparkVersion:           latestVersion,
+		NumWorkers:  1,
+		ClusterName: name,
+		SparkVersion: LatestSparkVersionOrDefault(a.Context(), a.WorkspaceClient(), compute.SparkVersionRequest{
+			Latest:          true,
+			LongTermSupport: true,
+		}),
 		NodeTypeID:             smallestNodeType,
 		AutoterminationMinutes: 10,
 	}