update

databricks · Jun 4, 2024 · a1f629b · a1f629b
1 parent 53598c5
commit a1f629b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 32 deletions.
diff --git a/clusters/clusters_api.go b/clusters/clusters_api.go
@@ -497,15 +497,10 @@ func (cluster *Cluster) FixInstancePoolChangeIfAny(d *schema.ResourceData) {
 }
 
 // TODO: Remove this once we fully migrate away from jobs api 2.0
-func (cluster *Cluster) SetForceSendFieldsForClusterCreate(d *schema.ResourceData, getPrefix string) {
+func (cluster *Cluster) SetForceSendFieldsForClusterCreate(d *schema.ResourceData) {
 	if cluster.Autoscale == nil {
 		cluster.ForceSendFields = []string{"NumWorkers"}
 	}
-	if cluster.GcpAttributes != nil {
-		if _, ok := d.GetOkExists(fmt.Sprintf("%s.gcp_attributes.0.local_ssd_count", getPrefix)); ok {
-			cluster.GcpAttributes.ForceSendFields = []string{"LocalSsdCount"}
-		}
-	}
 }
 
 // ClusterList shows existing clusters

diff --git a/clusters/resource_cluster.go b/clusters/resource_cluster.go
@@ -264,27 +264,17 @@ func FixInstancePoolChangeIfAny(d *schema.ResourceData, cluster any) error {
 	}
 }
 
-func SetForceSendFieldsForClusterCreate(cluster any, d *schema.ResourceData, getPrefix string) error {
+func SetForceSendFieldsForClusterCreate(cluster any, d *schema.ResourceData) error {
 	switch c := cluster.(type) {
 	case *compute.ClusterSpec:
 		if c.Autoscale == nil {
 			c.ForceSendFields = []string{"NumWorkers"}
 		}
-		if c.GcpAttributes != nil {
-			if _, ok := d.GetOkExists(fmt.Sprintf("%s.gcp_attributes.0.local_ssd_count", getPrefix)); ok {
-				c.GcpAttributes.ForceSendFields = []string{"LocalSsdCount"}
-			}
-		}
 		return nil
 	case *compute.CreateCluster:
 		if c.Autoscale == nil {
 			c.ForceSendFields = []string{"NumWorkers"}
 		}
-		if c.GcpAttributes != nil {
-			if _, ok := d.GetOkExists(getPrefix + fmt.Sprintf("%s.gcp_attributes.0.local_ssd_count", getPrefix)); ok {
-				c.GcpAttributes.ForceSendFields = []string{"LocalSsdCount"}
-			}
-		}
 		return nil
 	default:
 		return fmt.Errorf(unsupportedExceptCreateEditClusterSpecErr, cluster, "*", "*", "*")
@@ -407,7 +397,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, c *commo
 	if err = ModifyRequestOnInstancePool(&createClusterRequest); err != nil {
 		return err
 	}
-	SetForceSendFieldsForClusterCreate(&createClusterRequest, d, "")
+	SetForceSendFieldsForClusterCreate(&createClusterRequest, d)
 	clusterWaiter, err := clusters.Create(ctx, createClusterRequest)
 	if err != nil {
 		return err

diff --git a/internal/acceptance/job_test.go b/internal/acceptance/job_test.go
@@ -40,7 +40,7 @@ func TestAccJobTasks(t *testing.T) {
 			job_cluster {
 				job_cluster_key = "j"
 				new_cluster {
-					num_workers   = 20
+					num_workers   = 0  // Setting it to zero intentionally to cover edge case.
 					spark_version = data.databricks_spark_version.latest.id
 					node_type_id  = data.databricks_node_type.smallest.id
 				}

diff --git a/jobs/jobs_api_go_sdk.go b/jobs/jobs_api_go_sdk.go
@@ -193,18 +193,16 @@ func prepareJobSettingsForUpdateGoSdk(d *schema.ResourceData, js *JobSettingsRes
 }
 
 func prepareJobSettingsForCreateGoSdk(d *schema.ResourceData, jc *JobCreateStruct) error {
-	for i, task := range jc.Tasks {
+	for _, task := range jc.Tasks {
 		if task.NewCluster != nil {
-			getPrefix := fmt.Sprintf("task.%d.new_cluster", i)
-			err := clusters.SetForceSendFieldsForClusterCreate(task.NewCluster, d, getPrefix)
+			err := clusters.SetForceSendFieldsForClusterCreate(task.NewCluster, d)
 			if err != nil {
 				return err
 			}
 		}
 	}
 	for i := range jc.JobClusters {
-		getPrefix := fmt.Sprintf("job_cluster.%d.new_cluster", i)
-		err := clusters.SetForceSendFieldsForClusterCreate(&jc.JobClusters[i].NewCluster, d, getPrefix)
+		err := clusters.SetForceSendFieldsForClusterCreate(&jc.JobClusters[i].NewCluster, d)
 		if err != nil {
 			return err
 		}

diff --git a/jobs/resource_job.go b/jobs/resource_job.go
@@ -1036,19 +1036,16 @@ func prepareJobSettingsForUpdate(d *schema.ResourceData, js JobSettings) {
 
 func prepareJobSettingsForCreate(d *schema.ResourceData, js JobSettings) {
 	if js.NewCluster != nil {
-		getPrefix := "new_cluster"
-		js.NewCluster.SetForceSendFieldsForClusterCreate(d, getPrefix)
+		js.NewCluster.SetForceSendFieldsForClusterCreate(d)
 	}
-	for i, task := range js.Tasks {
+	for _, task := range js.Tasks {
 		if task.NewCluster != nil {
-			getPrefix := fmt.Sprintf("task.%d.new_cluster", i)
-			task.NewCluster.SetForceSendFieldsForClusterCreate(d, getPrefix)
+			task.NewCluster.SetForceSendFieldsForClusterCreate(d)
 		}
 	}
-	for i, jc := range js.JobClusters {
+	for _, jc := range js.JobClusters {
 		if jc.NewCluster != nil {
-			getPrefix := fmt.Sprintf("job_cluster.%d.new_cluster", i)
-			jc.NewCluster.SetForceSendFieldsForClusterCreate(d, getPrefix)
+			jc.NewCluster.SetForceSendFieldsForClusterCreate(d)
 		}
 	}
 }