Skip to content

Remove bridgedProvider test utilities in favour of ToProviderInfo #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Remove bridgedProvider test utilities in favour of ToProviderInfo #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/pf/tests/autonaming_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/pf/tests/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkg/pf/tests/diff_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ func TestDetailedDiffList(t *testing.T) {

diff := crosstests.Diff(
t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
crosstests.DisableAccurateBridgePreview(),
)

autogold.ExpectFile(t, testOutput{
Expand Down
1 change: 0 additions & 1 deletion pkg/pf/tests/diff_map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ func TestDetailedDiffMap(t *testing.T) {

diff := crosstests.Diff(
t, schemaValueMakerPair.res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
crosstests.DisableAccurateBridgePreview(),
)

autogold.ExpectFile(t, testOutput{
Expand Down
10 changes: 2 additions & 8 deletions pkg/pf/tests/diff_object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,7 @@ func TestDetailedDiffObject(t *testing.T) {
res := pb.NewResource(pb.NewResourceArgs{
ResourceSchema: schema.schema,
})
diff := crosstests.Diff(
t, res, initialValue, changeValue,
crosstests.DisableAccurateBridgePreview(),
)
diff := crosstests.Diff(t, res, initialValue, changeValue)
autogold.ExpectFile(t, testOutput{
initialValue: scenario.initialValue,
changeValue: scenario.changeValue,
Expand All @@ -360,10 +357,7 @@ func TestDetailedDiffObject(t *testing.T) {
res := pb.NewResource(pb.NewResourceArgs{
ResourceSchema: schema.schema,
})
diff := crosstests.Diff(
t, res, initialValue, changeValue,
crosstests.DisableAccurateBridgePreview(),
)
diff := crosstests.Diff(t, res, initialValue, changeValue)
autogold.ExpectFile(t, testOutput{
initialValue: scenario.initialValue,
changeValue: scenario.changeValue,
Expand Down
8 changes: 4 additions & 4 deletions pkg/pf/tests/diff_secret_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestSecretBasic(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down Expand Up @@ -82,7 +82,7 @@ func TestSecretSet(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestSecretObjectBlock(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down Expand Up @@ -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()},
Expand Down
1 change: 0 additions & 1 deletion pkg/pf/tests/diff_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,6 @@ func TestDetailedDiffSet(t *testing.T) {

diff := crosstests.Diff(
t, schemaValueMakerPair.res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
crosstests.DisableAccurateBridgePreview(),
)

autogold.ExpectFile(t, testOutput{
Expand Down
1 change: 0 additions & 1 deletion pkg/pf/tests/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ func TestDetailedDiffStringAttribute(t *testing.T) {
})
diff := crosstests.Diff(
t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
crosstests.DisableAccurateBridgePreview(),
)

autogold.ExpectFile(t, testOutput{
Expand Down
11 changes: 2 additions & 9 deletions pkg/pf/tests/internal/cross-tests/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ func Diff(t T, res pb.Resource, tfConfig1, tfConfig2 map[string]cty.Value, optio
require.NoError(t, err)
t.Logf("Pulumi.yaml:\n%s", string(bytes))

pt, err := pulcheck.PulCheck(
t, bridgedProvider(prov, bridgedProviderOpts{enableAccurateBridgePreview: !opts.disableAccurateBridgePreview}), string(bytes))
pt, err := pulcheck.PulCheck(t, prov.ToProviderInfo(), string(bytes))
require.NoError(t, err)
pt.Up(t)

Expand All @@ -134,8 +133,7 @@ func Diff(t T, res pb.Resource, tfConfig1, tfConfig2 map[string]cty.Value, optio
}

type diffOpts struct {
resourceInfo map[string]*info.Schema
disableAccurateBridgePreview bool
resourceInfo map[string]*info.Schema
}

type DiffOption func(*diffOpts)
Expand All @@ -144,8 +142,3 @@ type DiffOption func(*diffOpts)
func DiffProviderInfo(info map[string]*info.Schema) DiffOption {
return func(o *diffOpts) { o.resourceInfo = info }
}

// DisableAccurateBridgePreview disables the accurate bridge preview feature.
func DisableAccurateBridgePreview() DiffOption {
return func(o *diffOpts) { o.disableAccurateBridgePreview = true }
}
25 changes: 0 additions & 25 deletions pkg/pf/tests/internal/cross-tests/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"

crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl"
"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"
)

type T = crosstestsimpl.T
Expand Down Expand Up @@ -57,23 +52,3 @@ func skipUnlessLinux(t T) {
t.Skip("Skipping on non-Linux platforms as our CI does not yet install Terraform CLI required for these tests")
}
}

type bridgedProviderOpts struct {
enableAccurateBridgePreview bool
}

func bridgedProvider(prov *providerbuilder.Provider, opts bridgedProviderOpts) info.Provider {
shimProvider := tfbridge.ShimProvider(prov)

provider := tfbridge0.ProviderInfo{
P: shimProvider,
Name: prov.TypeName,
Version: prov.Version,
MetadataInfo: &tfbridge0.MetadataInfo{},
EnableAccurateBridgePreview: opts.enableAccurateBridgePreview,
}

provider.MustComputeTokens(tokens.SingleModule(prov.TypeName, "index", tokens.MakeStandard(prov.TypeName)))

return provider
}
2 changes: 1 addition & 1 deletion pkg/pf/tests/provider_checkconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ func TestExtraConfig(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

prov.ExtraConfig = map[string]*info.Config{
"extraConf": {
Expand Down
10 changes: 5 additions & 5 deletions pkg/pf/tests/schema_and_program_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestBasic(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down Expand Up @@ -102,7 +102,7 @@ func TestComputedSetNoDiffWhenElementRemoved(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program1 := `
name: test
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -329,7 +329,7 @@ func TestDefaults(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down Expand Up @@ -391,7 +391,7 @@ func TestPlanModifiers(t *testing.T) {
},
})

prov := bridgedProvider(provBuilder)
prov := provBuilder.ToProviderInfo()

program := `
name: test
Expand Down
19 changes: 0 additions & 19 deletions pkg/pf/tests/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
}
Loading