Fix bug with job create zero values (#3642)

* update

* update

* update

* update

* update

* update

Author: edwardfeng-db

clusters/resource_cluster.go

@@ -264,6 +264,23 @@ func FixInstancePoolChangeIfAny(d *schema.ResourceData, cluster any) error {
 	}
 }
 
+func SetForceSendFieldsForCluster(cluster any, d *schema.ResourceData) error {
+	switch c := cluster.(type) {
+	case *compute.ClusterSpec:
+		if c.Autoscale == nil {
+			c.ForceSendFields = append(c.ForceSendFields, "NumWorkers")
+		}
+		return nil
+	case *compute.CreateCluster:
+		if c.Autoscale == nil {
+			c.ForceSendFields = append(c.ForceSendFields, "NumWorkers")
+		}
+		return nil
+	default:
+		return fmt.Errorf(unsupportedExceptCreateEditClusterSpecErr, cluster, "*", "*", "*")
+	}
+}
+
 type ClusterSpec struct {
 	compute.ClusterSpec
 	Libraries []compute.Library `json:"libraries,omitempty" tf:"slice_set,alias:library"`
@@ -380,9 +397,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, c *commo
 	if err = ModifyRequestOnInstancePool(&createClusterRequest); err != nil {
 		return err
 	}
-	if createClusterRequest.Autoscale == nil {
-		createClusterRequest.ForceSendFields = []string{"NumWorkers"}
-	}
+	SetForceSendFieldsForCluster(&createClusterRequest, d)
 	if createClusterRequest.GcpAttributes != nil {
 		if _, ok := d.GetOkExists("gcp_attributes.0.local_ssd_count"); ok {
 			createClusterRequest.GcpAttributes.ForceSendFields = []string{"LocalSsdCount"}

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
 				}

jobs/jobs_api_go_sdk.go

@@ -165,6 +165,10 @@ func updateJobClusterSpec(clusterSpec *compute.ClusterSpec, d *schema.ResourceDa
 	if err != nil {
 		return err
 	}
+	err = clusters.SetForceSendFieldsForCluster(clusterSpec, d)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -192,6 +196,26 @@ func prepareJobSettingsForUpdateGoSdk(d *schema.ResourceData, js *JobSettingsRes
 	return nil
 }
 
+func prepareJobSettingsForCreateGoSdk(d *schema.ResourceData, jc *JobCreateStruct) error {
+	// We always need to add NumWorkers into ForceSendField for the go-sdk client.
+	// Before the go-sdk migration, the field `num_workers` was required, so we always sent it.
+	for _, task := range jc.Tasks {
+		if task.NewCluster != nil {
+			err := clusters.SetForceSendFieldsForCluster(task.NewCluster, d)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	for i := range jc.JobClusters {
+		err := clusters.SetForceSendFieldsForCluster(&jc.JobClusters[i].NewCluster, d)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func Create(createJob jobs.CreateJob, w *databricks.WorkspaceClient, ctx context.Context) (int64, error) {
 	adjustTasks(&createJob)
 	sortWebhooksByID(&createJob)

jobs/resource_job.go

@@ -1094,6 +1094,10 @@ func ResourceJob() common.Resource {
 				}
 				var cj JobCreateStruct
 				common.DataToStructPointer(d, jobsGoSdkSchema, &cj)
+				err = prepareJobSettingsForCreateGoSdk(d, &cj)
+				if err != nil {
+					return err
+				}
 				jobId, err := Create(cj.CreateJob, w, ctx)
 				if err != nil {
 					return err