remove bridgedProvider utility

Author: VenelinMartinov

pkg/pf/tests/autonaming_test.go

@@ -27,7 +27,7 @@ func TestAutonaming(t *testing.T) {
 			},
 		})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 	prov.Resources["testprovider_test"] = &tfbridge.ResourceInfo{
 		Tok: "testprovider:index:Test",
 		Fields: map[string]*tfbridge.SchemaInfo{

pkg/pf/tests/config_test.go

@@ -475,7 +475,7 @@ func TestAccProviderConfigureSecretsPluginFramework(t *testing.T) {
 				},
 			})
 
-			bp := bridgedProvider(tfp)
+			bp := tfp.ToProviderInfo()
 			bp.Config = map[string]*info.Schema{
 				"basic_strlist_config": {
 					// Prevent basicStrlistConfigs pluralization

pkg/pf/tests/diff_secret_test.go

@@ -32,7 +32,7 @@ func TestSecretBasic(t *testing.T) {
 			},
 		})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test
@@ -82,7 +82,7 @@ func TestSecretSet(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test
@@ -177,7 +177,7 @@ func TestSecretObjectBlock(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test
@@ -273,7 +273,7 @@ func TestSecretPulumiSchema(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	prov.Resources["testprovider_test"].Fields = map[string]*info.Schema{
 		"s": {Secret: tfbridge0.True()},

pkg/pf/tests/provider_checkconfig_test.go

@@ -829,7 +829,7 @@ func TestExtraConfig(t *testing.T) {
 			},
 		})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	prov.ExtraConfig = map[string]*info.Config{
 		"extraConf": {

pkg/pf/tests/schema_and_program_test.go

@@ -44,7 +44,7 @@ func TestBasic(t *testing.T) {
 			},
 		})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test
@@ -102,7 +102,7 @@ func TestComputedSetNoDiffWhenElementRemoved(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program1 := `
 name: test
@@ -262,7 +262,7 @@ func TestIDAttribute(t *testing.T) {
 			if tc.computeIDField != "" {
 				computeIDField = tfbridge.DelegateIDField(presource.PropertyKey(tc.computeIDField), "prov", "")
 			}
-			prov := bridgedProvider(&provBuilder)
+			prov := provBuilder.ToProviderInfo()
 			prov.Resources = map[string]*info.Resource{
 				"prov_test": {
 					Tok:       "prov:index/test:Test",
@@ -329,7 +329,7 @@ func TestDefaults(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test
@@ -391,7 +391,7 @@ func TestPlanModifiers(t *testing.T) {
 		},
 	})
 
-	prov := bridgedProvider(provBuilder)
+	prov := provBuilder.ToProviderInfo()
 
 	program := `
 name: test

pkg/pf/tests/util.go

@@ -21,11 +21,8 @@ import (
 	pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
 	"github.com/stretchr/testify/require"
 
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/providerbuilder"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge"
 	tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"
 )
 
 func newProviderServer(t *testing.T, info tfbridge0.ProviderInfo) (pulumirpc.ResourceProviderServer, error) {
@@ -46,19 +43,3 @@ func newMuxedProviderServer(t *testing.T, info tfbridge0.ProviderInfo) pulumirpc
 	require.NoError(t, err)
 	return p
 }
-
-func bridgedProvider(prov *providerbuilder.Provider) info.Provider {
-	shimProvider := tfbridge.ShimProvider(prov)
-
-	provider := tfbridge0.ProviderInfo{
-		P:                           shimProvider,
-		Name:                        prov.TypeName,
-		Version:                     "0.0.1",
-		MetadataInfo:                &tfbridge0.MetadataInfo{},
-		EnableAccurateBridgePreview: true,
-	}
-
-	provider.MustComputeTokens(tokens.SingleModule(prov.TypeName, "index", tokens.MakeStandard(prov.TypeName)))
-
-	return provider
-}