Skip to content

Commit bc1e455

Browse files
authored
Fix UC acceptance test (#2613)
* fix acc test * remove deprecated field from sdk
1 parent c521a1a commit bc1e455

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

catalog/resource_metastore.go

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ import (
1313
)
1414

1515
type MetastoreInfo struct {
16-
Name string `json:"name"`
17-
StorageRoot string `json:"storage_root" tf:"force_new"`
18-
DefaultDacID string `json:"default_data_access_config_id,omitempty" tf:"suppress_diff"`
19-
StorageRootCredentialId string `json:"storage_root_credential_id,omitempty" tf:"suppress_diff"`
20-
Owner string `json:"owner,omitempty" tf:"computed"`
21-
MetastoreID string `json:"metastore_id,omitempty" tf:"computed"`
22-
WorkspaceIDs []int64 `json:"workspace_ids,omitempty" tf:"computed"`
23-
Region string `json:"region,omitempty" tf:"computed"`
24-
Cloud string `json:"cloud,omitempty" tf:"computed"`
25-
GlobalMetastoreId string `json:"global_metastore_id,omitempty" tf:"computed"`
26-
CreatedAt int64 `json:"created_at,omitempty" tf:"computed"`
27-
CreatedBy string `json:"created_by,omitempty" tf:"computed"`
28-
UpdatedAt int64 `json:"updated_at,omitempty" tf:"computed"`
29-
UpdatedBy string `json:"updated_by,omitempty" tf:"computed"`
30-
DeltaSharingScope string `json:"delta_sharing_scope,omitempty" tf:"suppress_diff"`
31-
DeltaSharingRecipientTokenLifetimeInSeconds int64 `json:"delta_sharing_recipient_token_lifetime_in_seconds,omitempty"`
32-
DeltaSharingOrganizationName string `json:"delta_sharing_organization_name,omitempty"`
16+
Name string `json:"name"`
17+
StorageRoot string `json:"storage_root" tf:"force_new"`
18+
DefaultDacID string `json:"default_data_access_config_id,omitempty" tf:"suppress_diff"`
19+
StorageRootCredentialId string `json:"storage_root_credential_id,omitempty" tf:"suppress_diff"`
20+
Owner string `json:"owner,omitempty" tf:"computed"`
21+
MetastoreID string `json:"metastore_id,omitempty" tf:"computed"`
22+
Region string `json:"region,omitempty" tf:"computed"`
23+
Cloud string `json:"cloud,omitempty" tf:"computed"`
24+
GlobalMetastoreId string `json:"global_metastore_id,omitempty" tf:"computed"`
25+
CreatedAt int64 `json:"created_at,omitempty" tf:"computed"`
26+
CreatedBy string `json:"created_by,omitempty" tf:"computed"`
27+
UpdatedAt int64 `json:"updated_at,omitempty" tf:"computed"`
28+
UpdatedBy string `json:"updated_by,omitempty" tf:"computed"`
29+
DeltaSharingScope string `json:"delta_sharing_scope,omitempty" tf:"suppress_diff"`
30+
DeltaSharingRecipientTokenLifetimeInSeconds int64 `json:"delta_sharing_recipient_token_lifetime_in_seconds,omitempty"`
31+
DeltaSharingOrganizationName string `json:"delta_sharing_organization_name,omitempty"`
3332
}
3433

3534
func ResourceMetastore() *schema.Resource {

internal/acceptance/metastore_data_access_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func TestUcAccAccountMetastoreDataAccessOnAws(t *testing.T) {
1414
force_destroy = true
1515
}
1616
resource "databricks_metastore_data_access" "this" {
17-
metastore_id = {env.TEST_METASTORE_ID}
17+
metastore_id = databricks_metastore.this.id
1818
name = "{var.RANDOM}"
1919
aws_iam_role {
2020
role_arn = "{env.TEST_METASTORE_DATA_ACCESS_ARN}"

0 commit comments

Comments
 (0)