[Fix] Fixed syncing of effective fields in plugin framework implementation of share resource

NEXT_CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Bug Fixes
 
 * Fix `ExactlyOneOf` in `databricks_app` ([#4946](https://github.com/databricks/terraform-provider-databricks/pull/4946))
+* Fixed syncing of effective fields in plugin framework implementation of share resource ([#4969](https://github.com/databricks/terraform-provider-databricks/pull/4969))
 
 ### Documentation
 

internal/providers/pluginfw/products/sharing/resource_share.go

@@ -446,8 +446,13 @@ func (r *ShareResource) syncEffectiveFields(ctx context.Context, plan, state Sha
 	stateObjects, _ := state.GetObjects(ctx)
 	finalObjects := []sharing_tf.SharedDataObject_SdkV2{}
 	for i := range stateObjects {
-		mode.objectLevel(ctx, &stateObjects[i], planObjects[i])
-		finalObjects = append(finalObjects, stateObjects[i])
+		for j := range planObjects {
+			if stateObjects[i].Name == planObjects[j].Name {
+				mode.objectLevel(ctx, &stateObjects[i], planObjects[j])
+				finalObjects = append(finalObjects, stateObjects[i])
+				break
+			}
+		}
 	}
 	state.SetObjects(ctx, finalObjects)
 	return state, d

internal/providers/pluginfw/products/sharing/resource_share_test.go

@@ -0,0 +1,142 @@
+package sharing
+
+import (
+	"context"
+	"testing"
+
+	"github.com/databricks/databricks-sdk-go/service/sharing"
+	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/converters"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestShareSyncEffectiveFields(t *testing.T) {
+	shareName := "test-share-name"
+	ctx := context.Background()
+	shares := ShareResource{}
+
+	tests := []struct {
+		name       string
+		planGoSDK  sharing.ShareInfo
+		stateGoSDK sharing.ShareInfo
+	}{
+		{
+			name: "plan with less objects",
+			planGoSDK: sharing.ShareInfo{
+				Name: shareName,
+				Objects: []sharing.SharedDataObject{
+					{
+						Name: "obj-1",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-1"}}},
+						},
+					},
+					{
+						Name: "obj-3",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-3"}}},
+						},
+					},
+				},
+			},
+			stateGoSDK: sharing.ShareInfo{
+				Name: shareName,
+				Objects: []sharing.SharedDataObject{
+					{
+						Name: "obj-1",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-1"}}},
+						},
+					},
+					{
+						Name: "obj-2",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-2"}}},
+						},
+					},
+					{
+						Name: "obj-3",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-3"}}},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "plan with more objects",
+			planGoSDK: sharing.ShareInfo{
+				Name: shareName,
+				Objects: []sharing.SharedDataObject{
+					{
+						Name: "obj-1",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-1"}}},
+						},
+					},
+					{
+						Name: "obj-2",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-2"}}},
+						},
+					},
+					{
+						Name: "obj-3",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-3"}}},
+						},
+					},
+				},
+			},
+			stateGoSDK: sharing.ShareInfo{
+				Name: shareName,
+				Objects: []sharing.SharedDataObject{
+					{
+						Name: "obj-1",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-1"}}},
+						},
+					},
+					{
+						Name: "obj-3",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-3"}}},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "empty plan",
+			planGoSDK: sharing.ShareInfo{
+				Name:    shareName,
+				Objects: []sharing.SharedDataObject{},
+			},
+			stateGoSDK: sharing.ShareInfo{
+				Name: shareName,
+				Objects: []sharing.SharedDataObject{
+					{
+						Name: "obj-1",
+						Partitions: []sharing.Partition{
+							{Values: []sharing.PartitionValue{{Value: "part-1"}}},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var planTFSDK ShareInfoExtended
+			diagnostics := converters.GoSdkToTfSdkStruct(ctx, tt.planGoSDK, &planTFSDK)
+			assert.False(t, diagnostics.HasError())
+
+			var stateTFSDK ShareInfoExtended
+			diagnostics = converters.GoSdkToTfSdkStruct(ctx, tt.stateGoSDK, &stateTFSDK)
+			assert.False(t, diagnostics.HasError())
+
+			_, diagnostics = shares.syncEffectiveFields(ctx, planTFSDK, stateTFSDK, effectiveFieldsActionRead{})
+			assert.False(t, diagnostics.HasError())
+		})
+	}
+}