workspace_id support of SDKv2 resources using Go SDK

access/sql_permissions_provider_config_test.go

@@ -29,14 +29,16 @@ func TestAccSqlPermissions_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccSqlPermissions_ProviderConfig_Required(t *testing.T) {
+// TestAccSqlPermissions_ProviderConfig_EmptyBlock verifies that an empty
+// provider_config {} block is valid (workspace_id is Optional+Computed).
+func TestAccSqlPermissions_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: sqlPermissionsProviderConfigTemplate(`
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

aws/instance_profile_provider_config_test.go

@@ -30,17 +30,6 @@ func TestAccInstanceProfile_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccInstanceProfile_ProviderConfig_Required(t *testing.T) {
-	acceptance.WorkspaceLevel(t, acceptance.Step{
-		Template: instanceProfileProviderConfigTemplate(`
-			provider_config {
-			}
-		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
-	})
-}
-
 func TestAccInstanceProfile_ProviderConfig_EmptyID(t *testing.T) {
 	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: instanceProfileProviderConfigTemplate(`

aws/service_principal_role_provider_config_test.go

@@ -33,17 +33,6 @@ func TestAccServicePrincipalRole_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccServicePrincipalRole_ProviderConfig_Required(t *testing.T) {
-	acceptance.WorkspaceLevel(t, acceptance.Step{
-		Template: servicePrincipalRoleProviderConfigTemplate(`
-			provider_config {
-			}
-		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
-	})
-}
-
 func TestAccServicePrincipalRole_ProviderConfig_EmptyID(t *testing.T) {
 	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: servicePrincipalRoleProviderConfigTemplate(`

aws/user_role_provider_config_test.go

@@ -33,17 +33,6 @@ func TestAccUserRole_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccUserRole_ProviderConfig_Required(t *testing.T) {
-	acceptance.WorkspaceLevel(t, acceptance.Step{
-		Template: userRoleProviderConfigTemplate(`
-			provider_config {
-			}
-		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
-	})
-}
-
 func TestAccUserRole_ProviderConfig_EmptyID(t *testing.T) {
 	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: userRoleProviderConfigTemplate(`

catalog/catalog_test.go

@@ -272,17 +272,6 @@ func TestAccCatalog_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccCatalog_ProviderConfig_Required(t *testing.T) {
-	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
-		Template: catalogProviderConfigTemplate("test_catalog_{var.STICKY_RANDOM}", `
-			provider_config {
-			}
-		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
-	})
-}
-
 func TestAccCatalog_ProviderConfig_EmptyID(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: catalogProviderConfigTemplate("test_catalog_{var.STICKY_RANDOM}", `
@@ -324,7 +313,7 @@ func TestAccCatalog_ProviderConfig_Match(t *testing.T) {
 		`, workspaceIDStr)),
 		ConfigPlanChecks: resource.ConfigPlanChecks{
 			PreApply: []plancheck.PlanCheck{
-				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionUpdate),
+				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionNoop),
 			},
 		},
 	})
@@ -354,7 +343,7 @@ func TestAccCatalog_ProviderConfig_Recreate(t *testing.T) {
 		`),
 		ConfigPlanChecks: resource.ConfigPlanChecks{
 			PostApplyPreRefresh: []plancheck.PlanCheck{
-				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionUpdate),
+				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionDestroyBeforeCreate),
 			},
 		},
 		PlanOnly:           true,
@@ -382,7 +371,7 @@ func TestAccCatalog_ProviderConfig_Remove(t *testing.T) {
 		Template: catalogProviderConfigTemplate(catalogName, ""),
 		ConfigPlanChecks: resource.ConfigPlanChecks{
 			PreApply: []plancheck.PlanCheck{
-				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionUpdate),
+				plancheck.ExpectResourceAction("databricks_catalog.this", plancheck.ResourceActionNoop),
 			},
 		},
 	})

catalog/credential_provider_config_test.go

@@ -33,14 +33,15 @@ func TestAccCredential_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccCredential_ProviderConfig_Required(t *testing.T) {
+// Empty provider_config {} is valid since workspace_id is Optional+Computed.
+func TestAccCredential_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: credentialProviderConfigTemplate("tf-test-cred-{var.STICKY_RANDOM}", `
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

catalog/metastore_assignment_provider_config_test.go

@@ -30,14 +30,15 @@ func TestAccMetastoreAssignment_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccMetastoreAssignment_ProviderConfig_Required(t *testing.T) {
+// Empty provider_config {} is valid since workspace_id is Optional+Computed.
+func TestAccMetastoreAssignment_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: metastoreAssignmentProviderConfigTemplate(`
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

catalog/metastore_data_access_provider_config_test.go

@@ -33,14 +33,15 @@ func TestAccMetastoreDataAccess_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccMetastoreDataAccess_ProviderConfig_Required(t *testing.T) {
+// Empty provider_config {} is valid since workspace_id is Optional+Computed.
+func TestAccMetastoreDataAccess_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: metastoreDataAccessProviderConfigTemplate(`
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

catalog/metastore_provider_config_test.go

@@ -30,14 +30,15 @@ func TestAccMetastore_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccMetastore_ProviderConfig_Required(t *testing.T) {
+// Empty provider_config {} is valid since workspace_id is Optional+Computed.
+func TestAccMetastore_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: metastoreProviderConfigTemplate("tf-test-metastore-{var.STICKY_RANDOM}", `
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

catalog/resource_catalog_test.go

@@ -844,7 +844,8 @@ func TestCatalogSuppressCaseSensitivity(t *testing.T) {
 			"storage_location":               {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
 			"provisioning_info.#":            {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
 			"effective_predictive_optimization_flag.#": {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
-			"full_name": {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
+			"full_name":         {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
+			"provider_config.#": {Old: "", New: "", NewComputed: true, NewRemoved: false, RequiresNew: false, Sensitive: false},
 		},
 		HCL: `
 		name = "A"

catalog/resource_sql_table_test.go

@@ -1883,6 +1883,8 @@ func TestResourceSqlTable_Diff_ExistingResource(t *testing.T) {
 			if expectedDiff == nil {
 				expectedDiff = make(map[string]*terraform.ResourceAttrDiff)
 			}
+			// provider_config is Optional+Computed, so it always appears as computed in the diff
+			expectedDiff["provider_config.#"] = &terraform.ResourceAttrDiff{Old: "", New: "", NewComputed: true}
 			qa.ResourceFixture{
 				HCL: `
 					catalog_name = "main"

catalog/storage_credential_provider_config_test.go

@@ -32,14 +32,15 @@ func TestAccStorageCredential_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccStorageCredential_ProviderConfig_Required(t *testing.T) {
+// Empty provider_config {} is valid since workspace_id is Optional+Computed.
+func TestAccStorageCredential_ProviderConfig_EmptyBlock(t *testing.T) {
 	acceptance.UnityWorkspaceLevel(t, acceptance.Step{
 		Template: storageCredentialProviderConfigTemplate("tf-test-sc-{var.STICKY_RANDOM}", `
 			provider_config {
 			}
 		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
+		PlanOnly:           true,
+		ExpectNonEmptyPlan: true,
 	})
 }
 

catalog/table_provider_config_test.go

@@ -39,17 +39,6 @@ func TestAccTable_ProviderConfig_Invalid(t *testing.T) {
 	})
 }
 
-func TestAccTable_ProviderConfig_Required(t *testing.T) {
-	acceptance.WorkspaceLevel(t, acceptance.Step{
-		Template: tableProviderConfigTemplate(`
-			provider_config {
-			}
-		`),
-		ExpectError: regexp.MustCompile(`The argument "workspace_id" is required, but no definition was found.`),
-		PlanOnly:    true,
-	})
-}
-
 func TestAccTable_ProviderConfig_EmptyID(t *testing.T) {
 	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: tableProviderConfigTemplate(`