Support account-level provider with workspace-level resources

aws/data_aws_assume_role_policy.go

@@ -86,5 +86,6 @@ func DataAwsAssumeRolePolicy() common.Resource {
 				ForceNew: true,
 			},
 		},
+		WorkspaceIdField: common.NoWorkspaceId,
 	}
 }

aws/data_aws_bucket_policy.go

@@ -86,5 +86,6 @@ func DataAwsBucketPolicy() common.Resource {
 				ForceNew: true,
 			},
 		},
+		WorkspaceIdField: common.NoWorkspaceId,
 	}
 }

aws/data_aws_crossaccount_policy.go

@@ -147,5 +147,6 @@ func DataAwsCrossaccountPolicy() common.Resource {
 				ForceNew: true,
 			},
 		},
+		WorkspaceIdField: common.NoWorkspaceId,
 	}
 }

catalog/data_catalogs.go

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

catalog/data_current_metastore.go

@@ -13,7 +13,7 @@ func DataSourceCurrentMetastore() common.Resource {
 		Id        string                               `json:"id,omitempty" tf:"computed"`
 		Metastore *catalog.GetMetastoreSummaryResponse `json:"metastore_info,omitempty" tf:"computed" `
 	}
-	return common.WorkspaceData(func(ctx context.Context, data *CurrentMetastore, wc *databricks.WorkspaceClient) error {
+	dataSource := common.WorkspaceData(func(ctx context.Context, data *CurrentMetastore, wc *databricks.WorkspaceClient) error {
 		summary, err := wc.Metastores.Summary(ctx)
 		if err != nil {
 			return err
@@ -23,4 +23,6 @@ func DataSourceCurrentMetastore() common.Resource {
 
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/data_metastore.go

@@ -13,12 +13,14 @@ func DataSourceMetastore() common.Resource {
 		Id        string                 `json:"metastore_id"`
 		Metastore *catalog.MetastoreInfo `json:"metastore_info,omitempty" tf:"computed" `
 	}
-	return common.AccountData(func(ctx context.Context, data *AccountMetastoreByID, acc *databricks.AccountClient) error {
+	dataSource := common.AccountData(func(ctx context.Context, data *AccountMetastoreByID, acc *databricks.AccountClient) error {
 		metastore, err := acc.Metastores.GetByMetastoreId(ctx, data.Id)
 		if err != nil {
 			return err
 		}
 		data.Metastore = metastore.MetastoreInfo
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/data_metastores.go

@@ -12,7 +12,7 @@ func DataSourceMetastores() common.Resource {
 	type metastoresData struct {
 		Ids map[string]string `json:"ids,omitempty" tf:"computed"`
 	}
-	return common.AccountData(func(ctx context.Context, data *metastoresData, acc *databricks.AccountClient) error {
+	dataSource := common.AccountData(func(ctx context.Context, data *metastoresData, acc *databricks.AccountClient) error {
 		metastores, err := acc.Metastores.ListAll(ctx)
 		if err != nil {
 			return err
@@ -28,4 +28,6 @@ func DataSourceMetastores() common.Resource {
 		}
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.NoWorkspaceId
+	return dataSource
 }

catalog/data_schemas.go

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

catalog/data_share.go

@@ -13,7 +13,7 @@ func DataSourceShare() common.Resource {
 		CreatedAt int64              `json:"created_at,omitempty" tf:"computed"`
 		CreatedBy string             `json:"created_by,omitempty" tf:"computed"`
 	}
-	return common.DataResource(ShareDetail{}, func(ctx context.Context, e any, c *common.DatabricksClient) error {
+	dataSource := common.DataResource(ShareDetail{}, func(ctx context.Context, e any, c *common.DatabricksClient) error {
 		data := e.(*ShareDetail)
 		sharesAPI := NewSharesAPI(ctx, c)
 		share, err := sharesAPI.get(data.Name)
@@ -25,4 +25,6 @@ func DataSourceShare() common.Resource {
 		data.CreatedBy = share.CreatedBy
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/data_shares.go

@@ -8,7 +8,7 @@ import (
 )
 
 func DataSourceShares() common.Resource {
-	return common.WorkspaceData(func(ctx context.Context, data *struct {
+	dataSource := common.WorkspaceData(func(ctx context.Context, data *struct {
 		Shares []string `json:"shares,omitempty" tf:"computed,slice_set"`
 	}, w *databricks.WorkspaceClient) error {
 
@@ -21,4 +21,6 @@ func DataSourceShares() common.Resource {
 		}
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/data_tables.go

@@ -9,7 +9,7 @@ import (
 )
 
 func DataSourceTables() common.Resource {
-	return common.WorkspaceData(func(ctx context.Context, data *struct {
+	dataSource := common.WorkspaceData(func(ctx context.Context, data *struct {
 		CatalogName string   `json:"catalog_name"`
 		SchemaName  string   `json:"schema_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`
@@ -25,4 +25,6 @@ func DataSourceTables() common.Resource {
 		}
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/data_views.go

@@ -9,7 +9,7 @@ import (
 )
 
 func DataSourceViews() common.Resource {
-	return common.WorkspaceData(func(ctx context.Context, data *struct {
+	dataSource := common.WorkspaceData(func(ctx context.Context, data *struct {
 		CatalogName string   `json:"catalog_name"`
 		SchemaName  string   `json:"schema_name"`
 		Ids         []string `json:"ids,omitempty" tf:"computed,slice_set"`
@@ -26,4 +26,6 @@ func DataSourceViews() common.Resource {
 		}
 		return nil
 	})
+	dataSource.WorkspaceIdField = common.ManagementWorkspaceId
+	return dataSource
 }

catalog/resource_artifact_allowlist.go

@@ -107,5 +107,6 @@ func ResourceArtifactAllowlist() common.Resource {
 
 			return nil
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_catalog.go

@@ -223,5 +223,6 @@ func ResourceCatalog() common.Resource {
 			}
 			return w.Catalogs.Delete(ctx, catalog.DeleteCatalogRequest{Force: force, Name: d.Id()})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_catalog_workspace_binding.go

@@ -109,6 +109,7 @@ func ResourceCatalogWorkspaceBinding() common.Resource {
 			})
 			return err
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }
 

catalog/resource_connection.go

@@ -157,5 +157,6 @@ func ResourceConnection() common.Resource {
 			}
 			return w.Connections.DeleteByName(ctx, connName)
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_external_location.go

@@ -145,5 +145,6 @@ func ResourceExternalLocation() common.Resource {
 				Force: force,
 			})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_grant.go

@@ -231,5 +231,6 @@ func ResourceGrant() common.Resource {
 			unityCatalogPermissionsAPI := permissions.NewUnityCatalogPermissionsAPI(ctx, c)
 			return replacePermissionsForPrincipal(unityCatalogPermissionsAPI, securable, name, principal, catalog.PermissionsList{})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_grants.go

@@ -392,5 +392,6 @@ func ResourceGrants() common.Resource {
 			unityCatalogPermissionsAPI := permissions.NewUnityCatalogPermissionsAPI(ctx, c)
 			return replaceAllPermissions(unityCatalogPermissionsAPI, securable, name, catalog.PermissionsList{})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_metastore.go

@@ -208,5 +208,6 @@ func ResourceMetastore() common.Resource {
 				return w.Metastores.Delete(ctx, catalog.DeleteMetastoreRequest{Force: force, Id: d.Id()})
 			})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_metastore_assignment.go

@@ -115,5 +115,6 @@ func ResourceMetastoreAssignment() common.Resource {
 				})
 			})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_metastore_data_access.go

@@ -194,6 +194,7 @@ func ResourceMetastoreDataAccess() common.Resource {
 				})
 			})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }
 

catalog/resource_provider.go

@@ -87,5 +87,6 @@ func ResourceProvider() common.Resource {
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			return NewProvidersAPI(ctx, c).deleteProvider(d.Id())
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_registered_model.go

@@ -65,8 +65,9 @@ func ResourceRegisteredModel() common.Resource {
 			}
 			return w.RegisteredModels.DeleteByFullName(ctx, d.Id())
 		},
-		StateUpgraders: []schema.StateUpgrader{},
-		Schema:         s,
-		SchemaVersion:  0,
+		StateUpgraders:   []schema.StateUpgrader{},
+		Schema:           s,
+		SchemaVersion:    0,
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_schema.go

@@ -183,5 +183,6 @@ func ResourceSchema() common.Resource {
 			}
 			return w.Schemas.DeleteByFullName(ctx, name)
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_share.go

@@ -267,5 +267,6 @@ func ResourceShare() common.Resource {
 			}
 			return w.Shares.DeleteByName(ctx, d.Id())
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_sql_table.go

@@ -472,5 +472,6 @@ func ResourceSqlTable() common.Resource {
 			}
 			return ti.deleteTable()
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_storage_credential.go

@@ -239,5 +239,6 @@ func ResourceStorageCredential() common.Resource {
 				})
 			})
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_system_schema.go

@@ -109,5 +109,6 @@ func ResourceSystemSchema() common.Resource {
 				SchemaName:  catalog.DisableSchemaName(schemaName),
 			})
 		},
+		WorkspaceIdField: common.WorkspaceId,
 	}
 }

catalog/resource_table.go

@@ -97,5 +97,6 @@ func ResourceTable() common.Resource {
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			return NewTablesAPI(ctx, c).deleteTable(d.Id())
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

catalog/resource_volume.go

@@ -153,5 +153,6 @@ func ResourceVolume() common.Resource {
 			}
 			return w.Volumes.DeleteByName(ctx, d.Id())
 		},
+		WorkspaceIdField: common.ManagementWorkspaceId,
 	}
 }

clusters/data_clusters_test.go

@@ -78,7 +78,8 @@ func TestClustersDataSourceErrorsOut(t *testing.T) {
 		RetryTimeoutSeconds: 1,
 		HTTPTimeoutSeconds:  1,
 	})
-	diag := DataSourceClusters().ToResource().ReadContext(context.Background(), nil, &common.DatabricksClient{
+	resource := DataSourceClusters().ToResource()
+	diag := resource.ReadContext(context.Background(), resource.TestResourceData(), &common.DatabricksClient{
 		DatabricksClient: client,
 	})
 	assert.NotNil(t, diag)