[Feature] Add unified provider support for manual plugin framework resources and data sources

NEXT_CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### New Features and Improvements
 
+* Add `provider_config` support for manual plugin framework resources and data sources([#5127](https://github.com/databricks/terraform-provider-databricks/pull/5127))
+
 ### Bug Fixes
 
 ### Documentation

internal/providers/pluginfw/products/app/data_app.go

@@ -11,7 +11,6 @@ import (
 	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/tfschema"
 	"github.com/databricks/terraform-provider-databricks/internal/service/apps_tf"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
-	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -26,18 +25,20 @@ type dataSourceApp struct {
 type dataApp struct {
 	Name types.String `tfsdk:"name"`
 	App  types.Object `tfsdk:"app"`
+	tfschema.Namespace
 }
 
 func (dataApp) ApplySchemaCustomizations(attrs map[string]tfschema.AttributeBuilder) map[string]tfschema.AttributeBuilder {
 	attrs["name"] = attrs["name"].SetRequired()
 	attrs["app"] = attrs["app"].SetComputed()
-
+	attrs["provider_config"] = attrs["provider_config"].SetOptional()
 	return attrs
 }
 
 func (dataApp) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"app": reflect.TypeOf(apps_tf.App{}),
+		"app":             reflect.TypeOf(apps_tf.App{}),
+		"provider_config": reflect.TypeOf(tfschema.ProviderConfigData{}),
 	}
 }
 
@@ -59,19 +60,26 @@ func (a *dataSourceApp) Configure(ctx context.Context, req datasource.ConfigureR
 
 func (a *dataSourceApp) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	ctx = pluginfwcontext.SetUserAgentInDataSourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var config dataApp
+	resp.Diagnostics.Append(req.Config.Get(ctx, &config)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDDataSource(ctx, config.ProviderConfig)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var name types.String
-	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, path.Root("name"), &name)...)
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
+	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	appGoSdk, err := w.Apps.GetByName(ctx, name.ValueString())
+	appGoSdk, err := w.Apps.GetByName(ctx, config.Name.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("failed to read app", err.Error())
 		return
@@ -82,7 +90,13 @@ func (a *dataSourceApp) Read(ctx context.Context, req datasource.ReadRequest, re
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	dataApp := dataApp{Name: name, App: newApp.ToObjectValue(ctx)}
+	dataApp := dataApp{
+		Name: config.Name,
+		App:  newApp.ToObjectValue(ctx),
+		Namespace: tfschema.Namespace{
+			ProviderConfig: config.ProviderConfig,
+		},
+	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, dataApp)...)
 	if resp.Diagnostics.HasError() {
 		return

internal/providers/pluginfw/products/app/data_apps.go

@@ -26,17 +26,19 @@ type dataSourceApps struct {
 
 type dataApps struct {
 	Apps types.List `tfsdk:"app"`
+	tfschema.Namespace
 }
 
 func (dataApps) ApplySchemaCustomizations(attrs map[string]tfschema.AttributeBuilder) map[string]tfschema.AttributeBuilder {
 	attrs["app"] = attrs["app"].SetComputed()
-
+	attrs["provider_config"] = attrs["provider_config"].SetOptional()
 	return attrs
 }
 
 func (dataApps) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
 	return map[string]reflect.Type{
-		"app": reflect.TypeOf(apps_tf.App{}),
+		"app":             reflect.TypeOf(apps_tf.App{}),
+		"provider_config": reflect.TypeOf(tfschema.ProviderConfigData{}),
 	}
 }
 
@@ -58,7 +60,20 @@ func (a *dataSourceApps) Configure(ctx context.Context, req datasource.Configure
 
 func (a *dataSourceApps) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	ctx = pluginfwcontext.SetUserAgentInDataSourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var config dataApps
+	resp.Diagnostics.Append(req.Config.Get(ctx, &config)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDDataSource(ctx, config.ProviderConfig)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -79,7 +94,12 @@ func (a *dataSourceApps) Read(ctx context.Context, req datasource.ReadRequest, r
 		}
 		apps = append(apps, app.ToObjectValue(ctx))
 	}
-	dataApps := dataApps{Apps: types.ListValueMust(apps_tf.App{}.Type(ctx), apps)}
+	dataApps := dataApps{
+		Apps: types.ListValueMust(apps_tf.App{}.Type(ctx), apps),
+		Namespace: tfschema.Namespace{
+			ProviderConfig: config.ProviderConfig,
+		},
+	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, dataApps)...)
 	if resp.Diagnostics.HasError() {
 		return

internal/providers/pluginfw/products/app/resource_app.go

@@ -32,15 +32,23 @@ const (
 type appResource struct {
 	apps_tf.App
 	NoCompute types.Bool `tfsdk:"no_compute"`
+	tfschema.Namespace
 }
 
 func (a appResource) ApplySchemaCustomizations(s map[string]tfschema.AttributeBuilder) map[string]tfschema.AttributeBuilder {
 	s["no_compute"] = s["no_compute"].SetOptional()
+	s["provider_config"] = s["provider_config"].SetOptional()
 	s["compute_size"] = s["compute_size"].SetComputed()
 	s = apps_tf.App{}.ApplySchemaCustomizations(s)
 	return s
 }
 
+func (a appResource) GetComplexFieldTypes(ctx context.Context) map[string]reflect.Type {
+	attrs := a.App.GetComplexFieldTypes(ctx)
+	attrs["provider_config"] = reflect.TypeOf(tfschema.ProviderConfig{})
+	return attrs
+}
+
 func ResourceApp() resource.Resource {
 	return &resourceApp{}
 }
@@ -94,17 +102,25 @@ func (a *resourceApp) Configure(ctx context.Context, req resource.ConfigureReque
 
 func (a *resourceApp) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	ctx = pluginfwcontext.SetUserAgentInResourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var app appResource
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &app)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDResource(ctx, app.ProviderConfig)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var app appResource
-	resp.Diagnostics.Append(req.Plan.Get(ctx, &app)...)
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
+	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
 	var appGoSdk apps.App
 	resp.Diagnostics.Append(converters.TfSdkToGoSdkStruct(ctx, app, &appGoSdk)...)
 	if resp.Diagnostics.HasError() {
@@ -133,6 +149,7 @@ func (a *resourceApp) Create(ctx context.Context, req resource.CreateRequest, re
 		return
 	}
 	newApp.NoCompute = app.NoCompute
+	newApp.ProviderConfig = app.ProviderConfig
 	resp.Diagnostics.Append(resp.State.Set(ctx, newApp)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -150,6 +167,7 @@ func (a *resourceApp) Create(ctx context.Context, req resource.CreateRequest, re
 	if resp.Diagnostics.HasError() {
 		return
 	}
+	newApp.ProviderConfig = app.ProviderConfig
 	resp.Diagnostics.Append(resp.State.Set(ctx, newApp)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -195,14 +213,21 @@ func (a *resourceApp) waitForApp(ctx context.Context, w *databricks.WorkspaceCli
 
 func (a *resourceApp) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
 	ctx = pluginfwcontext.SetUserAgentInResourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var app appResource
+	resp.Diagnostics.Append(req.State.Get(ctx, &app)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDResource(ctx, app.ProviderConfig)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var app appResource
-	resp.Diagnostics.Append(req.State.Get(ctx, &app)...)
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
+	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -219,6 +244,7 @@ func (a *resourceApp) Read(ctx context.Context, req resource.ReadRequest, resp *
 		return
 	}
 	newApp.NoCompute = app.NoCompute
+	newApp.ProviderConfig = app.ProviderConfig
 	resp.Diagnostics.Append(resp.State.Set(ctx, newApp)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -227,14 +253,21 @@ func (a *resourceApp) Read(ctx context.Context, req resource.ReadRequest, resp *
 
 func (a *resourceApp) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	ctx = pluginfwcontext.SetUserAgentInResourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var app appResource
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &app)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDResource(ctx, app.ProviderConfig)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var app appResource
-	resp.Diagnostics.Append(req.Plan.Get(ctx, &app)...)
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
+	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -259,6 +292,7 @@ func (a *resourceApp) Update(ctx context.Context, req resource.UpdateRequest, re
 	}
 	// Modifying no_compute after creation has no effect.
 	newApp.NoCompute = app.NoCompute
+	newApp.ProviderConfig = app.ProviderConfig
 	resp.Diagnostics.Append(resp.State.Set(ctx, newApp)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -267,14 +301,21 @@ func (a *resourceApp) Update(ctx context.Context, req resource.UpdateRequest, re
 
 func (a *resourceApp) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	ctx = pluginfwcontext.SetUserAgentInResourceContext(ctx, resourceName)
-	w, diags := a.client.GetWorkspaceClient()
+
+	var app appResource
+	resp.Diagnostics.Append(req.State.Get(ctx, &app)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	workspaceID, diags := tfschema.GetWorkspaceIDResource(ctx, app.ProviderConfig)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var app appResource
-	resp.Diagnostics.Append(req.State.Get(ctx, &app)...)
+	w, diags := a.client.GetWorkspaceClientForUnifiedProviderWithDiagnostics(ctx, workspaceID)
+	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}