Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@

### Internal Changes

* Port `databricks_instance_pools` data source to plugin framework ([#5145](https://github.com/databricks/terraform-provider-databricks/pull/5145))
* Caching group membership in `databricks_group_member` to improve performance ([#4581](https://github.com/databricks/terraform-provider-databricks/pull/4581)).
2 changes: 2 additions & 0 deletions internal/providers/pluginfw/pluginfw_rollout_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/dashboards"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/library"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/notificationdestinations"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/pools"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/qualitymonitor"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/registered_model"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/products/serving"
Expand Down Expand Up @@ -62,6 +63,7 @@ var pluginFwOnlyDataSources = append(
catalog.DataSourceFunctions,
dashboards.DataSourceDashboards,
notificationdestinations.DataSourceNotificationDestinations,
pools.DataSourceInstancePool,
registered_model.DataSourceRegisteredModel,
registered_model.DataSourceRegisteredModelVersions,
serving.DataSourceServingEndpoints,
Expand Down
110 changes: 110 additions & 0 deletions internal/providers/pluginfw/products/pools/data_instance_pool.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
package pools

import (
"context"
"fmt"
"reflect"

"github.com/databricks/databricks-sdk-go"
"github.com/databricks/databricks-sdk-go/service/compute"
"github.com/databricks/terraform-provider-databricks/common"
pluginfwcommon "github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/common"
pluginfwcontext "github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/context"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/converters"
"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/tfschema"
"github.com/databricks/terraform-provider-databricks/internal/service/compute_tf"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
)

const dataSourceName = "instance_pool"

func DataSourceInstancePool() datasource.DataSource {
return &InstancePoolDataSource{}
}

var _ datasource.DataSourceWithConfigure = &InstancePoolDataSource{}

type InstancePoolDataSource struct {
Client *common.DatabricksClient
}

type InstancePoolInfo struct {
Id types.String `tfsdk:"id"`
Name types.String `tfsdk:"name"`
PoolInfo types.Object `tfsdk:"pool_info"`
}

func (InstancePoolInfo) ApplySchemaCustomizations(attrs map[string]tfschema.AttributeBuilder) map[string]tfschema.AttributeBuilder {
attrs["id"] = attrs["id"].SetComputed()
attrs["name"] = attrs["name"].SetRequired()
attrs["pool_info"] = attrs["pool_info"].SetComputed()

return attrs
}

func (InstancePoolInfo) GetComplexFieldTypes(context.Context) map[string]reflect.Type {
return map[string]reflect.Type{
"pool_info": reflect.TypeOf(compute_tf.InstancePoolAndStats{}),
}
}

func (d *InstancePoolDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
resp.TypeName = pluginfwcommon.GetDatabricksProductionName(dataSourceName)
}

func (d *InstancePoolDataSource) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) {
attrs, blocks := tfschema.DataSourceStructToSchemaMap(ctx, InstancePoolInfo{}, nil)
resp.Schema = schema.Schema{
Attributes: attrs,
Blocks: blocks,
}
}

func (d *InstancePoolDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
if d.Client == nil {
d.Client = pluginfwcommon.ConfigureDataSource(req, resp)
}
}

func (d *InstancePoolDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
ctx = pluginfwcontext.SetUserAgentInDataSourceContext(ctx, dataSourceName)
w, diags := d.Client.GetWorkspaceClient()
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}

var poolInfo InstancePoolInfo
resp.Diagnostics.Append(req.Config.Get(ctx, &poolInfo)...)
if resp.Diagnostics.HasError() {
return
}

poolName := poolInfo.Name.ValueString()
pool, err := d.getInstancePoolByName(ctx, w, poolName)
if err != nil {
resp.Diagnostics.AddError(fmt.Sprintf("failed to get instance pool '%s'", poolName), err.Error())
return
}

var tfPool compute_tf.InstancePoolAndStats
resp.Diagnostics.Append(converters.GoSdkToTfSdkStruct(ctx, pool, &tfPool)...)
if resp.Diagnostics.HasError() {
return
}

poolInfo.Id = types.StringValue(pool.InstancePoolId)
poolInfo.Name = types.StringValue(pool.InstancePoolName)
poolInfo.PoolInfo = tfPool.ToObjectValue(ctx)
resp.Diagnostics.Append(resp.State.Set(ctx, poolInfo)...)
}

func (d *InstancePoolDataSource) getInstancePoolByName(ctx context.Context, w *databricks.WorkspaceClient, poolName string) (*compute.InstancePoolAndStats, error) {
pool, err := w.InstancePools.GetByInstancePoolName(ctx, poolName)
if err != nil {
return nil, err
}
return pool, nil
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package pools_test

import (
"testing"

"github.com/databricks/terraform-provider-databricks/internal/acceptance"
)

func TestAccDataSourceInstancePool(t *testing.T) {
acceptance.WorkspaceLevel(t, acceptance.Step{
Template: `
data "databricks_node_type" "smallest" {
local_disk = true
}

resource "databricks_instance_pool" "this" {
instance_pool_name = "tf-pool-{var.RANDOM}"
min_idle_instances = 0
max_capacity = 10
node_type_id = data.databricks_node_type.smallest.id
idle_instance_autotermination_minutes = 10
}

data "databricks_instance_pool" "this" {
name = databricks_instance_pool.this.instance_pool_name
depends_on = [databricks_instance_pool.this]
}
`,
})
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package pools

import (
"context"
"testing"

"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/stretchr/testify/assert"
)

func TestInstancePoolDataSource_Metadata(t *testing.T) {
d := &InstancePoolDataSource{}
ctx := context.Background()

req := datasource.MetadataRequest{
ProviderTypeName: "databricks",
}
resp := &datasource.MetadataResponse{}

d.Metadata(ctx, req, resp)

// Verify the staging name is set correctly
assert.Contains(t, resp.TypeName, "instance_pool")
}
1 change: 0 additions & 1 deletion internal/providers/sdkv2/sdkv2.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ func DatabricksProvider(opts ...SdkV2ProviderOption) *schema.Provider {
"databricks_external_location": catalog.DataSourceExternalLocation().ToResource(),
"databricks_external_locations": catalog.DataSourceExternalLocations().ToResource(),
"databricks_group": scim.DataSourceGroup().ToResource(),
"databricks_instance_pool": pools.DataSourceInstancePool().ToResource(),
"databricks_instance_profiles": aws.DataSourceInstanceProfiles().ToResource(),
"databricks_jobs": jobs.DataSourceJobs().ToResource(),
"databricks_job": jobs.DataSourceJob().ToResource(),
Expand Down
46 changes: 0 additions & 46 deletions pools/data_instance_pool.go

This file was deleted.

90 changes: 0 additions & 90 deletions pools/data_instance_pool_test.go

This file was deleted.

Loading