Replace pfutils.DataSources with runtypes.DataSources

pulumi · Jun 10, 2024 · 3f87b8f · 3f87b8f
1 parent d45e11c
commit 3f87b8f
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 27 deletions.
diff --git a/pf/internal/pfutils/datasources.go b/pf/internal/pfutils/datasources.go
@@ -19,20 +19,14 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
-	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
+	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 )
 
-// Represents all provider's datasources pre-indexed by TypeName.
-type DataSources interface {
-	All() []runtypes.TypeName
-	Has(runtypes.TypeName) bool
-	Schema(runtypes.TypeName) Schema
-	Diagnostics(runtypes.TypeName) diag.Diagnostics
-}
-
-func GatherDatasources(ctx context.Context, prov provider.Provider) (DataSources, error) {
+func GatherDatasources[F func(Schema) shim.SchemaMap](
+	ctx context.Context, prov provider.Provider, f F,
+) (runtypes.DataSources, error) {
 	provMetadata := queryProviderMetadata(ctx, prov)
 	ds := make(collection[func() datasource.DataSource])
 
@@ -60,9 +54,16 @@ func GatherDatasources(ctx context.Context, prov provider.Provider) (DataSources
 		}
 	}
 
-	return &dataSources{collection: ds}, nil
+	return &dataSources{collection: ds, convert: f}, nil
 }
 
 type dataSources struct {
 	collection[func() datasource.DataSource]
+	convert func(Schema) shim.SchemaMap
 }
+
+func (r dataSources) Schema(t runtypes.TypeName) runtypes.Schema {
+	return runtypesSchemaAdapter{r.collection.Schema(t), r.convert}
+}
+
+func (dataSources) IsDataSources() {}
diff --git a/pf/internal/pfutils/resources.go b/pf/internal/pfutils/resources.go
@@ -74,3 +74,5 @@ func (r runtypesSchemaAdapter) Shim() shim.SchemaMap {
 func (r resources) Schema(t runtypes.TypeName) runtypes.Schema {
 	return runtypesSchemaAdapter{r.collection.Schema(t), r.convert}
 }
+
+func (resources) IsResources() {}
diff --git a/pf/internal/runtypes/types.go b/pf/internal/runtypes/types.go
@@ -41,10 +41,21 @@ type Schema interface {
 // examplecloud_thing.
 type TypeName string
 
-// Represents all provider's resources pre-indexed by TypeName.
-type Resources interface {
+type collection interface {
 	All() []TypeName
 	Has(TypeName) bool
 	Schema(TypeName) Schema
 	Diagnostics(TypeName) diag.Diagnostics
 }
+
+// Represents all provider's resources pre-indexed by TypeName.
+type Resources interface {
+	collection
+	IsResources()
+}
+
+// Represents all provider's datasources pre-indexed by TypeName.
+type DataSources interface {
+	collection
+	IsDataSources()
+}
diff --git a/pf/internal/schemashim/datasource.go b/pf/internal/schemashim/datasource.go
@@ -15,18 +15,18 @@
 package schemashim
 
 import (
-	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/pfutils"
+	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 )
 
 type schemaOnlyDataSource struct {
-	tf pfutils.Schema
+	tf runtypes.Schema
 }
 
 var _ shim.Resource = (*schemaOnlyDataSource)(nil)
 
 func (r *schemaOnlyDataSource) Schema() shim.SchemaMap {
-	return newSchemaMap(r.tf)
+	return r.tf.Shim()
 }
 
 func (*schemaOnlyDataSource) SchemaVersion() int {

diff --git a/pf/internal/schemashim/datasource_map.go b/pf/internal/schemashim/datasource_map.go
@@ -15,13 +15,12 @@
 package schemashim
 
 import (
-	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/pfutils"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 )
 
 type schemaOnlyDataSourceMap struct {
-	dataSources pfutils.DataSources
+	dataSources runtypes.DataSources
 }
 
 var _ shim.ResourceMap = (*schemaOnlyDataSourceMap)(nil)

diff --git a/pf/internal/schemashim/provider.go b/pf/internal/schemashim/provider.go
@@ -55,8 +55,8 @@ func (p *SchemaOnlyProvider) Resources(ctx context.Context) (runtypes.Resources,
 	return pfutils.GatherResources(ctx, p.tf, NewSchemaMap)
 }
 
-func (p *SchemaOnlyProvider) DataSources(ctx context.Context) (pfutils.DataSources, error) {
-	return pfutils.GatherDatasources(ctx, p.tf)
+func (p *SchemaOnlyProvider) DataSources(ctx context.Context) (runtypes.DataSources, error) {
+	return pfutils.GatherDatasources(ctx, p.tf, NewSchemaMap)
 }
 
 func (p *SchemaOnlyProvider) Config(ctx context.Context) (tftypes.Object, error) {
@@ -87,7 +87,7 @@ func (p *SchemaOnlyProvider) ResourcesMap() shim.ResourceMap {
 }
 
 func (p *SchemaOnlyProvider) DataSourcesMap() shim.ResourceMap {
-	dataSources, err := pfutils.GatherDatasources(context.TODO(), p.tf)
+	dataSources, err := pfutils.GatherDatasources(context.TODO(), p.tf, NewSchemaMap)
 	if err != nil {
 		panic(err)
 	}

diff --git a/pf/provider.go b/pf/provider.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
-	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/pfutils"
+
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 )
@@ -33,6 +33,6 @@ type ShimProvider interface {
 
 	Server(context.Context) (tfprotov6.ProviderServer, error)
 	Resources(context.Context) (runtypes.Resources, error)
-	DataSources(context.Context) (pfutils.DataSources, error)
+	DataSources(context.Context) (runtypes.DataSources, error)
 	Config(context.Context) (tftypes.Object, error)
 }
diff --git a/pf/tfbridge/provider.go b/pf/tfbridge/provider.go
@@ -34,7 +34,6 @@ import (
 	pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
 
 	"github.com/pulumi/pulumi-terraform-bridge/pf"
-	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/pfutils"
 	pl "github.com/pulumi/pulumi-terraform-bridge/pf/internal/plugin"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/schemashim"
@@ -52,7 +51,7 @@ type provider struct {
 	tfServer      tfprotov6.ProviderServer
 	info          tfbridge.ProviderInfo
 	resources     runtypes.Resources
-	datasources   pfutils.DataSources
+	datasources   runtypes.DataSources
 	pulumiSchema  []byte
 	encoding      convert.Encoding
 	diagSink      diag.Sink

diff --git a/pf/tfbridge/provider_datasources.go b/pf/tfbridge/provider_datasources.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
 
-	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/pfutils"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/internal/runtypes"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
@@ -31,7 +30,7 @@ import (
 type datasourceHandle struct {
 	token                   tokens.ModuleMember
 	terraformDataSourceName string
-	schema                  pfutils.Schema
+	schema                  runtypes.Schema
 	encoder                 convert.Encoder
 	decoder                 convert.Decoder
 	schemaOnlyShim          shim.Resource