direct: do not set incorrect ForceSendFields (#3576)

## Changes
Only copy ForceSendFields if we're copying the value from the field. If
we're omitting the value, we should omit ForceSendFields, otherwise
we're might be copying zero.

## Tests
New unit tests.

Author: denik

bundle/terranova/tnresources/job.go

@@ -90,7 +90,7 @@ func makeCreateJob(config jobs.JobSettings) (jobs.CreateJob, error) {
 		Trigger:              config.Trigger,
 		UsagePolicyId:        config.UsagePolicyId,
 		WebhookNotifications: config.WebhookNotifications,
-		ForceSendFields:      filterFields[jobs.CreateJob](config.ForceSendFields),
+		ForceSendFields:      filterFields[jobs.CreateJob](config.ForceSendFields, "AccessControlList"),
 	}
 
 	return result, nil

bundle/terranova/tnresources/schema.go

@@ -42,7 +42,7 @@ func (r *ResourceSchema) DoUpdate(ctx context.Context, id string, config *catalo
 		NewName:                      "", // We recreate schemas on name change intentionally.
 		Owner:                        "", // Not supported by DABs
 		Properties:                   config.Properties,
-		ForceSendFields:              filterFields[catalog.UpdateSchema](config.ForceSendFields),
+		ForceSendFields:              filterFields[catalog.UpdateSchema](config.ForceSendFields, "EnablePredictiveOptimization", "NewName", "Owner"),
 	}
 
 	response, err := r.client.Schemas.Update(ctx, updateRequest)

bundle/terranova/tnresources/schema_test.go

@@ -0,0 +1,57 @@
+package tnresources
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/databricks/databricks-sdk-go/service/catalog"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestResourceSchema_DoUpdate_WithUnsupportedForceSendFields(t *testing.T) {
+	_, client := setupTestServerClient(t)
+
+	adapter := (*ResourceSchema)(nil).New(client)
+	ctx := context.Background()
+
+	config := &catalog.CreateSchema{
+		CatalogName:     "main",
+		Name:            "test_schema",
+		Comment:         "original comment",
+		Properties:      map[string]string{"key": "value"},
+		StorageRoot:     "",
+		ForceSendFields: nil,
+	}
+
+	id, _, err := adapter.DoCreate(ctx, config)
+	require.NoError(t, err)
+
+	config.Comment = "updated comment"
+	config.Properties = map[string]string{"key": "updated_value"}
+	config.ForceSendFields = []string{
+		"Comment",
+		"Properties",
+		"EnablePredictiveOptimization", // Unsupported - should be filtered out
+		"NewName",                      // Unsupported - should be filtered out
+		"Owner",                        // Unsupported - should be filtered out
+	}
+
+	_, err = adapter.DoUpdate(ctx, id, config)
+	require.NoError(t, err)
+
+	result, err := adapter.DoRefresh(ctx, id)
+	require.NoError(t, err)
+
+	resultJSON, err := json.Marshal(result)
+	require.NoError(t, err)
+	expected := `{
+		"catalog_name": "main",
+		"comment": "updated comment",
+		"properties": {"key": "updated_value"},
+		"full_name": "main.test_schema",
+		"name": "test_schema"
+	}`
+	assert.JSONEq(t, expected, string(resultJSON))
+}

bundle/terranova/tnresources/util.go

@@ -6,13 +6,23 @@ import (
 	"github.com/databricks/databricks-sdk-go/retries"
 )
 
-// filterFields creates a new slice with fields present only in the provided type.
+// filterFields creates a new slice with fields present only in the provided type,
+// excluding any fields specified in the excludeFields list.
 // We must use that when copying structs because JSON marshaller in SDK crashes if it sees unknown field.
-func filterFields[T any](fields []string) []string {
+func filterFields[T any](fields []string, excludeFields ...string) []string {
 	var result []string
 	typeOfT := reflect.TypeOf((*T)(nil)).Elem()
 
+	excludeMap := make(map[string]bool)
+	for _, exclude := range excludeFields {
+		excludeMap[exclude] = true
+	}
+
 	for _, field := range fields {
+		// Skip if field is in exclude list
+		if excludeMap[field] {
+			continue
+		}
 		if _, ok := typeOfT.FieldByName(field); ok {
 			result = append(result, field)
 		}

bundle/terranova/tnresources/util_test.go

@@ -0,0 +1,15 @@
+package tnresources
+
+import (
+	"testing"
+
+	"github.com/databricks/databricks-sdk-go/service/catalog"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFilterFields(t *testing.T) {
+	fields := []string{"Comment", "NewName", "Owner", "Name", "NotExistingField"}
+	result := filterFields[catalog.UpdateVolumeRequestContent](fields, "NewName", "Owner")
+	expected := []string{"Comment", "Name"}
+	assert.Equal(t, expected, result)
+}

bundle/terranova/tnresources/volume.go

@@ -44,7 +44,7 @@ func (r *ResourceVolume) DoUpdate(ctx context.Context, id string, config *catalo
 		NewName: "", // Not supported by Update(). Needs DoUpdateWithID()
 		Owner:   "", // Not supported by DABs
 
-		ForceSendFields: nil,
+		ForceSendFields: filterFields[catalog.UpdateVolumeRequestContent](config.ForceSendFields, "NewName", "Owner"),
 	}
 
 	nameFromID, err := getNameFromID(id)
@@ -76,7 +76,7 @@ func (r *ResourceVolume) DoUpdateWithID(ctx context.Context, id string, config *
 		NewName: "", // Initialized below if needed
 		Owner:   "", // Not supported by DABs
 
-		ForceSendFields: nil,
+		ForceSendFields: filterFields[catalog.UpdateVolumeRequestContent](config.ForceSendFields, "Owner"),
 	}
 
 	items := strings.Split(id, ".")