Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

### Bug Fixes

* Fix `databricks_catalog` name update using NewName field ([#5205](https://github.com/databricks/terraform-provider-databricks/pull/5205))

### Documentation

### Exporter
Expand Down
10 changes: 7 additions & 3 deletions catalog/resource_catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,15 @@ func ResourceCatalog() common.Resource {
common.DataToStructPointer(d, catalogSchema, &updateCatalogRequest)
updateCatalogRequest.Name = d.Id()

if d.HasChange("name") {
updateCatalogRequest.NewName = d.Get("name").(string)
}

if d.HasChange("owner") {
_, err = w.Catalogs.Update(ctx, catalog.UpdateCatalog{
Name: updateCatalogRequest.Name,
Owner: updateCatalogRequest.Owner,
Name: updateCatalogRequest.Name,
NewName: updateCatalogRequest.NewName,
Owner: updateCatalogRequest.Owner,
})
if err != nil {
return err
Expand All @@ -164,7 +169,6 @@ func ResourceCatalog() common.Resource {
}
}
ci, err := w.Catalogs.Update(ctx, updateCatalogRequest)

if err != nil {
if d.HasChange("owner") {
// Rollback
Expand Down
38 changes: 38 additions & 0 deletions catalog/resource_catalog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -842,3 +842,41 @@ func TestCatalogSuppressCaseSensitivity(t *testing.T) {
`,
}.ApplyNoError(t)
}

func TestUpdateCatalogName(t *testing.T) {
qa.ResourceFixture{
MockWorkspaceClientFunc: func(w *mocks.MockWorkspaceClient) {
w.GetMockMetastoresAPI().EXPECT().Current(mock.Anything).Return(&catalog.MetastoreAssignment{
MetastoreId: "d",
}, nil)
e := w.GetMockCatalogsAPI().EXPECT()
e.Update(mock.Anything, catalog.UpdateCatalog{
Name: "old_catalog_name",
NewName: "new_catalog_name",
Comment: "c",
}).Return(&catalog.CatalogInfo{
Name: "new_catalog_name",
Comment: "c",
}, nil)
e.GetByName(mock.Anything, "new_catalog_name").Return(&catalog.CatalogInfo{
Name: "new_catalog_name",
Comment: "c",
}, nil)
},
Resource: ResourceCatalog(),
Update: true,
ID: "old_catalog_name",
InstanceState: map[string]string{
"metastore_id": "d",
"name": "old_catalog_name",
"comment": "c",
},
HCL: `
name = "new_catalog_name"
comment = "c"
`,
}.ApplyAndExpectData(t, map[string]any{
"name": "new_catalog_name",
"comment": "c",
})
}