don't update databricks_metastore during creation if not required

databricks · Jul 18, 2024 · 0844b74 · 0844b74
1 parent 165cda6
commit 0844b74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/catalog/resource_metastore.go b/catalog/resource_metastore.go
@@ -67,6 +67,10 @@ func ResourceMetastore() common.Resource {
 			common.DataToStructPointer(d, s, &create)
 			common.DataToStructPointer(d, s, &update)
 			updateForceSendFields(&update)
+			emptyRequest, err := common.IsRequestEmpty(update)
+			if err != nil {
+				return err
+			}
 			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
 				mi, err := acc.Metastores.Create(ctx,
 					catalog.AccountsCreateMetastore{
@@ -75,10 +79,6 @@ func ResourceMetastore() common.Resource {
 				if err != nil {
 					return err
 				}
-				emptyRequest, err := common.IsRequestEmpty(update)
-				if err != nil {
-					return err
-				}
 				d.SetId(mi.MetastoreInfo.MetastoreId)
 				if emptyRequest {
 					return nil
@@ -97,6 +97,9 @@ func ResourceMetastore() common.Resource {
 					return err
 				}
 				d.SetId(mi.MetastoreId)
+				if emptyRequest {
+					return nil
+				}
 				update.Id = mi.MetastoreId
 				_, err = w.Metastores.Update(ctx, update)
 				if err != nil {

diff --git a/catalog/resource_metastore_test.go b/catalog/resource_metastore_test.go
@@ -26,11 +26,6 @@ func TestCreateMetastore(t *testing.T) {
 			}).Return(&catalog.MetastoreInfo{
 				MetastoreId: "abc",
 			}, nil)
-			e.Update(mock.Anything, catalog.UpdateMetastore{
-				Id: "abc",
-			}).Return(&catalog.MetastoreInfo{
-				Name: "a",
-			}, nil)
 			e.GetById(mock.Anything, "abc").Return(&catalog.MetastoreInfo{
 				StorageRoot: "s3://b/abc",
 				Name:        "a",