Bugbash test

access/resource_ip_access_list.go

@@ -11,6 +11,7 @@ import (
 )
 
 type ipAccessListUpdateRequest struct {
+	common.Namespace
 	Label       string            `json:"label"`
 	ListType    settings.ListType `json:"list_type"`
 	IpAddresses []string          `json:"ip_addresses"`
@@ -26,12 +27,16 @@ func ResourceIPAccessList() common.Resource {
 			Type:         schema.TypeString,
 			ValidateFunc: validation.Any(validation.IsIPv4Address, validation.IsCIDR),
 		}
+		common.NamespaceCustomizeSchemaMap(s)
 		return s
 	})
 	return common.Resource{
 		Schema: s,
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+			return common.NamespaceCustomizeDiff(d)
+		},
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -45,7 +50,7 @@ func ResourceIPAccessList() common.Resource {
 			return nil
 		},
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -57,7 +62,7 @@ func ResourceIPAccessList() common.Resource {
 			return nil
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -67,7 +72,7 @@ func ResourceIPAccessList() common.Resource {
 			return w.IpAccessLists.Update(ctx, iacl)
 		},
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}

aws/data_aws_crossaccount_policy.go

@@ -14,6 +14,7 @@ import (
 // DataAwsCrossaccountPolicy defines the cross-account policy
 func DataAwsCrossaccountPolicy() common.Resource {
 	type AwsCrossAccountPolicy struct {
+		common.Namespace
 		PolicyType      string   `json:"policy_type,omitempty" tf:"default:managed"`
 		PassRole        []string `json:"pass_roles,omitempty"`
 		JSON            string   `json:"json" tf:"computed"`

aws/data_aws_unity_catalog_assume_role_policy.go

@@ -12,6 +12,7 @@ import (
 
 func DataAwsUnityCatalogAssumeRolePolicy() common.Resource {
 	type AwsUcAssumeRolePolicy struct {
+		common.Namespace
 		RoleName           string `json:"role_name"`
 		UnityCatalogIamArn string `json:"unity_catalog_iam_arn,omitempty" tf:"computed"`
 		ExternalId         string `json:"external_id"`

aws/data_instance_profiles.go

@@ -16,6 +16,7 @@ func DataSourceInstanceProfiles() common.Resource {
 		IsMeta  bool   `json:"is_meta,omitempty" tf:"computed"`
 	}
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		InstanceProfiles []instanceProfileData `json:"instance_profiles,omitempty" tf:"computed"`
 	}, w *databricks.WorkspaceClient) error {
 		instanceProfiles, err := w.InstanceProfiles.ListAll(ctx)

aws/resource_instance_profile.go

@@ -18,6 +18,7 @@ import (
 
 // InstanceProfileInfo contains the ARN for aws instance profiles
 type InstanceProfileInfo struct {
+	common.Namespace
 	InstanceProfileArn    string `json:"instance_profile_arn"`
 	IamRoleArn            string `json:"iam_role_arn,omitempty"`
 	IsMetaInstanceProfile bool   `json:"is_meta_instance_profile,omitempty"`
@@ -157,10 +158,14 @@ func ResourceInstanceProfile() common.Resource {
 				}
 				return false
 			}
+			common.NamespaceCustomizeSchemaMap(m)
 			return m
 		})
 	return common.Resource{
 		Schema: instanceProfileSchema,
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+			return common.NamespaceCustomizeDiff(d)
+		},
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			profile, err := NewInstanceProfilesAPI(ctx, c).Read(d.Id())
 			if err != nil {

catalog/data_catalog.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceCatalog() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		Id      string               `json:"id,omitempty" tf:"computed"`
 		Name    string               `json:"name"`
 		Catalog *catalog.CatalogInfo `json:"catalog_info,omitempty" tf:"computed"`

catalog/data_catalogs.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceCatalogs() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		Ids []string `json:"ids,omitempty" tf:"computed,slice_set"`
 	}, w *databricks.WorkspaceClient) error {
 		catalogs, err := w.Catalogs.ListAll(ctx, catalog.ListCatalogsRequest{})

catalog/data_current_metastore.go

@@ -11,6 +11,7 @@ import (
 
 func DataSourceCurrentMetastore() common.Resource {
 	type CurrentMetastore struct {
+		common.Namespace
 		Id        string                               `json:"id,omitempty" tf:"computed"`
 		Metastore *catalog.GetMetastoreSummaryResponse `json:"metastore_info,omitempty" tf:"computed" `
 	}

catalog/data_external_location.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceExternalLocation() common.Resource {
 	type ExternalLocationByID struct {
+		common.Namespace
 		Id               string                        `json:"id,omitempty" tf:"computed"`
 		Name             string                        `json:"name"`
 		ExternalLocation *catalog.ExternalLocationInfo `json:"external_location_info,omitempty" tf:"computed" `

catalog/data_external_locations.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceExternalLocations() common.Resource {
 	type externalLocationsData struct {
+		common.Namespace
 		Names []string `json:"names,omitempty" tf:"computed"`
 	}
 	return common.WorkspaceData(func(ctx context.Context, data *externalLocationsData, w *databricks.WorkspaceClient) error {

catalog/data_metastore.go

@@ -12,6 +12,7 @@ import (
 
 func DataSourceMetastore() common.Resource {
 	type AccountMetastoreByID struct {
+		common.Namespace
 		Id          string                 `json:"id,omitempty" tf:"computed"`
 		MetastoreId string                 `json:"metastore_id,omitempty" tf:"computed"`
 		Name        string                 `json:"name,omitempty" tf:"computed"`

catalog/data_metastores.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceMetastores() common.Resource {
 	type metastoresData struct {
+		common.Namespace
 		Ids map[string]string `json:"ids,omitempty" tf:"computed"`
 	}
 	return common.AccountData(func(ctx context.Context, data *metastoresData, acc *databricks.AccountClient) error {

catalog/data_schema.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceSchema() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		Id     string              `json:"id,omitempty" tf:"computed"`
 		Name   string              `json:"name"`
 		Schema *catalog.SchemaInfo `json:"schema_info,omitempty" tf:"computed"`

catalog/data_schemas.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceSchemas() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		CatalogName string   `json:"catalog_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`
 	}, w *databricks.WorkspaceClient) error {

catalog/data_storage_credential.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceStorageCredential() common.Resource {
 	type AccountMetastoreByID struct {
+		common.Namespace
 		Id                string                         `json:"id,omitempty" tf:"computed"`
 		Name              string                         `json:"name"`
 		StorageCredential *catalog.StorageCredentialInfo `json:"storage_credential_info,omitempty" tf:"computed" `

catalog/data_storage_credentials.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceStorageCredentials() common.Resource {
 	type storageCredentialsData struct {
+		common.Namespace
 		Names []string `json:"names,omitempty" tf:"computed"`
 	}
 	return common.WorkspaceData(func(ctx context.Context, data *storageCredentialsData, w *databricks.WorkspaceClient) error {

catalog/data_table.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceTable() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		Id    string             `json:"id,omitempty" tf:"computed"`
 		Name  string             `json:"name"`
 		Table *catalog.TableInfo `json:"table_info,omitempty" tf:"computed"`

catalog/data_tables.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceTables() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		CatalogName string   `json:"catalog_name"`
 		SchemaName  string   `json:"schema_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`

catalog/data_views.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceViews() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		CatalogName string   `json:"catalog_name"`
 		SchemaName  string   `json:"schema_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`

catalog/data_volume.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceVolume() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		Id     string              `json:"id,omitempty" tf:"computed"`
 		Name   string              `json:"name"`
 		Volume *catalog.VolumeInfo `json:"volume_info,omitempty" tf:"computed"`

catalog/data_volumes.go

@@ -10,6 +10,7 @@ import (
 
 func DataSourceVolumes() common.Resource {
 	return common.WorkspaceData(func(ctx context.Context, data *struct {
+		common.Namespace
 		CatalogName string   `json:"catalog_name"`
 		SchemaName  string   `json:"schema_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`

catalog/resource_artifact_allowlist.go

@@ -9,6 +9,7 @@ import (
 )
 
 type ArtifactAllowlistInfo struct {
+	common.Namespace
 	// A list of allowed artifact match patterns.
 	ArtifactMatchers []catalog.ArtifactMatcher `json:"artifact_matchers" tf:"slice_set,alias:artifact_matcher"`
 	// The artifact type of the allowlist.
@@ -21,12 +22,17 @@ type ArtifactAllowlistInfo struct {
 	MetastoreId string `json:"metastore_id,omitempty" tf:"computed"`
 }
 
+func (ArtifactAllowlistInfo) CustomizeSchema(s *common.CustomizableSchema) *common.CustomizableSchema {
+	common.NamespaceCustomizeSchema(s)
+	return s
+}
+
 func ResourceArtifactAllowlist() common.Resource {
-	allowlistSchema := common.StructToSchema(ArtifactAllowlistInfo{}, common.NoCustomize)
+	allowlistSchema := common.StructToSchema(ArtifactAllowlistInfo{}, nil)
 	p := common.NewPairID("metastore_id", "artifact_type")
 
 	createOrUpdate := func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-		w, err := c.WorkspaceClient()
+		w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 		if err != nil {
 			return err
 		}
@@ -53,9 +59,12 @@ func ResourceArtifactAllowlist() common.Resource {
 	}
 	return common.Resource{
 		Schema: allowlistSchema,
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+			return common.NamespaceCustomizeDiff(d)
+		},
 		Create: createOrUpdate,
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -82,7 +91,7 @@ func ResourceArtifactAllowlist() common.Resource {
 		},
 		Update: createOrUpdate,
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}

catalog/resource_catalog.go

@@ -28,8 +28,13 @@ func ucDirectoryPathSlashAndEmptySuppressDiff(k, old, new string, d *schema.Reso
 	return false
 }
 
+type CatalogInfo struct {
+	catalog.CatalogInfo
+	common.Namespace
+}
+
 func ResourceCatalog() common.Resource {
-	catalogSchema := common.StructToSchema(catalog.CatalogInfo{},
+	catalogSchema := common.StructToSchema(CatalogInfo{},
 		func(s map[string]*schema.Schema) map[string]*schema.Schema {
 			s["force_destroy"] = &schema.Schema{
 				Type:     schema.TypeBool,
@@ -58,12 +63,13 @@ func ResourceCatalog() common.Resource {
 				common.CustomizeSchemaPath(s, v).SetReadOnly()
 			}
 			common.CustomizeSchemaPath(s, "effective_predictive_optimization_flag").SetComputed().SetSuppressDiff()
+			common.NamespaceCustomizeSchemaMap(s)
 			return s
 		})
 	return common.Resource{
 		Schema: catalogSchema,
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -107,7 +113,7 @@ func ResourceCatalog() common.Resource {
 			return bindings.AddCurrentWorkspaceBindings(ctx, d, w, ci.Name, bindings.BindingsSecurableTypeCatalog)
 		},
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -119,7 +125,7 @@ func ResourceCatalog() common.Resource {
 			return common.StructToData(ci, catalogSchema, d)
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -188,7 +194,7 @@ func ResourceCatalog() common.Resource {
 			return bindings.AddCurrentWorkspaceBindings(ctx, d, w, ci.Name, bindings.BindingsSecurableTypeCatalog)
 		},
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			w, err := c.WorkspaceClient()
+			w, err := c.WorkspaceClientUnifiedProvider(ctx, d)
 			if err != nil {
 				return err
 			}
@@ -242,7 +248,7 @@ func ResourceCatalog() common.Resource {
 					}
 				}
 			}
-			return nil
+			return common.NamespaceCustomizeDiff(d)
 		},
 	}
 }