Skip to content

Commit cb54060

Browse files
authored
[Fix] Mark default_catalog_name attribute in databricks_metastore_assignment as deprecated (#4522)
## Changes - Mark `default_catalog_name` attribute in `databricks_metastore_assignment` as deprecated, as `databricks_default_namespace_setting` should be used instead. - Resolves #4147 ## Tests <!-- How is this tested? Please see the checklist below and also describe any other relevant tests --> - [x] `make test` run locally - [x] relevant change in `docs/` folder - [x] covered with integration tests in `internal/acceptance`
1 parent b937c19 commit cb54060

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

NEXT_CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
### Bug Fixes
1111

12+
* Mark `default_catalog_name` attribute in `databricks_metastore_assignment` as deprecated ([#4522](https://github.com/databricks/terraform-provider-databricks/pull/4522))
1213
* Delete `databricks_sql_endpoint` that failed to start ([#4520](https://github.com/databricks/terraform-provider-databricks/pull/4520))
1314

1415
### Documentation

catalog/resource_metastore_assignment.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import (
1313
func ResourceMetastoreAssignment() common.Resource {
1414
s := common.StructToSchema(catalog.MetastoreAssignment{},
1515
func(m map[string]*schema.Schema) map[string]*schema.Schema {
16-
m["default_catalog_name"].Default = "hive_metastore"
16+
m["default_catalog_name"].Computed = true
17+
m["default_catalog_name"].Deprecated = "Use databricks_default_namespace_setting resource instead"
1718
m["workspace_id"].ForceNew = true
1819
m["metastore_id"].ForceNew = true
1920
return m

catalog/resource_metastore_assignment_test.go

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@ func TestMetastoreAssignment_Create(t *testing.T) {
2020
Method: "PUT",
2121
Resource: "/api/2.1/unity-catalog/workspaces/123/metastore",
2222
ExpectedRequest: catalog.CreateMetastoreAssignment{
23-
DefaultCatalogName: "hive_metastore",
24-
MetastoreId: "a",
23+
MetastoreId: "a",
2524
},
2625
},
2726
{
2827
Method: "GET",
2928
Resource: "/api/2.1/unity-catalog/current-metastore-assignment",
3029
Response: catalog.MetastoreAssignment{
31-
MetastoreId: "a",
32-
WorkspaceId: 123,
33-
DefaultCatalogName: "hive_metastore",
30+
MetastoreId: "a",
31+
WorkspaceId: 123,
3432
},
3533
},
3634
},
@@ -60,9 +58,8 @@ func TestMetastoreAssignment_Import(t *testing.T) {
6058
Read: true,
6159
ID: "123|a",
6260
}.ApplyAndExpectData(t, map[string]any{
63-
"workspace_id": 123,
64-
"metastore_id": "a",
65-
"default_catalog_name": "test_metastore",
61+
"workspace_id": 123,
62+
"metastore_id": "a",
6663
})
6764
}
6865

@@ -74,8 +71,7 @@ func TestMetastoreAssignmentAccount_Create(t *testing.T) {
7471
Resource: "/api/2.0/accounts/100/workspaces/123/metastores/a",
7572
ExpectedRequest: catalog.AccountsCreateMetastoreAssignment{
7673
MetastoreAssignment: &catalog.CreateMetastoreAssignment{
77-
DefaultCatalogName: "hive_metastore",
78-
MetastoreId: "a",
74+
MetastoreId: "a",
7975
},
8076
},
8177
},
@@ -84,9 +80,8 @@ func TestMetastoreAssignmentAccount_Create(t *testing.T) {
8480
Resource: "/api/2.0/accounts/100/workspaces/123/metastore?",
8581
Response: catalog.AccountsMetastoreAssignment{
8682
MetastoreAssignment: &catalog.MetastoreAssignment{
87-
MetastoreId: "a",
88-
WorkspaceId: 123,
89-
DefaultCatalogName: "hive_metastore",
83+
MetastoreId: "a",
84+
WorkspaceId: 123,
9085
},
9186
},
9287
},
@@ -107,10 +102,10 @@ func TestMetastoreAssignmentAccount_Update(t *testing.T) {
107102
{
108103
Method: "PUT",
109104
Resource: "/api/2.0/accounts/100/workspaces/123/metastores/b",
110-
ExpectedRequest: catalog.AccountsCreateMetastoreAssignment{
111-
MetastoreAssignment: &catalog.CreateMetastoreAssignment{
112-
DefaultCatalogName: "hive_metastore",
113-
MetastoreId: "b",
105+
//CreateMetastoreAssignment needs to have default_catalog_name marked as omitempty
106+
ExpectedRequest: map[string]any{
107+
"metastore_assignment": map[string]any{
108+
"metastore_id": "b",
114109
},
115110
},
116111
},
@@ -119,9 +114,8 @@ func TestMetastoreAssignmentAccount_Update(t *testing.T) {
119114
Resource: "/api/2.0/accounts/100/workspaces/123/metastore?",
120115
Response: catalog.AccountsMetastoreAssignment{
121116
MetastoreAssignment: &catalog.MetastoreAssignment{
122-
MetastoreId: "b",
123-
WorkspaceId: 123,
124-
DefaultCatalogName: "hive_metastore",
117+
MetastoreId: "b",
118+
WorkspaceId: 123,
125119
},
126120
},
127121
},
@@ -148,10 +142,10 @@ func TestMetastoreAssignmentWorskpace_Update(t *testing.T) {
148142
{
149143
Method: "PUT",
150144
Resource: "/api/2.0/accounts/100/workspaces/124/metastores/a",
151-
ExpectedRequest: catalog.AccountsCreateMetastoreAssignment{
152-
MetastoreAssignment: &catalog.CreateMetastoreAssignment{
153-
DefaultCatalogName: "hive_metastore",
154-
MetastoreId: "a",
145+
//CreateMetastoreAssignment needs to have default_catalog_name marked as omitempty
146+
ExpectedRequest: map[string]any{
147+
"metastore_assignment": map[string]any{
148+
"metastore_id": "a",
155149
},
156150
},
157151
},
@@ -160,9 +154,8 @@ func TestMetastoreAssignmentWorskpace_Update(t *testing.T) {
160154
Resource: "/api/2.0/accounts/100/workspaces/123/metastore?",
161155
Response: catalog.AccountsMetastoreAssignment{
162156
MetastoreAssignment: &catalog.MetastoreAssignment{
163-
MetastoreId: "a",
164-
WorkspaceId: 123,
165-
DefaultCatalogName: "hive_metastore",
157+
MetastoreId: "a",
158+
WorkspaceId: 123,
166159
},
167160
},
168161
},

docs/guides/unity-catalog-azure.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ resource "databricks_metastore_assignment" "this" {
108108
provider = databricks.accounts
109109
workspace_id = local.databricks_workspace_id
110110
metastore_id = databricks_metastore.this.id
111-
default_catalog_name = "hive_metastore"
112111
}
113112
```
114113

docs/guides/unity-catalog-gcp.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ resource "databricks_metastore_assignment" "this" {
117117
provider = databricks.accounts
118118
workspace_id = var.databricks_workspace_id
119119
metastore_id = databricks_metastore.this.id
120-
default_catalog_name = "hive_metastore"
121120
}
122121
```
123122

docs/guides/unity-catalog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@ resource "databricks_metastore_assignment" "default_metastore" {
184184
for_each = toset(var.databricks_workspace_ids)
185185
workspace_id = each.key
186186
metastore_id = databricks_metastore.this.id
187-
default_catalog_name = "hive_metastore"
188187
}
188+
189+
189190
```
190191

191192
## Configure external locations and credentials

0 commit comments

Comments
 (0)