Fix diff detection for databricks_share resource (#2197)

Author: nkvuong

catalog/resource_share.go

@@ -128,6 +128,13 @@ func (si ShareInfo) resourceShareMap() map[string]SharedDataObject {
 	return m
 }
 
+func Equal(a, b SharedDataObject) bool {
+	if b.SharedAs == "" {
+		b.SharedAs = a.SharedAs
+	}
+	return reflect.DeepEqual(a, b)
+}
+
 func (si ShareInfo) Diff(other ShareInfo) []ShareDataChange {
 	beforeMap := si.resourceShareMap()
 	afterMap := other.resourceShareMap()
@@ -149,7 +156,7 @@ func (si ShareInfo) Diff(other ShareInfo) []ShareDataChange {
 	for _, afterSdo := range other.Objects {
 		beforeSdo, exists := beforeMap[afterSdo.Name]
 		if exists {
-			if !reflect.DeepEqual(beforeSdo, afterSdo) {
+			if !Equal(beforeSdo, afterSdo) {
 				changes = append(changes, ShareDataChange{
 					Action:     ShareUpdate,
 					DataObject: afterSdo,

catalog/resource_share_test.go

@@ -289,7 +289,7 @@ func TestUpdateShare(t *testing.T) {
 			{
 				Method:   "PATCH",
 				Resource: "/api/2.1/unity-catalog/shares/abc",
-				Response: ShareUpdates{
+				ExpectedRequest: ShareUpdates{
 					Updates: []ShareDataChange{
 						{
 							Action: "REMOVE",
@@ -310,7 +310,7 @@ func TestUpdateShare(t *testing.T) {
 						{
 							Action: "ADD",
 							DataObject: SharedDataObject{
-								Comment:        "d",
+								Comment:        "c",
 								DataObjectType: "TABLE",
 								Name:           "b",
 							},
@@ -550,3 +550,88 @@ func TestCreateShareButPatchFails(t *testing.T) {
 	qa.AssertErrorStartsWith(t, err, "Internal error happened")
 	assert.Equal(t, "", d.Id(), "Id should be empty for error creates")
 }
+
+func TestUpdateShareComplexDiff(t *testing.T) {
+	qa.ResourceFixture{
+		Fixtures: []qa.HTTPFixture{
+			{
+				Method:   "GET",
+				Resource: "/api/2.1/unity-catalog/shares/abc?include_shared_data=true",
+				Response: ShareInfo{
+					Name: "abc",
+					Objects: []SharedDataObject{
+						{
+							Name:           "a",
+							DataObjectType: "TABLE",
+							Comment:        "c",
+							SharedAs:       "b",
+							AddedAt:        0,
+							AddedBy:        "",
+						},
+					},
+				},
+			},
+			{
+				Method:   "PATCH",
+				Resource: "/api/2.1/unity-catalog/shares/abc",
+				ExpectedRequest: ShareUpdates{
+					Updates: []ShareDataChange{
+						{
+							Action: "ADD",
+							DataObject: SharedDataObject{
+								Comment:        "c",
+								DataObjectType: "TABLE",
+								Name:           "b",
+							},
+						},
+					},
+				},
+			},
+			{
+				Method:   "GET",
+				Resource: "/api/2.1/unity-catalog/shares/abc?include_shared_data=true",
+				Response: ShareInfo{
+					Name: "abc",
+					Objects: []SharedDataObject{
+						{
+							Name:           "a",
+							DataObjectType: "TABLE",
+							Comment:        "c",
+							SharedAs:       "",
+							AddedAt:        0,
+							AddedBy:        "",
+						},
+						{
+							Name:           "b",
+							DataObjectType: "TABLE",
+							Comment:        "c",
+							SharedAs:       "",
+							AddedAt:        0,
+							AddedBy:        "",
+						},
+					},
+				},
+			},
+		},
+		ID:          "abc",
+		Update:      true,
+		RequiresNew: true,
+		InstanceState: map[string]string{
+			"name": "abc",
+		},
+		HCL: `
+			name = "abc"
+			object {
+				name = "a"
+				comment = "c"
+				data_object_type = "TABLE"
+			}
+			object {
+				name = "b"
+				comment = "c"
+				data_object_type = "TABLE"
+			}
+		`,
+		Resource: ResourceShare(),
+	}.ApplyNoError(t)
+}