From 7932c786daf27aeffd7eefd7b90e3123c315d9fe Mon Sep 17 00:00:00 2001
From: Tanmay Rustagi <tanmay.rustagi@databricks.com>
Date: Wed, 31 Jan 2024 17:11:57 +0100
Subject: [PATCH] Fix updating owners

---
 catalog/resource_catalog.go            |  4 ++++
 catalog/resource_external_location.go  |  4 ++++
 catalog/resource_metastore.go          | 10 ++++++++++
 catalog/resource_schema.go             |  4 ++++
 catalog/resource_share.go              |  4 ++++
 catalog/resource_storage_credential.go |  5 +++++
 catalog/resource_volume.go             |  4 ++++
 sharing/resource_recipient.go          |  4 ++++
 8 files changed, 39 insertions(+)

diff --git a/catalog/resource_catalog.go b/catalog/resource_catalog.go
index b7affc2db2..d61f10bf6d 100644
--- a/catalog/resource_catalog.go
+++ b/catalog/resource_catalog.go
@@ -148,6 +148,10 @@ func ResourceCatalog() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			updateCatalogRequest.Owner = ""
 			ci, err := w.Catalogs.Update(ctx, updateCatalogRequest)
 
diff --git a/catalog/resource_external_location.go b/catalog/resource_external_location.go
index dcaf85a674..6b14f1c62f 100644
--- a/catalog/resource_external_location.go
+++ b/catalog/resource_external_location.go
@@ -108,6 +108,10 @@ func ResourceExternalLocation() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			updateExternalLocationRequest.Owner = ""
 			_, err = w.ExternalLocations.Update(ctx, updateExternalLocationRequest)
 			if err != nil {
diff --git a/catalog/resource_metastore.go b/catalog/resource_metastore.go
index c45dfee673..541dace596 100644
--- a/catalog/resource_metastore.go
+++ b/catalog/resource_metastore.go
@@ -138,6 +138,11 @@ func ResourceMetastore() *schema.Resource {
 						return err
 					}
 				}
+
+				if !d.HasChangeExcept("owner") {
+					return nil
+				}
+
 				update.Owner = ""
 				_, err := acc.Metastores.Update(ctx, catalog.AccountsUpdateMetastore{
 					MetastoreId:   d.Id(),
@@ -171,6 +176,11 @@ func ResourceMetastore() *schema.Resource {
 						return err
 					}
 				}
+
+				if !d.HasChangeExcept("owner") {
+					return nil
+				}
+
 				update.Owner = ""
 				_, err := w.Metastores.Update(ctx, update)
 				if err != nil {
diff --git a/catalog/resource_schema.go b/catalog/resource_schema.go
index f3cf93832c..4952f8688d 100644
--- a/catalog/resource_schema.go
+++ b/catalog/resource_schema.go
@@ -99,6 +99,10 @@ func ResourceSchema() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			updateSchemaRequest.Owner = ""
 			schema, err := w.Schemas.Update(ctx, updateSchemaRequest)
 			if err != nil {
diff --git a/catalog/resource_share.go b/catalog/resource_share.go
index 8cd209a919..f3873c753d 100644
--- a/catalog/resource_share.go
+++ b/catalog/resource_share.go
@@ -237,6 +237,10 @@ func ResourceShare() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			err = NewSharesAPI(ctx, c).update(d.Id(), ShareUpdates{
 				Updates: changes,
 			})
diff --git a/catalog/resource_storage_credential.go b/catalog/resource_storage_credential.go
index 02c71e1f5f..a4f94baec6 100644
--- a/catalog/resource_storage_credential.go
+++ b/catalog/resource_storage_credential.go
@@ -152,6 +152,11 @@ func ResourceStorageCredential() *schema.Resource {
 						return err
 					}
 				}
+
+				if !d.HasChangeExcept("owner") {
+					return nil
+				}
+
 				update.Owner = ""
 				_, err := acc.StorageCredentials.Update(ctx, catalog.AccountsUpdateStorageCredential{
 					CredentialInfo:        &update,
diff --git a/catalog/resource_volume.go b/catalog/resource_volume.go
index f4b6871684..4c13e8c201 100644
--- a/catalog/resource_volume.go
+++ b/catalog/resource_volume.go
@@ -93,6 +93,10 @@ func ResourceVolume() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			updateVolumeRequestContent.Owner = ""
 			v, err := w.Volumes.Update(ctx, updateVolumeRequestContent)
 			if err != nil {
diff --git a/sharing/resource_recipient.go b/sharing/resource_recipient.go
index dce799d533..640e18bb74 100644
--- a/sharing/resource_recipient.go
+++ b/sharing/resource_recipient.go
@@ -85,6 +85,10 @@ func ResourceRecipient() *schema.Resource {
 				}
 			}
 
+			if !d.HasChangeExcept("owner") {
+				return nil
+			}
+
 			updateRecipientRequest.Owner = ""
 			err = w.Recipients.Update(ctx, updateRecipientRequest)
 			if err != nil {