more robust bridging

provider/internal/buildx.go

@@ -1,6 +1,8 @@
 package internal
 
 import (
+	"context"
+
 	provider "github.com/pulumi/pulumi-go-provider"
 	"github.com/pulumi/pulumi-go-provider/infer"
 	"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
@@ -29,7 +31,7 @@ func NewBuildxProvider() provider.Provider {
 	return infer.Provider(
 		infer.Options{
 			Resources: []infer.InferredResource{
-				imageResource(),
+				infer.Resource[*Image, ImageArgs, ImageState](),
 			},
 			ModuleMap: map[tokens.ModuleName]tokens.ModuleName{
 				"internal": "buildx/image",
@@ -39,14 +41,10 @@ func NewBuildxProvider() provider.Provider {
 	)
 }
 
-// ImageSchema returns Image's schema for SDK generation.
-func ImageSchema() schema.ResourceSpec {
-	r := imageResource()
-	s, err := r.GetSchema(nil) // We don't have subtypes.
+// Schema returns our package specification.
+func Schema(ctx context.Context, version string) schema.PackageSpec {
+	p := NewBuildxProvider()
+	spec, err := provider.GetSchema(ctx, "docker", version, p)
 	contract.AssertNoErrorf(err, "missing schema")
-	return s
-}
-
-func imageResource() infer.InferredResource {
-	return infer.Resource[*Image, ImageArgs, ImageState]()
+	return spec
 }

provider/internal/buildx_test.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"context"
 	"testing"
 
 	"github.com/blang/semver"
@@ -33,7 +34,7 @@ func TestAnnotate(_ *testing.T) {
 
 // TestSchema sanity checks that our schema doesn't panic.
 func TestSchema(_ *testing.T) {
-	ImageSchema()
+	Schema(context.Background(), "v4")
 }
 
 type annotator struct{}

provider/resources.go

@@ -15,6 +15,7 @@
 package provider
 
 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"unicode"
@@ -230,8 +231,6 @@ func Provider(version string) tfbridge.ProviderInfo {
 			},
 		},
 		ExtraResources: map[string]schema.ResourceSpec{
-			dockerResource("buildx", "Image").String(): internal.ImageSchema(),
-
 			dockerResource(dockerMod, "Image").String(): {
 				ObjectTypeSpec: schema.ObjectTypeSpec{
 					Type:        "object",
@@ -369,6 +368,15 @@ func Provider(version string) tfbridge.ProviderInfo {
 		MetadataInfo: tfbridge.NewProviderMetadata(metadata),
 	}
 
+	// Bridge pulumi-go-provider types into our provider.
+	spec := internal.Schema(context.Background(), version)
+	for k, v := range spec.Resources {
+		prov.ExtraResources[k] = v
+	}
+	for k, v := range spec.Types {
+		prov.ExtraTypes[k] = v
+	}
+
 	prov.MustComputeTokens(tfbridgetokens.SingleModule("docker_", dockerMod,
 		tfbridgetokens.MakeStandard(dockerPkg)))
 	prov.MustApplyAutoAliases()