From d0daccb56b8ee7433e2f764bb169808d17ea04d2 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 11 Oct 2024 09:27:52 -0700 Subject: [PATCH] Move ./pf, ./testing and ./x/muxer under ./pkg --- .golangci.yml | 6 +++--- dynamic/info.go | 2 +- dynamic/main.go | 4 ++-- dynamic/provider_test.go | 2 +- go.mod | 4 ++-- {pf => pkg/pf}/Makefile | 0 {pf => pkg/pf}/README.md | 0 {pf => pkg/pf}/internal/check/check_test.go | 2 +- {pf => pkg/pf}/internal/check/checks.go | 2 +- {pf => pkg/pf}/internal/check/not_supported.go | 4 ++-- {pf => pkg/pf}/internal/check/not_supported_test.go | 0 {pf => pkg/pf}/internal/configencoding/provider.go | 2 +- {pf => pkg/pf}/internal/defaults/defaults.go | 0 {pf => pkg/pf}/internal/defaults/defaults_test.go | 0 {pf => pkg/pf}/internal/muxer/muxer.go | 6 +++--- {pf => pkg/pf}/internal/muxer/union.go | 0 {pf => pkg/pf}/internal/muxer/union_test.go | 0 {pf => pkg/pf}/internal/pfutils/attr.go | 0 {pf => pkg/pf}/internal/pfutils/block.go | 0 {pf => pkg/pf}/internal/pfutils/common.go | 2 +- .../pf}/internal/pfutils/convert_rschema_to_proto.go | 0 {pf => pkg/pf}/internal/pfutils/datasources.go | 2 +- {pf => pkg/pf}/internal/pfutils/eq.go | 0 {pf => pkg/pf}/internal/pfutils/proposed_new.go | 2 +- {pf => pkg/pf}/internal/pfutils/proposed_new_test.go | 2 +- {pf => pkg/pf}/internal/pfutils/raw_state.go | 0 {pf => pkg/pf}/internal/pfutils/reflector.go | 0 {pf => pkg/pf}/internal/pfutils/resources.go | 2 +- {pf => pkg/pf}/internal/pfutils/schema.go | 0 {pf => pkg/pf}/internal/pfutils/value_builder.go | 0 {pf => pkg/pf}/internal/pfutils/value_to_json.go | 0 {pf => pkg/pf}/internal/plugin/package.go | 0 {pf => pkg/pf}/internal/plugin/provider_context.go | 0 {pf => pkg/pf}/internal/plugin/provider_server.go | 0 {pf => pkg/pf}/internal/runtypes/types.go | 0 {pf => pkg/pf}/internal/schemashim/attr_schema.go | 2 +- {pf => pkg/pf}/internal/schemashim/block_schema.go | 2 +- {pf => pkg/pf}/internal/schemashim/convert_type.go | 0 .../pf}/internal/schemashim/custom_object_type_test.go | 0 {pf => pkg/pf}/internal/schemashim/custom_type_test.go | 2 +- {pf => pkg/pf}/internal/schemashim/datasource.go | 2 +- {pf => pkg/pf}/internal/schemashim/datasource_map.go | 2 +- .../pf}/internal/schemashim/object_pseudoresource.go | 2 +- {pf => pkg/pf}/internal/schemashim/object_type_test.go | 2 +- {pf => pkg/pf}/internal/schemashim/provider.go | 6 +++--- {pf => pkg/pf}/internal/schemashim/resource.go | 2 +- {pf => pkg/pf}/internal/schemashim/resource_map.go | 2 +- {pf => pkg/pf}/internal/schemashim/schema_map.go | 2 +- {pf => pkg/pf}/internal/schemashim/schemashim.go | 2 +- {pf => pkg/pf}/internal/schemashim/type_schema.go | 2 +- {pf => pkg/pf}/internal/schemashim/type_schema_test.go | 0 {pf => pkg/pf}/proto/attribute.go | 0 {pf => pkg/pf}/proto/block.go | 0 {pf => pkg/pf}/proto/element.go | 0 {pf => pkg/pf}/proto/empty.go | 0 {pf => pkg/pf}/proto/object.go | 0 {pf => pkg/pf}/proto/protov6.go | 2 +- {pf => pkg/pf}/proto/protov6_test.go | 2 +- {pf => pkg/pf}/proto/resource.go | 0 {pf => pkg/pf}/proto/runtypes.go | 2 +- {pf => pkg/pf}/proto/schema.go | 0 {pf => pkg/pf}/proto/unsupported.go | 0 {pf => pkg/pf}/provider.go | 2 +- {pf => pkg/pf}/tests/.gitignore | 0 {pf => pkg/pf}/tests/.golangci.yml | 0 {pf => pkg/pf}/tests/dynamic_types_test.go | 2 +- {pf => pkg/pf}/tests/extract_inputs_test.go | 4 ++-- {pf => pkg/pf}/tests/genrandom_test.go | 2 +- {pf => pkg/pf}/tests/genupdate_test.go | 2 +- {pf => pkg/pf}/tests/integration/appdash_test.go | 0 {pf => pkg/pf}/tests/integration/attach_test.go | 0 {pf => pkg/pf}/tests/integration/main_test.go | 0 {pf => pkg/pf}/tests/integration/program_test.go | 0 {pf => pkg/pf}/tests/internal/cross-tests/README.md | 0 {pf => pkg/pf}/tests/internal/cross-tests/configure.go | 6 +++--- {pf => pkg/pf}/tests/internal/cross-tests/util.go | 0 {pf => pkg/pf}/tests/internal/pftfcheck/pftf_test.go | 2 +- .../tests/internal/providerbuilder/build_provider.go | 0 .../tests/internal/providerbuilder/build_resource.go | 0 {pf => pkg/pf}/tests/internal/randomshim/go.mod | 0 {pf => pkg/pf}/tests/internal/randomshim/go.sum | 0 {pf => pkg/pf}/tests/internal/randomshim/shim.go | 0 .../pf}/tests/internal/testprovider/assert_provider.go | 2 +- {pf => pkg/pf}/tests/internal/testprovider/aws.go | 0 .../cmd/pulumi-resource-aws/bridge-metadata.json | 0 .../pulumi-resource-muxedrandom/bridge-metadata.json | 0 .../cmd/pulumi-resource-muxedrandom/main.go | 4 ++-- .../cmd/pulumi-resource-muxedrandom/schema.json | 0 .../cmd/pulumi-resource-random/bridge-metadata.json | 0 .../testprovider/cmd/pulumi-resource-random/main.go | 4 ++-- .../cmd/pulumi-resource-random/schema.json | 0 .../pulumi-resource-testbridge/bridge-metadata.json | 0 .../cmd/pulumi-resource-testbridge/main.go | 4 ++-- .../cmd/pulumi-resource-testbridge/schema.json | 0 .../cmd/pulumi-resource-tls/bridge-metadata.json | 0 .../testprovider/cmd/pulumi-resource-tls/main.go | 4 ++-- .../testprovider/cmd/pulumi-resource-tls/schema.json | 0 .../testprovider/cmd/pulumi-tfgen-muxedrandom/main.go | 4 ++-- .../testprovider/cmd/pulumi-tfgen-random/main.go | 4 ++-- .../testprovider/cmd/pulumi-tfgen-testbridge/main.go | 4 ++-- .../internal/testprovider/cmd/pulumi-tfgen-tls/main.go | 4 ++-- .../internal/testprovider/config_test_provider.go | 0 .../pf}/tests/internal/testprovider/plan_modifiers.go | 0 {pf => pkg/pf}/tests/internal/testprovider/random.go | 4 ++-- .../testprovider/sdkv2randomprovider/humannumber.go | 0 .../testprovider/sdkv2randomprovider/provider.go | 0 .../pf}/tests/internal/testprovider/testbridge.go | 2 +- .../testprovider/testbridge_datasource_echo.go | 0 .../testprovider/testbridge_datasource_smac.go | 0 .../testbridge_datasource_test_defaultinfo.go | 0 .../tests/internal/testprovider/testbridge_models.go | 0 .../testprovider/testbridge_resouce_testconfigres.go | 0 .../testprovider/testbridge_resource_autoname.go | 0 .../testprovider/testbridge_resource_int_id.go | 0 .../testprovider/testbridge_resource_privst.go | 0 .../testprovider/testbridge_resource_testcompres.go | 0 .../testbridge_resource_testdefaultinfores.go | 0 .../testprovider/testbridge_resource_testnest.go | 0 .../testprovider/testbridge_resource_testnestattr.go | 0 .../testprovider/testbridge_resource_testres.go | 0 .../testprovider/testbridge_resource_vlan_names.go | 0 {pf => pkg/pf}/tests/internal/testprovider/tls.go | 2 +- .../pf}/tests/internal/testprovider/tuple_type.go | 2 +- {pf => pkg/pf}/tests/internal/tlsshim/go.mod | 0 {pf => pkg/pf}/tests/internal/tlsshim/go.sum | 0 {pf => pkg/pf}/tests/internal/tlsshim/shim.go | 0 {pf => pkg/pf}/tests/main_test.go | 0 {pf => pkg/pf}/tests/muxwith_test.go | 2 +- {pf => pkg/pf}/tests/nested_attr_test.go | 6 +++--- {pf => pkg/pf}/tests/prestateupgradehook_test.go | 2 +- {pf => pkg/pf}/tests/provider_check_test.go | 8 ++++---- {pf => pkg/pf}/tests/provider_checkconfig_test.go | 4 ++-- {pf => pkg/pf}/tests/provider_configure_test.go | 6 +++--- {pf => pkg/pf}/tests/provider_create_test.go | 2 +- {pf => pkg/pf}/tests/provider_diff_test.go | 2 +- {pf => pkg/pf}/tests/provider_get_mapping_test.go | 4 ++-- {pf => pkg/pf}/tests/provider_init_benchmark_test.go | 4 ++-- {pf => pkg/pf}/tests/provider_invoke_test.go | 2 +- .../pf}/tests/provider_nested_custom_types_test.go | 6 +++--- {pf => pkg/pf}/tests/provider_read_test.go | 6 +++--- .../pf}/tests/provider_transform_outputs_test.go | 2 +- {pf => pkg/pf}/tests/provider_update_test.go | 2 +- {pf => pkg/pf}/tests/pulumi_test.go | 2 +- {pf => pkg/pf}/tests/schema_and_program_test.go | 4 ++-- {pf => pkg/pf}/tests/schema_test.go | 2 +- {pf => pkg/pf}/tests/schemas.go | 4 ++-- {pf => pkg/pf}/tests/schemashim_test.go | 4 ++-- .../pf}/tests/testdata/autoname-program/Pulumi.yaml | 0 {pf => pkg/pf}/tests/testdata/basicprogram/Pulumi.yaml | 0 .../pf}/tests/testdata/defaultinfo-program/Pulumi.yaml | 0 .../testdata/genrandom/random-delete-preview.json | 0 .../tests/testdata/genrandom/random-delete-update.json | 0 .../tests/testdata/genrandom/random-empty-preview.json | 0 .../tests/testdata/genrandom/random-empty-update.json | 0 .../testdata/genrandom/random-initial-preview.json | 0 .../testdata/genrandom/random-initial-update.json | 0 .../testdata/genrandom/random-replace-preview.json | 0 .../testdata/genrandom/random-replace-update.json | 0 .../pf}/tests/testdata/muxedbasicprogram/Pulumi.yaml | 0 .../pf}/tests/testdata/privst-program/Pulumi.yaml | 0 .../tests/testdata/privst-program/edit-1/Pulumi.yaml | 0 .../pf}/tests/testdata/resource-without-id/Pulumi.yaml | 0 {pf => pkg/pf}/tests/testdata/smac-program/Pulumi.yaml | 0 .../pf}/tests/testdata/updateprogram-2/Pulumi.yaml | 0 .../pf}/tests/testdata/updateprogram-3/Pulumi.yaml | 0 .../pf}/tests/testdata/updateprogram-4/Pulumi.yaml | 0 {pf => pkg/pf}/tests/testdata/updateprogram.json | 0 .../pf}/tests/testdata/updateprogram/Pulumi.yaml | 0 {pf => pkg/pf}/tests/testdatagen/genrandom/Pulumi.yaml | 0 {pf => pkg/pf}/tests/testdatagen/genrandom/generate.sh | 0 {pf => pkg/pf}/tests/testdatagen/genrandom/go.mod | 0 {pf => pkg/pf}/tests/testdatagen/genrandom/go.sum | 0 {pf => pkg/pf}/tests/testdatagen/genrandom/main.go | 0 {pf => pkg/pf}/tests/tfgen_test.go | 6 +++--- {pf => pkg/pf}/tests/util.go | 4 ++-- {pf => pkg/pf}/tfbridge/detect_check_failures.go | 0 {pf => pkg/pf}/tfbridge/detect_check_failures_test.go | 0 {pf => pkg/pf}/tfbridge/dynamic_value.go | 0 {pf => pkg/pf}/tfbridge/extend.go | 4 ++-- {pf => pkg/pf}/tfbridge/ids.go | 0 {pf => pkg/pf}/tfbridge/logging.go | 0 {pf => pkg/pf}/tfbridge/main.go | 6 +++--- {pf => pkg/pf}/tfbridge/metadata.go | 0 {pf => pkg/pf}/tfbridge/naming.go | 0 {pf => pkg/pf}/tfbridge/package.go | 0 {pf => pkg/pf}/tfbridge/provider.go | 10 +++++----- {pf => pkg/pf}/tfbridge/provider_attach.go | 0 {pf => pkg/pf}/tfbridge/provider_check.go | 2 +- {pf => pkg/pf}/tfbridge/provider_checkconfig.go | 2 +- {pf => pkg/pf}/tfbridge/provider_configure.go | 0 {pf => pkg/pf}/tfbridge/provider_create.go | 0 {pf => pkg/pf}/tfbridge/provider_datasources.go | 2 +- {pf => pkg/pf}/tfbridge/provider_delete.go | 0 {pf => pkg/pf}/tfbridge/provider_diagnostics.go | 0 {pf => pkg/pf}/tfbridge/provider_diff.go | 0 {pf => pkg/pf}/tfbridge/provider_diff_test.go | 0 {pf => pkg/pf}/tfbridge/provider_diffconfig.go | 0 {pf => pkg/pf}/tfbridge/provider_get_mapping.go | 0 {pf => pkg/pf}/tfbridge/provider_info_test.go | 0 {pf => pkg/pf}/tfbridge/provider_invoke.go | 2 +- {pf => pkg/pf}/tfbridge/provider_mux.go | 0 {pf => pkg/pf}/tfbridge/provider_plan.go | 4 ++-- {pf => pkg/pf}/tfbridge/provider_read.go | 0 {pf => pkg/pf}/tfbridge/provider_read_test.go | 0 {pf => pkg/pf}/tfbridge/provider_resources.go | 2 +- {pf => pkg/pf}/tfbridge/provider_streaminvoke.go | 0 {pf => pkg/pf}/tfbridge/provider_test.go | 0 {pf => pkg/pf}/tfbridge/provider_update.go | 0 .../pf}/tfbridge/provider_upgrade_resource_state.go | 2 +- {pf => pkg/pf}/tfbridge/resource_state.go | 0 {pf => pkg/pf}/tfbridge/resource_state_test.go | 0 {pf => pkg/pf}/tfbridge/serve.go | 0 {pf => pkg/pf}/tfgen/gen.go | 4 ++-- {pf => pkg/pf}/tfgen/main.go | 4 ++-- {pf => pkg/pf}/tfgen/package.go | 0 .../testdata/TestTypeOverride/attr-list-element.golden | 0 .../TestTypeOverride/attr-list-max-items-one.golden | 0 .../attr-list-nested-object-object.golden | 0 .../testdata/TestTypeOverride/attr-map-element.golden | 0 .../TestTypeOverride/attr-map-object-element.golden | 0 .../testdata/TestTypeOverride/attr-set-element.golden | 0 .../attr-single-nested-object-element.golden | 0 .../TestTypeOverride/attr-single-nested-object.golden | 0 .../tfgen/testdata/TestTypeOverride/no-override.golden | 0 {pf => pkg/pf}/tfgen/tfgen_test.go | 2 +- pkg/tfbridge/provider.go | 2 +- pkg/tfgen/generate_schema.go | 2 +- pkg/tfgen/generate_schema_test.go | 2 +- {x => pkg/x}/muxer/main.go | 0 {x => pkg/x}/muxer/mapping.go | 0 {x => pkg/x}/muxer/mapping_test.go | 0 {x => pkg/x}/muxer/muxer.go | 0 {x => pkg/x}/muxer/muxer_test.go | 0 {x => pkg/x}/muxer/tests/muxer_test.go | 2 +- {testing/x => pkg/x/testing}/json_match.go | 0 {testing/x => pkg/x/testing}/json_match_test.go | 0 {testing/x => pkg/x/testing}/package.go | 0 {testing/x => pkg/x/testing}/replay.go | 0 238 files changed, 141 insertions(+), 141 deletions(-) rename {pf => pkg/pf}/Makefile (100%) rename {pf => pkg/pf}/README.md (100%) rename {pf => pkg/pf}/internal/check/check_test.go (99%) rename {pf => pkg/pf}/internal/check/checks.go (98%) rename {pf => pkg/pf}/internal/check/not_supported.go (97%) rename {pf => pkg/pf}/internal/check/not_supported_test.go (100%) rename {pf => pkg/pf}/internal/configencoding/provider.go (97%) rename {pf => pkg/pf}/internal/defaults/defaults.go (100%) rename {pf => pkg/pf}/internal/defaults/defaults_test.go (100%) rename {pf => pkg/pf}/internal/muxer/muxer.go (97%) rename {pf => pkg/pf}/internal/muxer/union.go (100%) rename {pf => pkg/pf}/internal/muxer/union_test.go (100%) rename {pf => pkg/pf}/internal/pfutils/attr.go (100%) rename {pf => pkg/pf}/internal/pfutils/block.go (100%) rename {pf => pkg/pf}/internal/pfutils/common.go (96%) rename {pf => pkg/pf}/internal/pfutils/convert_rschema_to_proto.go (100%) rename {pf => pkg/pf}/internal/pfutils/datasources.go (96%) rename {pf => pkg/pf}/internal/pfutils/eq.go (100%) rename {pf => pkg/pf}/internal/pfutils/proposed_new.go (97%) rename {pf => pkg/pf}/internal/pfutils/proposed_new_test.go (99%) rename {pf => pkg/pf}/internal/pfutils/raw_state.go (100%) rename {pf => pkg/pf}/internal/pfutils/reflector.go (100%) rename {pf => pkg/pf}/internal/pfutils/resources.go (96%) rename {pf => pkg/pf}/internal/pfutils/schema.go (100%) rename {pf => pkg/pf}/internal/pfutils/value_builder.go (100%) rename {pf => pkg/pf}/internal/pfutils/value_to_json.go (100%) rename {pf => pkg/pf}/internal/plugin/package.go (100%) rename {pf => pkg/pf}/internal/plugin/provider_context.go (100%) rename {pf => pkg/pf}/internal/plugin/provider_server.go (100%) rename {pf => pkg/pf}/internal/runtypes/types.go (100%) rename {pf => pkg/pf}/internal/schemashim/attr_schema.go (98%) rename {pf => pkg/pf}/internal/schemashim/block_schema.go (98%) rename {pf => pkg/pf}/internal/schemashim/convert_type.go (100%) rename {pf => pkg/pf}/internal/schemashim/custom_object_type_test.go (100%) rename {pf => pkg/pf}/internal/schemashim/custom_type_test.go (98%) rename {pf => pkg/pf}/internal/schemashim/datasource.go (96%) rename {pf => pkg/pf}/internal/schemashim/datasource_map.go (95%) rename {pf => pkg/pf}/internal/schemashim/object_pseudoresource.go (99%) rename {pf => pkg/pf}/internal/schemashim/object_type_test.go (99%) rename {pf => pkg/pf}/internal/schemashim/provider.go (96%) rename {pf => pkg/pf}/internal/schemashim/resource.go (96%) rename {pf => pkg/pf}/internal/schemashim/resource_map.go (93%) rename {pf => pkg/pf}/internal/schemashim/schema_map.go (96%) rename {pf => pkg/pf}/internal/schemashim/schemashim.go (94%) rename {pf => pkg/pf}/internal/schemashim/type_schema.go (98%) rename {pf => pkg/pf}/internal/schemashim/type_schema_test.go (100%) rename {pf => pkg/pf}/proto/attribute.go (100%) rename {pf => pkg/pf}/proto/block.go (100%) rename {pf => pkg/pf}/proto/element.go (100%) rename {pf => pkg/pf}/proto/empty.go (100%) rename {pf => pkg/pf}/proto/object.go (100%) rename {pf => pkg/pf}/proto/protov6.go (98%) rename {pf => pkg/pf}/proto/protov6_test.go (98%) rename {pf => pkg/pf}/proto/resource.go (100%) rename {pf => pkg/pf}/proto/runtypes.go (97%) rename {pf => pkg/pf}/proto/schema.go (100%) rename {pf => pkg/pf}/proto/unsupported.go (100%) rename {pf => pkg/pf}/provider.go (94%) rename {pf => pkg/pf}/tests/.gitignore (100%) rename {pf => pkg/pf}/tests/.golangci.yml (100%) rename {pf => pkg/pf}/tests/dynamic_types_test.go (99%) rename {pf => pkg/pf}/tests/extract_inputs_test.go (99%) rename {pf => pkg/pf}/tests/genrandom_test.go (95%) rename {pf => pkg/pf}/tests/genupdate_test.go (93%) rename {pf => pkg/pf}/tests/integration/appdash_test.go (100%) rename {pf => pkg/pf}/tests/integration/attach_test.go (100%) rename {pf => pkg/pf}/tests/integration/main_test.go (100%) rename {pf => pkg/pf}/tests/integration/program_test.go (100%) rename {pf => pkg/pf}/tests/internal/cross-tests/README.md (100%) rename {pf => pkg/pf}/tests/internal/cross-tests/configure.go (97%) rename {pf => pkg/pf}/tests/internal/cross-tests/util.go (100%) rename {pf => pkg/pf}/tests/internal/pftfcheck/pftf_test.go (95%) rename {pf => pkg/pf}/tests/internal/providerbuilder/build_provider.go (100%) rename {pf => pkg/pf}/tests/internal/providerbuilder/build_resource.go (100%) rename {pf => pkg/pf}/tests/internal/randomshim/go.mod (100%) rename {pf => pkg/pf}/tests/internal/randomshim/go.sum (100%) rename {pf => pkg/pf}/tests/internal/randomshim/shim.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/assert_provider.go (98%) rename {pf => pkg/pf}/tests/internal/testprovider/aws.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-aws/bridge-metadata.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/bridge-metadata.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go (86%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-random/bridge-metadata.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-random/main.go (86%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-testbridge/bridge-metadata.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go (87%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-tls/bridge-metadata.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go (86%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json (100%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go (85%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go (85%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go (85%) rename {pf => pkg/pf}/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go (82%) rename {pf => pkg/pf}/tests/internal/testprovider/config_test_provider.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/plan_modifiers.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/random.go (97%) rename {pf => pkg/pf}/tests/internal/testprovider/sdkv2randomprovider/humannumber.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/sdkv2randomprovider/provider.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge.go (99%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_datasource_echo.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_datasource_smac.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_datasource_test_defaultinfo.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_models.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resouce_testconfigres.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_autoname.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_int_id.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_privst.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_testcompres.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_testdefaultinfores.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_testnest.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_testnestattr.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_testres.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/testbridge_resource_vlan_names.go (100%) rename {pf => pkg/pf}/tests/internal/testprovider/tls.go (98%) rename {pf => pkg/pf}/tests/internal/testprovider/tuple_type.go (98%) rename {pf => pkg/pf}/tests/internal/tlsshim/go.mod (100%) rename {pf => pkg/pf}/tests/internal/tlsshim/go.sum (100%) rename {pf => pkg/pf}/tests/internal/tlsshim/shim.go (100%) rename {pf => pkg/pf}/tests/main_test.go (100%) rename {pf => pkg/pf}/tests/muxwith_test.go (95%) rename {pf => pkg/pf}/tests/nested_attr_test.go (85%) rename {pf => pkg/pf}/tests/prestateupgradehook_test.go (96%) rename {pf => pkg/pf}/tests/provider_check_test.go (96%) rename {pf => pkg/pf}/tests/provider_checkconfig_test.go (99%) rename {pf => pkg/pf}/tests/provider_configure_test.go (97%) rename {pf => pkg/pf}/tests/provider_create_test.go (98%) rename {pf => pkg/pf}/tests/provider_diff_test.go (99%) rename {pf => pkg/pf}/tests/provider_get_mapping_test.go (96%) rename {pf => pkg/pf}/tests/provider_init_benchmark_test.go (88%) rename {pf => pkg/pf}/tests/provider_invoke_test.go (98%) rename {pf => pkg/pf}/tests/provider_nested_custom_types_test.go (97%) rename {pf => pkg/pf}/tests/provider_read_test.go (98%) rename {pf => pkg/pf}/tests/provider_transform_outputs_test.go (98%) rename {pf => pkg/pf}/tests/provider_update_test.go (96%) rename {pf => pkg/pf}/tests/pulumi_test.go (97%) rename {pf => pkg/pf}/tests/schema_and_program_test.go (98%) rename {pf => pkg/pf}/tests/schema_test.go (98%) rename {pf => pkg/pf}/tests/schemas.go (93%) rename {pf => pkg/pf}/tests/schemashim_test.go (99%) rename {pf => pkg/pf}/tests/testdata/autoname-program/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/basicprogram/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/defaultinfo-program/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-delete-preview.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-delete-update.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-empty-preview.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-empty-update.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-initial-preview.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-initial-update.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-replace-preview.json (100%) rename {pf => pkg/pf}/tests/testdata/genrandom/random-replace-update.json (100%) rename {pf => pkg/pf}/tests/testdata/muxedbasicprogram/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/privst-program/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/privst-program/edit-1/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/resource-without-id/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/smac-program/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/updateprogram-2/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/updateprogram-3/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/updateprogram-4/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdata/updateprogram.json (100%) rename {pf => pkg/pf}/tests/testdata/updateprogram/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdatagen/genrandom/Pulumi.yaml (100%) rename {pf => pkg/pf}/tests/testdatagen/genrandom/generate.sh (100%) rename {pf => pkg/pf}/tests/testdatagen/genrandom/go.mod (100%) rename {pf => pkg/pf}/tests/testdatagen/genrandom/go.sum (100%) rename {pf => pkg/pf}/tests/testdatagen/genrandom/main.go (100%) rename {pf => pkg/pf}/tests/tfgen_test.go (89%) rename {pf => pkg/pf}/tests/util.go (96%) rename {pf => pkg/pf}/tfbridge/detect_check_failures.go (100%) rename {pf => pkg/pf}/tfbridge/detect_check_failures_test.go (100%) rename {pf => pkg/pf}/tfbridge/dynamic_value.go (100%) rename {pf => pkg/pf}/tfbridge/extend.go (92%) rename {pf => pkg/pf}/tfbridge/ids.go (100%) rename {pf => pkg/pf}/tfbridge/logging.go (100%) rename {pf => pkg/pf}/tfbridge/main.go (96%) rename {pf => pkg/pf}/tfbridge/metadata.go (100%) rename {pf => pkg/pf}/tfbridge/naming.go (100%) rename {pf => pkg/pf}/tfbridge/package.go (100%) rename {pf => pkg/pf}/tfbridge/provider.go (96%) rename {pf => pkg/pf}/tfbridge/provider_attach.go (100%) rename {pf => pkg/pf}/tfbridge/provider_check.go (98%) rename {pf => pkg/pf}/tfbridge/provider_checkconfig.go (99%) rename {pf => pkg/pf}/tfbridge/provider_configure.go (100%) rename {pf => pkg/pf}/tfbridge/provider_create.go (100%) rename {pf => pkg/pf}/tfbridge/provider_datasources.go (96%) rename {pf => pkg/pf}/tfbridge/provider_delete.go (100%) rename {pf => pkg/pf}/tfbridge/provider_diagnostics.go (100%) rename {pf => pkg/pf}/tfbridge/provider_diff.go (100%) rename {pf => pkg/pf}/tfbridge/provider_diff_test.go (100%) rename {pf => pkg/pf}/tfbridge/provider_diffconfig.go (100%) rename {pf => pkg/pf}/tfbridge/provider_get_mapping.go (100%) rename {pf => pkg/pf}/tfbridge/provider_info_test.go (100%) rename {pf => pkg/pf}/tfbridge/provider_invoke.go (98%) rename {pf => pkg/pf}/tfbridge/provider_mux.go (100%) rename {pf => pkg/pf}/tfbridge/provider_plan.go (94%) rename {pf => pkg/pf}/tfbridge/provider_read.go (100%) rename {pf => pkg/pf}/tfbridge/provider_read_test.go (100%) rename {pf => pkg/pf}/tfbridge/provider_resources.go (97%) rename {pf => pkg/pf}/tfbridge/provider_streaminvoke.go (100%) rename {pf => pkg/pf}/tfbridge/provider_test.go (100%) rename {pf => pkg/pf}/tfbridge/provider_update.go (100%) rename {pf => pkg/pf}/tfbridge/provider_upgrade_resource_state.go (96%) rename {pf => pkg/pf}/tfbridge/resource_state.go (100%) rename {pf => pkg/pf}/tfbridge/resource_state_test.go (100%) rename {pf => pkg/pf}/tfbridge/serve.go (100%) rename {pf => pkg/pf}/tfgen/gen.go (94%) rename {pf => pkg/pf}/tfgen/main.go (96%) rename {pf => pkg/pf}/tfgen/package.go (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-list-element.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-map-element.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-set-element.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden (100%) rename {pf => pkg/pf}/tfgen/testdata/TestTypeOverride/no-override.golden (100%) rename {pf => pkg/pf}/tfgen/tfgen_test.go (99%) rename {x => pkg/x}/muxer/main.go (100%) rename {x => pkg/x}/muxer/mapping.go (100%) rename {x => pkg/x}/muxer/mapping_test.go (100%) rename {x => pkg/x}/muxer/muxer.go (100%) rename {x => pkg/x}/muxer/muxer_test.go (100%) rename {x => pkg/x}/muxer/tests/muxer_test.go (99%) rename {testing/x => pkg/x/testing}/json_match.go (100%) rename {testing/x => pkg/x/testing}/json_match_test.go (100%) rename {testing/x => pkg/x/testing}/package.go (100%) rename {testing/x => pkg/x/testing}/replay.go (100%) diff --git a/.golangci.yml b/.golangci.yml index 6784bbd47..973b8a5cb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -30,10 +30,10 @@ issues: - pkg/tf2pulumi/internal/configs - pkg/vendored # TODO(https://github.com/pulumi/pulumi-terraform-bridge/issues/2474) - - pf/tests + - pkg/pf/tests - pkg/tests - - testing - - x/muxer/tests + - pkg/x/testing + - pkg/x/muxer/tests linters-settings: gci: sections: diff --git a/dynamic/info.go b/dynamic/info.go index fad88749f..4bc7f9800 100644 --- a/dynamic/info.go +++ b/dynamic/info.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/fixup" "github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize" "github.com/pulumi/pulumi-terraform-bridge/dynamic/version" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/proto" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" diff --git a/dynamic/main.go b/dynamic/main.go index 2ea100f65..78efd43bc 100644 --- a/dynamic/main.go +++ b/dynamic/main.go @@ -30,8 +30,8 @@ import ( "github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize" "github.com/pulumi/pulumi-terraform-bridge/dynamic/version" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/proto" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "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/tfgen" diff --git a/dynamic/provider_test.go b/dynamic/provider_test.go index bf1b229bd..d70ca16a3 100644 --- a/dynamic/provider_test.go +++ b/dynamic/provider_test.go @@ -25,7 +25,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" helper "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/testing" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) // globalTempDir is a temporary directory scoped to the entire test cycle. diff --git a/go.mod b/go.mod index d398e70f0..f1e6acff0 100644 --- a/go.mod +++ b/go.mod @@ -263,6 +263,6 @@ replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraf replace github.com/hashicorp/terraform-provider-tls => github.com/hashicorp/terraform-provider-tls v1.2.1-0.20230117062332-afdd54107aba -replace github.com/hashicorp/terraform-provider-tls/shim => ./pf/tests/internal/tlsshim +replace github.com/hashicorp/terraform-provider-tls/shim => ./pkg/pf/tests/internal/tlsshim -replace github.com/terraform-providers/terraform-provider-random/randomshim => ./pf/tests/internal/randomshim +replace github.com/terraform-providers/terraform-provider-random/randomshim => ./pkg/pf/tests/internal/randomshim diff --git a/pf/Makefile b/pkg/pf/Makefile similarity index 100% rename from pf/Makefile rename to pkg/pf/Makefile diff --git a/pf/README.md b/pkg/pf/README.md similarity index 100% rename from pf/README.md rename to pkg/pf/README.md diff --git a/pf/internal/check/check_test.go b/pkg/pf/internal/check/check_test.go similarity index 99% rename from pf/internal/check/check_test.go rename to pkg/pf/internal/check/check_test.go index aa88f013a..548400a92 100644 --- a/pf/internal/check/check_test.go +++ b/pkg/pf/internal/check/check_test.go @@ -30,7 +30,7 @@ import ( property "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/assert" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" diff --git a/pf/internal/check/checks.go b/pkg/pf/internal/check/checks.go similarity index 98% rename from pf/internal/check/checks.go rename to pkg/pf/internal/check/checks.go index 23d8afb18..6b8673d08 100644 --- a/pf/internal/check/checks.go +++ b/pkg/pf/internal/check/checks.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/diag" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/check/not_supported.go b/pkg/pf/internal/check/not_supported.go similarity index 97% rename from pf/internal/check/not_supported.go rename to pkg/pf/internal/check/not_supported.go index a4cfb1c01..50b9d30bb 100644 --- a/pf/internal/check/not_supported.go +++ b/pkg/pf/internal/check/not_supported.go @@ -21,8 +21,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/internal/check/not_supported_test.go b/pkg/pf/internal/check/not_supported_test.go similarity index 100% rename from pf/internal/check/not_supported_test.go rename to pkg/pf/internal/check/not_supported_test.go diff --git a/pf/internal/configencoding/provider.go b/pkg/pf/internal/configencoding/provider.go similarity index 97% rename from pf/internal/configencoding/provider.go rename to pkg/pf/internal/configencoding/provider.go index cc5ee7d3f..c62138c4f 100644 --- a/pf/internal/configencoding/provider.go +++ b/pkg/pf/internal/configencoding/provider.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin" - pl "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/plugin" + pl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/plugin" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/internal/defaults/defaults.go b/pkg/pf/internal/defaults/defaults.go similarity index 100% rename from pf/internal/defaults/defaults.go rename to pkg/pf/internal/defaults/defaults.go diff --git a/pf/internal/defaults/defaults_test.go b/pkg/pf/internal/defaults/defaults_test.go similarity index 100% rename from pf/internal/defaults/defaults_test.go rename to pkg/pf/internal/defaults/defaults_test.go diff --git a/pf/internal/muxer/muxer.go b/pkg/pf/internal/muxer/muxer.go similarity index 97% rename from pf/internal/muxer/muxer.go rename to pkg/pf/internal/muxer/muxer.go index 45ddb6ff9..a871526c6 100644 --- a/pf/internal/muxer/muxer.go +++ b/pkg/pf/internal/muxer/muxer.go @@ -24,11 +24,11 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/schemashim" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/schemashim" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" ) func SchemaOnlyPluginFrameworkProvider(ctx context.Context, provider provider.Provider) shim.Provider { diff --git a/pf/internal/muxer/union.go b/pkg/pf/internal/muxer/union.go similarity index 100% rename from pf/internal/muxer/union.go rename to pkg/pf/internal/muxer/union.go diff --git a/pf/internal/muxer/union_test.go b/pkg/pf/internal/muxer/union_test.go similarity index 100% rename from pf/internal/muxer/union_test.go rename to pkg/pf/internal/muxer/union_test.go diff --git a/pf/internal/pfutils/attr.go b/pkg/pf/internal/pfutils/attr.go similarity index 100% rename from pf/internal/pfutils/attr.go rename to pkg/pf/internal/pfutils/attr.go diff --git a/pf/internal/pfutils/block.go b/pkg/pf/internal/pfutils/block.go similarity index 100% rename from pf/internal/pfutils/block.go rename to pkg/pf/internal/pfutils/block.go diff --git a/pf/internal/pfutils/common.go b/pkg/pf/internal/pfutils/common.go similarity index 96% rename from pf/internal/pfutils/common.go rename to pkg/pf/internal/pfutils/common.go index 03637f5ec..b37cebfd6 100644 --- a/pf/internal/pfutils/common.go +++ b/pkg/pf/internal/pfutils/common.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/provider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" ) func queryProviderMetadata(ctx context.Context, prov provider.Provider) *provider.MetadataResponse { diff --git a/pf/internal/pfutils/convert_rschema_to_proto.go b/pkg/pf/internal/pfutils/convert_rschema_to_proto.go similarity index 100% rename from pf/internal/pfutils/convert_rschema_to_proto.go rename to pkg/pf/internal/pfutils/convert_rschema_to_proto.go diff --git a/pf/internal/pfutils/datasources.go b/pkg/pf/internal/pfutils/datasources.go similarity index 96% rename from pf/internal/pfutils/datasources.go rename to pkg/pf/internal/pfutils/datasources.go index 081c5ca90..26280123f 100644 --- a/pf/internal/pfutils/datasources.go +++ b/pkg/pf/internal/pfutils/datasources.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/provider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/pfutils/eq.go b/pkg/pf/internal/pfutils/eq.go similarity index 100% rename from pf/internal/pfutils/eq.go rename to pkg/pf/internal/pfutils/eq.go diff --git a/pf/internal/pfutils/proposed_new.go b/pkg/pf/internal/pfutils/proposed_new.go similarity index 97% rename from pf/internal/pfutils/proposed_new.go rename to pkg/pf/internal/pfutils/proposed_new.go index fa6beb0e7..4b7d28a7f 100644 --- a/pf/internal/pfutils/proposed_new.go +++ b/pkg/pf/internal/pfutils/proposed_new.go @@ -24,7 +24,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" ctymsgpack "github.com/zclconf/go-cty/cty/msgpack" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/opentofu/configs/configschema" opentofuconvert "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/opentofu/convert" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/opentofu/plans/objchange" diff --git a/pf/internal/pfutils/proposed_new_test.go b/pkg/pf/internal/pfutils/proposed_new_test.go similarity index 99% rename from pf/internal/pfutils/proposed_new_test.go rename to pkg/pf/internal/pfutils/proposed_new_test.go index 91c86444b..e5d6ffba1 100644 --- a/pf/internal/pfutils/proposed_new_test.go +++ b/pkg/pf/internal/pfutils/proposed_new_test.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/pfutils/raw_state.go b/pkg/pf/internal/pfutils/raw_state.go similarity index 100% rename from pf/internal/pfutils/raw_state.go rename to pkg/pf/internal/pfutils/raw_state.go diff --git a/pf/internal/pfutils/reflector.go b/pkg/pf/internal/pfutils/reflector.go similarity index 100% rename from pf/internal/pfutils/reflector.go rename to pkg/pf/internal/pfutils/reflector.go diff --git a/pf/internal/pfutils/resources.go b/pkg/pf/internal/pfutils/resources.go similarity index 96% rename from pf/internal/pfutils/resources.go rename to pkg/pf/internal/pfutils/resources.go index 2b7a25da3..da71c3519 100644 --- a/pf/internal/pfutils/resources.go +++ b/pkg/pf/internal/pfutils/resources.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/provider" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/pfutils/schema.go b/pkg/pf/internal/pfutils/schema.go similarity index 100% rename from pf/internal/pfutils/schema.go rename to pkg/pf/internal/pfutils/schema.go diff --git a/pf/internal/pfutils/value_builder.go b/pkg/pf/internal/pfutils/value_builder.go similarity index 100% rename from pf/internal/pfutils/value_builder.go rename to pkg/pf/internal/pfutils/value_builder.go diff --git a/pf/internal/pfutils/value_to_json.go b/pkg/pf/internal/pfutils/value_to_json.go similarity index 100% rename from pf/internal/pfutils/value_to_json.go rename to pkg/pf/internal/pfutils/value_to_json.go diff --git a/pf/internal/plugin/package.go b/pkg/pf/internal/plugin/package.go similarity index 100% rename from pf/internal/plugin/package.go rename to pkg/pf/internal/plugin/package.go diff --git a/pf/internal/plugin/provider_context.go b/pkg/pf/internal/plugin/provider_context.go similarity index 100% rename from pf/internal/plugin/provider_context.go rename to pkg/pf/internal/plugin/provider_context.go diff --git a/pf/internal/plugin/provider_server.go b/pkg/pf/internal/plugin/provider_server.go similarity index 100% rename from pf/internal/plugin/provider_server.go rename to pkg/pf/internal/plugin/provider_server.go diff --git a/pf/internal/runtypes/types.go b/pkg/pf/internal/runtypes/types.go similarity index 100% rename from pf/internal/runtypes/types.go rename to pkg/pf/internal/runtypes/types.go diff --git a/pf/internal/schemashim/attr_schema.go b/pkg/pf/internal/schemashim/attr_schema.go similarity index 98% rename from pf/internal/schemashim/attr_schema.go rename to pkg/pf/internal/schemashim/attr_schema.go index 9691ae021..ca066a9ab 100644 --- a/pf/internal/schemashim/attr_schema.go +++ b/pkg/pf/internal/schemashim/attr_schema.go @@ -18,7 +18,7 @@ import ( pfattr "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" bridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/block_schema.go b/pkg/pf/internal/schemashim/block_schema.go similarity index 98% rename from pf/internal/schemashim/block_schema.go rename to pkg/pf/internal/schemashim/block_schema.go index 175f6e86f..870d882f2 100644 --- a/pf/internal/schemashim/block_schema.go +++ b/pkg/pf/internal/schemashim/block_schema.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" bridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/convert_type.go b/pkg/pf/internal/schemashim/convert_type.go similarity index 100% rename from pf/internal/schemashim/convert_type.go rename to pkg/pf/internal/schemashim/convert_type.go diff --git a/pf/internal/schemashim/custom_object_type_test.go b/pkg/pf/internal/schemashim/custom_object_type_test.go similarity index 100% rename from pf/internal/schemashim/custom_object_type_test.go rename to pkg/pf/internal/schemashim/custom_object_type_test.go diff --git a/pf/internal/schemashim/custom_type_test.go b/pkg/pf/internal/schemashim/custom_type_test.go similarity index 98% rename from pf/internal/schemashim/custom_type_test.go rename to pkg/pf/internal/schemashim/custom_type_test.go index 13651174e..8fba88c04 100644 --- a/pf/internal/schemashim/custom_type_test.go +++ b/pkg/pf/internal/schemashim/custom_type_test.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/stretchr/testify/assert" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/datasource.go b/pkg/pf/internal/schemashim/datasource.go similarity index 96% rename from pf/internal/schemashim/datasource.go rename to pkg/pf/internal/schemashim/datasource.go index 03326ac06..c24645367 100644 --- a/pf/internal/schemashim/datasource.go +++ b/pkg/pf/internal/schemashim/datasource.go @@ -15,7 +15,7 @@ package schemashim import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/datasource_map.go b/pkg/pf/internal/schemashim/datasource_map.go similarity index 95% rename from pf/internal/schemashim/datasource_map.go rename to pkg/pf/internal/schemashim/datasource_map.go index 13c0599fb..45c529cdf 100644 --- a/pf/internal/schemashim/datasource_map.go +++ b/pkg/pf/internal/schemashim/datasource_map.go @@ -15,7 +15,7 @@ package schemashim import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/object_pseudoresource.go b/pkg/pf/internal/schemashim/object_pseudoresource.go similarity index 99% rename from pf/internal/schemashim/object_pseudoresource.go rename to pkg/pf/internal/schemashim/object_pseudoresource.go index 6f9337495..7456a99b1 100644 --- a/pf/internal/schemashim/object_pseudoresource.go +++ b/pkg/pf/internal/schemashim/object_pseudoresource.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/object_type_test.go b/pkg/pf/internal/schemashim/object_type_test.go similarity index 99% rename from pf/internal/schemashim/object_type_test.go rename to pkg/pf/internal/schemashim/object_type_test.go index 96b8e784e..8f63c1bba 100644 --- a/pf/internal/schemashim/object_type_test.go +++ b/pkg/pf/internal/schemashim/object_type_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/provider.go b/pkg/pf/internal/schemashim/provider.go similarity index 96% rename from pf/internal/schemashim/provider.go rename to pkg/pf/internal/schemashim/provider.go index 37138a29e..7261c1435 100644 --- a/pf/internal/schemashim/provider.go +++ b/pkg/pf/internal/schemashim/provider.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/resource.go b/pkg/pf/internal/schemashim/resource.go similarity index 96% rename from pf/internal/schemashim/resource.go rename to pkg/pf/internal/schemashim/resource.go index be75c2a26..bdb869da0 100644 --- a/pf/internal/schemashim/resource.go +++ b/pkg/pf/internal/schemashim/resource.go @@ -15,7 +15,7 @@ package schemashim import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/resource_map.go b/pkg/pf/internal/schemashim/resource_map.go similarity index 93% rename from pf/internal/schemashim/resource_map.go rename to pkg/pf/internal/schemashim/resource_map.go index 009bf0cd3..5972cb348 100644 --- a/pf/internal/schemashim/resource_map.go +++ b/pkg/pf/internal/schemashim/resource_map.go @@ -15,7 +15,7 @@ package schemashim import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/schema" ) diff --git a/pf/internal/schemashim/schema_map.go b/pkg/pf/internal/schemashim/schema_map.go similarity index 96% rename from pf/internal/schemashim/schema_map.go rename to pkg/pf/internal/schemashim/schema_map.go index 1c7c7b757..63b113ae6 100644 --- a/pf/internal/schemashim/schema_map.go +++ b/pkg/pf/internal/schemashim/schema_map.go @@ -17,7 +17,7 @@ package schemashim import ( "sort" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/schemashim.go b/pkg/pf/internal/schemashim/schemashim.go similarity index 94% rename from pf/internal/schemashim/schemashim.go rename to pkg/pf/internal/schemashim/schemashim.go index 38d214a45..c3f0ca9ca 100644 --- a/pf/internal/schemashim/schemashim.go +++ b/pkg/pf/internal/schemashim/schemashim.go @@ -19,7 +19,7 @@ import ( pfprovider "github.com/hashicorp/terraform-plugin-framework/provider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/type_schema.go b/pkg/pf/internal/schemashim/type_schema.go similarity index 98% rename from pf/internal/schemashim/type_schema.go rename to pkg/pf/internal/schemashim/type_schema.go index 1a51e4e51..7e726463d 100644 --- a/pf/internal/schemashim/type_schema.go +++ b/pkg/pf/internal/schemashim/type_schema.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" bridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/internal/schemashim/type_schema_test.go b/pkg/pf/internal/schemashim/type_schema_test.go similarity index 100% rename from pf/internal/schemashim/type_schema_test.go rename to pkg/pf/internal/schemashim/type_schema_test.go diff --git a/pf/proto/attribute.go b/pkg/pf/proto/attribute.go similarity index 100% rename from pf/proto/attribute.go rename to pkg/pf/proto/attribute.go diff --git a/pf/proto/block.go b/pkg/pf/proto/block.go similarity index 100% rename from pf/proto/block.go rename to pkg/pf/proto/block.go diff --git a/pf/proto/element.go b/pkg/pf/proto/element.go similarity index 100% rename from pf/proto/element.go rename to pkg/pf/proto/element.go diff --git a/pf/proto/empty.go b/pkg/pf/proto/empty.go similarity index 100% rename from pf/proto/empty.go rename to pkg/pf/proto/empty.go diff --git a/pf/proto/object.go b/pkg/pf/proto/object.go similarity index 100% rename from pf/proto/object.go rename to pkg/pf/proto/object.go diff --git a/pf/proto/protov6.go b/pkg/pf/proto/protov6.go similarity index 98% rename from pf/proto/protov6.go rename to pkg/pf/proto/protov6.go index 9c72b2e53..67c31eb27 100644 --- a/pf/proto/protov6.go +++ b/pkg/pf/proto/protov6.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/proto/protov6_test.go b/pkg/pf/proto/protov6_test.go similarity index 98% rename from pf/proto/protov6_test.go rename to pkg/pf/proto/protov6_test.go index ddd7d1927..5119dd717 100644 --- a/pf/proto/protov6_test.go +++ b/pkg/pf/proto/protov6_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/proto" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" diff --git a/pf/proto/resource.go b/pkg/pf/proto/resource.go similarity index 100% rename from pf/proto/resource.go rename to pkg/pf/proto/resource.go diff --git a/pf/proto/runtypes.go b/pkg/pf/proto/runtypes.go similarity index 97% rename from pf/proto/runtypes.go rename to pkg/pf/proto/runtypes.go index 63e54c242..6c804c7ae 100644 --- a/pf/proto/runtypes.go +++ b/pkg/pf/proto/runtypes.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/proto/schema.go b/pkg/pf/proto/schema.go similarity index 100% rename from pf/proto/schema.go rename to pkg/pf/proto/schema.go diff --git a/pf/proto/unsupported.go b/pkg/pf/proto/unsupported.go similarity index 100% rename from pf/proto/unsupported.go rename to pkg/pf/proto/unsupported.go diff --git a/pf/provider.go b/pkg/pf/provider.go similarity index 94% rename from pf/provider.go rename to pkg/pf/provider.go index 082b78b53..8356ca411 100644 --- a/pf/provider.go +++ b/pkg/pf/provider.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tests/.gitignore b/pkg/pf/tests/.gitignore similarity index 100% rename from pf/tests/.gitignore rename to pkg/pf/tests/.gitignore diff --git a/pf/tests/.golangci.yml b/pkg/pf/tests/.golangci.yml similarity index 100% rename from pf/tests/.golangci.yml rename to pkg/pf/tests/.golangci.yml diff --git a/pf/tests/dynamic_types_test.go b/pkg/pf/tests/dynamic_types_test.go similarity index 99% rename from pf/tests/dynamic_types_test.go rename to pkg/pf/tests/dynamic_types_test.go index ac53d00b2..3d9cbbd4a 100644 --- a/pf/tests/dynamic_types_test.go +++ b/pkg/pf/tests/dynamic_types_test.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pf/tests/extract_inputs_test.go b/pkg/pf/tests/extract_inputs_test.go similarity index 99% rename from pf/tests/extract_inputs_test.go rename to pkg/pf/tests/extract_inputs_test.go index 8ca1caa5a..098661ffe 100644 --- a/pf/tests/extract_inputs_test.go +++ b/pkg/pf/tests/extract_inputs_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hexops/autogold/v2" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/schemashim" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/schemashim" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/require" diff --git a/pf/tests/genrandom_test.go b/pkg/pf/tests/genrandom_test.go similarity index 95% rename from pf/tests/genrandom_test.go rename to pkg/pf/tests/genrandom_test.go index 1adc566ed..f7113e8bd 100644 --- a/pf/tests/genrandom_test.go +++ b/pkg/pf/tests/genrandom_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/genupdate_test.go b/pkg/pf/tests/genupdate_test.go similarity index 93% rename from pf/tests/genupdate_test.go rename to pkg/pf/tests/genupdate_test.go index 2534679d9..4f18bca4e 100644 --- a/pf/tests/genupdate_test.go +++ b/pkg/pf/tests/genupdate_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/integration/appdash_test.go b/pkg/pf/tests/integration/appdash_test.go similarity index 100% rename from pf/tests/integration/appdash_test.go rename to pkg/pf/tests/integration/appdash_test.go diff --git a/pf/tests/integration/attach_test.go b/pkg/pf/tests/integration/attach_test.go similarity index 100% rename from pf/tests/integration/attach_test.go rename to pkg/pf/tests/integration/attach_test.go diff --git a/pf/tests/integration/main_test.go b/pkg/pf/tests/integration/main_test.go similarity index 100% rename from pf/tests/integration/main_test.go rename to pkg/pf/tests/integration/main_test.go diff --git a/pf/tests/integration/program_test.go b/pkg/pf/tests/integration/program_test.go similarity index 100% rename from pf/tests/integration/program_test.go rename to pkg/pf/tests/integration/program_test.go diff --git a/pf/tests/internal/cross-tests/README.md b/pkg/pf/tests/internal/cross-tests/README.md similarity index 100% rename from pf/tests/internal/cross-tests/README.md rename to pkg/pf/tests/internal/cross-tests/README.md diff --git a/pf/tests/internal/cross-tests/configure.go b/pkg/pf/tests/internal/cross-tests/configure.go similarity index 97% rename from pf/tests/internal/cross-tests/configure.go rename to pkg/pf/tests/internal/cross-tests/configure.go index e1478d297..1b93e6ba5 100644 --- a/pf/tests/internal/cross-tests/configure.go +++ b/pkg/pf/tests/internal/cross-tests/configure.go @@ -27,9 +27,9 @@ import ( "github.com/pulumi/providertest/providers" "github.com/pulumi/providertest/pulumitest" "github.com/pulumi/providertest/pulumitest/opttest" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/cross-tests" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" diff --git a/pf/tests/internal/cross-tests/util.go b/pkg/pf/tests/internal/cross-tests/util.go similarity index 100% rename from pf/tests/internal/cross-tests/util.go rename to pkg/pf/tests/internal/cross-tests/util.go diff --git a/pf/tests/internal/pftfcheck/pftf_test.go b/pkg/pf/tests/internal/pftfcheck/pftf_test.go similarity index 95% rename from pf/tests/internal/pftfcheck/pftf_test.go rename to pkg/pf/tests/internal/pftfcheck/pftf_test.go index 27239d31c..bb1a54162 100644 --- a/pf/tests/internal/pftfcheck/pftf_test.go +++ b/pkg/pf/tests/internal/pftfcheck/pftf_test.go @@ -5,7 +5,7 @@ import ( rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/tfcheck" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/internal/providerbuilder/build_provider.go b/pkg/pf/tests/internal/providerbuilder/build_provider.go similarity index 100% rename from pf/tests/internal/providerbuilder/build_provider.go rename to pkg/pf/tests/internal/providerbuilder/build_provider.go diff --git a/pf/tests/internal/providerbuilder/build_resource.go b/pkg/pf/tests/internal/providerbuilder/build_resource.go similarity index 100% rename from pf/tests/internal/providerbuilder/build_resource.go rename to pkg/pf/tests/internal/providerbuilder/build_resource.go diff --git a/pf/tests/internal/randomshim/go.mod b/pkg/pf/tests/internal/randomshim/go.mod similarity index 100% rename from pf/tests/internal/randomshim/go.mod rename to pkg/pf/tests/internal/randomshim/go.mod diff --git a/pf/tests/internal/randomshim/go.sum b/pkg/pf/tests/internal/randomshim/go.sum similarity index 100% rename from pf/tests/internal/randomshim/go.sum rename to pkg/pf/tests/internal/randomshim/go.sum diff --git a/pf/tests/internal/randomshim/shim.go b/pkg/pf/tests/internal/randomshim/shim.go similarity index 100% rename from pf/tests/internal/randomshim/shim.go rename to pkg/pf/tests/internal/randomshim/shim.go diff --git a/pf/tests/internal/testprovider/assert_provider.go b/pkg/pf/tests/internal/testprovider/assert_provider.go similarity index 98% rename from pf/tests/internal/testprovider/assert_provider.go rename to pkg/pf/tests/internal/testprovider/assert_provider.go index a7103d533..64bd5e199 100644 --- a/pf/tests/internal/testprovider/assert_provider.go +++ b/pkg/pf/tests/internal/testprovider/assert_provider.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/tfsdk" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/tests/internal/testprovider/aws.go b/pkg/pf/tests/internal/testprovider/aws.go similarity index 100% rename from pf/tests/internal/testprovider/aws.go rename to pkg/pf/tests/internal/testprovider/aws.go diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-aws/bridge-metadata.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-aws/bridge-metadata.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-aws/bridge-metadata.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-aws/bridge-metadata.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/bridge-metadata.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/bridge-metadata.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/bridge-metadata.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/bridge-metadata.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go similarity index 86% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go index 25253e97b..dc40d4fd6 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/main.go @@ -19,8 +19,8 @@ import ( "context" _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) //go:embed schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-random/bridge-metadata.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/bridge-metadata.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-random/bridge-metadata.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/bridge-metadata.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go similarity index 86% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go index 2907ed6eb..e0031aaaf 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/main.go @@ -19,8 +19,8 @@ import ( "context" _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) //go:embed schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/bridge-metadata.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/bridge-metadata.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/bridge-metadata.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/bridge-metadata.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go similarity index 87% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go index bce8ba57f..0780c7a2a 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/main.go @@ -18,8 +18,8 @@ package main import ( "context" _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) //go:embed schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/bridge-metadata.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/bridge-metadata.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-tls/bridge-metadata.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/bridge-metadata.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go similarity index 86% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go index d9c5a7317..a3b14241a 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/main.go @@ -18,8 +18,8 @@ package main import ( "context" _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) //go:embed schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json similarity index 100% rename from pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json diff --git a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go similarity index 85% rename from pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go index 284ce73d3..0b29765d3 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-muxedrandom/main.go @@ -17,8 +17,8 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) func main() { diff --git a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go similarity index 85% rename from pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go index bc014486e..74c9bd401 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-random/main.go @@ -17,8 +17,8 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) func main() { diff --git a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go similarity index 85% rename from pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go index 7db53b5fc..dcd59e60a 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-testbridge/main.go @@ -17,8 +17,8 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) func main() { diff --git a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go similarity index 82% rename from pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go rename to pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go index 0c34b6a6a..1effb5f48 100644 --- a/pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go +++ b/pkg/pf/tests/internal/testprovider/cmd/pulumi-tfgen-tls/main.go @@ -15,8 +15,8 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) func main() { diff --git a/pf/tests/internal/testprovider/config_test_provider.go b/pkg/pf/tests/internal/testprovider/config_test_provider.go similarity index 100% rename from pf/tests/internal/testprovider/config_test_provider.go rename to pkg/pf/tests/internal/testprovider/config_test_provider.go diff --git a/pf/tests/internal/testprovider/plan_modifiers.go b/pkg/pf/tests/internal/testprovider/plan_modifiers.go similarity index 100% rename from pf/tests/internal/testprovider/plan_modifiers.go rename to pkg/pf/tests/internal/testprovider/plan_modifiers.go diff --git a/pf/tests/internal/testprovider/random.go b/pkg/pf/tests/internal/testprovider/random.go similarity index 97% rename from pf/tests/internal/testprovider/random.go rename to pkg/pf/tests/internal/testprovider/random.go index a44ab136e..bb8fc184a 100644 --- a/pf/tests/internal/testprovider/random.go +++ b/pkg/pf/tests/internal/testprovider/random.go @@ -25,12 +25,12 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider/sdkv2randomprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider/sdkv2randomprovider" "github.com/terraform-providers/terraform-provider-random/randomshim" sdk2schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" ) diff --git a/pf/tests/internal/testprovider/sdkv2randomprovider/humannumber.go b/pkg/pf/tests/internal/testprovider/sdkv2randomprovider/humannumber.go similarity index 100% rename from pf/tests/internal/testprovider/sdkv2randomprovider/humannumber.go rename to pkg/pf/tests/internal/testprovider/sdkv2randomprovider/humannumber.go diff --git a/pf/tests/internal/testprovider/sdkv2randomprovider/provider.go b/pkg/pf/tests/internal/testprovider/sdkv2randomprovider/provider.go similarity index 100% rename from pf/tests/internal/testprovider/sdkv2randomprovider/provider.go rename to pkg/pf/tests/internal/testprovider/sdkv2randomprovider/provider.go diff --git a/pf/tests/internal/testprovider/testbridge.go b/pkg/pf/tests/internal/testprovider/testbridge.go similarity index 99% rename from pf/tests/internal/testprovider/testbridge.go rename to pkg/pf/tests/internal/testprovider/testbridge.go index 3d0dd1935..86d1f6901 100644 --- a/pf/tests/internal/testprovider/testbridge.go +++ b/pkg/pf/tests/internal/testprovider/testbridge.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/tests/internal/testprovider/testbridge_datasource_echo.go b/pkg/pf/tests/internal/testprovider/testbridge_datasource_echo.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_datasource_echo.go rename to pkg/pf/tests/internal/testprovider/testbridge_datasource_echo.go diff --git a/pf/tests/internal/testprovider/testbridge_datasource_smac.go b/pkg/pf/tests/internal/testprovider/testbridge_datasource_smac.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_datasource_smac.go rename to pkg/pf/tests/internal/testprovider/testbridge_datasource_smac.go diff --git a/pf/tests/internal/testprovider/testbridge_datasource_test_defaultinfo.go b/pkg/pf/tests/internal/testprovider/testbridge_datasource_test_defaultinfo.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_datasource_test_defaultinfo.go rename to pkg/pf/tests/internal/testprovider/testbridge_datasource_test_defaultinfo.go diff --git a/pf/tests/internal/testprovider/testbridge_models.go b/pkg/pf/tests/internal/testprovider/testbridge_models.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_models.go rename to pkg/pf/tests/internal/testprovider/testbridge_models.go diff --git a/pf/tests/internal/testprovider/testbridge_resouce_testconfigres.go b/pkg/pf/tests/internal/testprovider/testbridge_resouce_testconfigres.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resouce_testconfigres.go rename to pkg/pf/tests/internal/testprovider/testbridge_resouce_testconfigres.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_autoname.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_autoname.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_autoname.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_autoname.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_int_id.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_int_id.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_int_id.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_int_id.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_privst.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_privst.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_privst.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_privst.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_testcompres.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_testcompres.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_testcompres.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_testcompres.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_testdefaultinfores.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_testdefaultinfores.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_testdefaultinfores.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_testdefaultinfores.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_testnest.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_testnest.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_testnest.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_testnest.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_testnestattr.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_testnestattr.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_testnestattr.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_testnestattr.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_testres.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_testres.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_testres.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_testres.go diff --git a/pf/tests/internal/testprovider/testbridge_resource_vlan_names.go b/pkg/pf/tests/internal/testprovider/testbridge_resource_vlan_names.go similarity index 100% rename from pf/tests/internal/testprovider/testbridge_resource_vlan_names.go rename to pkg/pf/tests/internal/testprovider/testbridge_resource_vlan_names.go diff --git a/pf/tests/internal/testprovider/tls.go b/pkg/pf/tests/internal/testprovider/tls.go similarity index 98% rename from pf/tests/internal/testprovider/tls.go rename to pkg/pf/tests/internal/testprovider/tls.go index 38ea2203d..8e7866c1c 100644 --- a/pf/tests/internal/testprovider/tls.go +++ b/pkg/pf/tests/internal/testprovider/tls.go @@ -21,7 +21,7 @@ import ( "unicode" tlsshim "github.com/hashicorp/terraform-provider-tls/shim" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" ) diff --git a/pf/tests/internal/testprovider/tuple_type.go b/pkg/pf/tests/internal/testprovider/tuple_type.go similarity index 98% rename from pf/tests/internal/testprovider/tuple_type.go rename to pkg/pf/tests/internal/testprovider/tuple_type.go index 028a47a01..dc2e3c85c 100644 --- a/pf/tests/internal/testprovider/tuple_type.go +++ b/pkg/pf/tests/internal/testprovider/tuple_type.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" ) type TupleType struct { diff --git a/pf/tests/internal/tlsshim/go.mod b/pkg/pf/tests/internal/tlsshim/go.mod similarity index 100% rename from pf/tests/internal/tlsshim/go.mod rename to pkg/pf/tests/internal/tlsshim/go.mod diff --git a/pf/tests/internal/tlsshim/go.sum b/pkg/pf/tests/internal/tlsshim/go.sum similarity index 100% rename from pf/tests/internal/tlsshim/go.sum rename to pkg/pf/tests/internal/tlsshim/go.sum diff --git a/pf/tests/internal/tlsshim/shim.go b/pkg/pf/tests/internal/tlsshim/shim.go similarity index 100% rename from pf/tests/internal/tlsshim/shim.go rename to pkg/pf/tests/internal/tlsshim/shim.go diff --git a/pf/tests/main_test.go b/pkg/pf/tests/main_test.go similarity index 100% rename from pf/tests/main_test.go rename to pkg/pf/tests/main_test.go diff --git a/pf/tests/muxwith_test.go b/pkg/pf/tests/muxwith_test.go similarity index 95% rename from pf/tests/muxwith_test.go rename to pkg/pf/tests/muxwith_test.go index bb04fbdf9..e576f5ebf 100644 --- a/pf/tests/muxwith_test.go +++ b/pkg/pf/tests/muxwith_test.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/nested_attr_test.go b/pkg/pf/tests/nested_attr_test.go similarity index 85% rename from pf/tests/nested_attr_test.go rename to pkg/pf/tests/nested_attr_test.go index 3723a52f3..40038fd36 100644 --- a/pf/tests/nested_attr_test.go +++ b/pkg/pf/tests/nested_attr_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" ) func TestNestedType(t *testing.T) { diff --git a/pf/tests/prestateupgradehook_test.go b/pkg/pf/tests/prestateupgradehook_test.go similarity index 96% rename from pf/tests/prestateupgradehook_test.go rename to pkg/pf/tests/prestateupgradehook_test.go index 09fb4f25f..a52d286b3 100644 --- a/pf/tests/prestateupgradehook_test.go +++ b/pkg/pf/tests/prestateupgradehook_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" tfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/require" diff --git a/pf/tests/provider_check_test.go b/pkg/pf/tests/provider_check_test.go similarity index 96% rename from pf/tests/provider_check_test.go rename to pkg/pf/tests/provider_check_test.go index ca3436642..4148d4186 100644 --- a/pf/tests/provider_check_test.go +++ b/pkg/pf/tests/provider_check_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/tests/provider_checkconfig_test.go b/pkg/pf/tests/provider_checkconfig_test.go similarity index 99% rename from pf/tests/provider_checkconfig_test.go rename to pkg/pf/tests/provider_checkconfig_test.go index 837cbc795..e543919c3 100644 --- a/pf/tests/provider_checkconfig_test.go +++ b/pkg/pf/tests/provider_checkconfig_test.go @@ -36,8 +36,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" testutils "github.com/pulumi/providertest/replay" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tests/provider_configure_test.go b/pkg/pf/tests/provider_configure_test.go similarity index 97% rename from pf/tests/provider_configure_test.go rename to pkg/pf/tests/provider_configure_test.go index 9c5476f8c..77490b893 100644 --- a/pf/tests/provider_configure_test.go +++ b/pkg/pf/tests/provider_configure_test.go @@ -20,9 +20,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/provider/schema" "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/cross-tests" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/cross-tests" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/require" diff --git a/pf/tests/provider_create_test.go b/pkg/pf/tests/provider_create_test.go similarity index 98% rename from pf/tests/provider_create_test.go rename to pkg/pf/tests/provider_create_test.go index 410686924..8bf9b8106 100644 --- a/pf/tests/provider_create_test.go +++ b/pkg/pf/tests/provider_create_test.go @@ -20,7 +20,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/provider_diff_test.go b/pkg/pf/tests/provider_diff_test.go similarity index 99% rename from pf/tests/provider_diff_test.go rename to pkg/pf/tests/provider_diff_test.go index 9b7a4f8d6..56bfbe24d 100644 --- a/pf/tests/provider_diff_test.go +++ b/pkg/pf/tests/provider_diff_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/provider_get_mapping_test.go b/pkg/pf/tests/provider_get_mapping_test.go similarity index 96% rename from pf/tests/provider_get_mapping_test.go rename to pkg/pf/tests/provider_get_mapping_test.go index ba1cd4248..d937427c6 100644 --- a/pf/tests/provider_get_mapping_test.go +++ b/pkg/pf/tests/provider_get_mapping_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin" ) diff --git a/pf/tests/provider_init_benchmark_test.go b/pkg/pf/tests/provider_init_benchmark_test.go similarity index 88% rename from pf/tests/provider_init_benchmark_test.go rename to pkg/pf/tests/provider_init_benchmark_test.go index 113f4270d..22b0d690a 100644 --- a/pf/tests/provider_init_benchmark_test.go +++ b/pkg/pf/tests/provider_init_benchmark_test.go @@ -2,8 +2,8 @@ package tfbridgetests import ( "fmt" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider/sdkv2randomprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider/sdkv2randomprovider" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "testing" ) diff --git a/pf/tests/provider_invoke_test.go b/pkg/pf/tests/provider_invoke_test.go similarity index 98% rename from pf/tests/provider_invoke_test.go rename to pkg/pf/tests/provider_invoke_test.go index 9663ee239..ab7c93b67 100644 --- a/pf/tests/provider_invoke_test.go +++ b/pkg/pf/tests/provider_invoke_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/provider_nested_custom_types_test.go b/pkg/pf/tests/provider_nested_custom_types_test.go similarity index 97% rename from pf/tests/provider_nested_custom_types_test.go rename to pkg/pf/tests/provider_nested_custom_types_test.go index 562965e57..851974482 100644 --- a/pf/tests/provider_nested_custom_types_test.go +++ b/pkg/pf/tests/provider_nested_custom_types_test.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/stretchr/testify/assert" ) diff --git a/pf/tests/provider_read_test.go b/pkg/pf/tests/provider_read_test.go similarity index 98% rename from pf/tests/provider_read_test.go rename to pkg/pf/tests/provider_read_test.go index f5d97197b..4212357cc 100644 --- a/pf/tests/provider_read_test.go +++ b/pkg/pf/tests/provider_read_test.go @@ -22,9 +22,9 @@ import ( fwres "github.com/hashicorp/terraform-plugin-framework/resource" fwsch "github.com/hashicorp/terraform-plugin-framework/resource/schema" testutils "github.com/pulumi/providertest/replay" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" diff --git a/pf/tests/provider_transform_outputs_test.go b/pkg/pf/tests/provider_transform_outputs_test.go similarity index 98% rename from pf/tests/provider_transform_outputs_test.go rename to pkg/pf/tests/provider_transform_outputs_test.go index d4f69601e..049ca8669 100644 --- a/pf/tests/provider_transform_outputs_test.go +++ b/pkg/pf/tests/provider_transform_outputs_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/tests/provider_update_test.go b/pkg/pf/tests/provider_update_test.go similarity index 96% rename from pf/tests/provider_update_test.go rename to pkg/pf/tests/provider_update_test.go index 1a6f6118f..289339672 100644 --- a/pf/tests/provider_update_test.go +++ b/pkg/pf/tests/provider_update_test.go @@ -18,7 +18,7 @@ import ( "testing" testutils "github.com/pulumi/providertest/replay" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/stretchr/testify/require" ) diff --git a/pf/tests/pulumi_test.go b/pkg/pf/tests/pulumi_test.go similarity index 97% rename from pf/tests/pulumi_test.go rename to pkg/pf/tests/pulumi_test.go index e340fa1ab..b21b61a2e 100644 --- a/pf/tests/pulumi_test.go +++ b/pkg/pf/tests/pulumi_test.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/provider" sdkv2schema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/pulumi/providertest/pulumitest" - pf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/pulcheck" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens" diff --git a/pf/tests/schema_and_program_test.go b/pkg/pf/tests/schema_and_program_test.go similarity index 98% rename from pf/tests/schema_and_program_test.go rename to pkg/pf/tests/schema_and_program_test.go index 3da4f4fbf..b76b4e054 100644 --- a/pf/tests/schema_and_program_test.go +++ b/pkg/pf/tests/schema_and_program_test.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview" diff --git a/pf/tests/schema_test.go b/pkg/pf/tests/schema_test.go similarity index 98% rename from pf/tests/schema_test.go rename to pkg/pf/tests/schema_test.go index f53468ddd..795a9a8c5 100644 --- a/pf/tests/schema_test.go +++ b/pkg/pf/tests/schema_test.go @@ -26,7 +26,7 @@ import ( "runtime" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/testprovider" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/testprovider" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" ) diff --git a/pf/tests/schemas.go b/pkg/pf/tests/schemas.go similarity index 93% rename from pf/tests/schemas.go rename to pkg/pf/tests/schemas.go index 137999e5b..3f15d13c6 100644 --- a/pf/tests/schemas.go +++ b/pkg/pf/tests/schemas.go @@ -26,8 +26,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors" - tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + tfpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" tfbridge0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" tfgen0 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" ) diff --git a/pf/tests/schemashim_test.go b/pkg/pf/tests/schemashim_test.go similarity index 99% rename from pf/tests/schemashim_test.go rename to pkg/pf/tests/schemashim_test.go index 4e34400e6..563889681 100644 --- a/pf/tests/schemashim_test.go +++ b/pkg/pf/tests/schemashim_test.go @@ -35,8 +35,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hexops/autogold/v2" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/schemashim" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/schemashim" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "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/tfgen" diff --git a/pf/tests/testdata/autoname-program/Pulumi.yaml b/pkg/pf/tests/testdata/autoname-program/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/autoname-program/Pulumi.yaml rename to pkg/pf/tests/testdata/autoname-program/Pulumi.yaml diff --git a/pf/tests/testdata/basicprogram/Pulumi.yaml b/pkg/pf/tests/testdata/basicprogram/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/basicprogram/Pulumi.yaml rename to pkg/pf/tests/testdata/basicprogram/Pulumi.yaml diff --git a/pf/tests/testdata/defaultinfo-program/Pulumi.yaml b/pkg/pf/tests/testdata/defaultinfo-program/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/defaultinfo-program/Pulumi.yaml rename to pkg/pf/tests/testdata/defaultinfo-program/Pulumi.yaml diff --git a/pf/tests/testdata/genrandom/random-delete-preview.json b/pkg/pf/tests/testdata/genrandom/random-delete-preview.json similarity index 100% rename from pf/tests/testdata/genrandom/random-delete-preview.json rename to pkg/pf/tests/testdata/genrandom/random-delete-preview.json diff --git a/pf/tests/testdata/genrandom/random-delete-update.json b/pkg/pf/tests/testdata/genrandom/random-delete-update.json similarity index 100% rename from pf/tests/testdata/genrandom/random-delete-update.json rename to pkg/pf/tests/testdata/genrandom/random-delete-update.json diff --git a/pf/tests/testdata/genrandom/random-empty-preview.json b/pkg/pf/tests/testdata/genrandom/random-empty-preview.json similarity index 100% rename from pf/tests/testdata/genrandom/random-empty-preview.json rename to pkg/pf/tests/testdata/genrandom/random-empty-preview.json diff --git a/pf/tests/testdata/genrandom/random-empty-update.json b/pkg/pf/tests/testdata/genrandom/random-empty-update.json similarity index 100% rename from pf/tests/testdata/genrandom/random-empty-update.json rename to pkg/pf/tests/testdata/genrandom/random-empty-update.json diff --git a/pf/tests/testdata/genrandom/random-initial-preview.json b/pkg/pf/tests/testdata/genrandom/random-initial-preview.json similarity index 100% rename from pf/tests/testdata/genrandom/random-initial-preview.json rename to pkg/pf/tests/testdata/genrandom/random-initial-preview.json diff --git a/pf/tests/testdata/genrandom/random-initial-update.json b/pkg/pf/tests/testdata/genrandom/random-initial-update.json similarity index 100% rename from pf/tests/testdata/genrandom/random-initial-update.json rename to pkg/pf/tests/testdata/genrandom/random-initial-update.json diff --git a/pf/tests/testdata/genrandom/random-replace-preview.json b/pkg/pf/tests/testdata/genrandom/random-replace-preview.json similarity index 100% rename from pf/tests/testdata/genrandom/random-replace-preview.json rename to pkg/pf/tests/testdata/genrandom/random-replace-preview.json diff --git a/pf/tests/testdata/genrandom/random-replace-update.json b/pkg/pf/tests/testdata/genrandom/random-replace-update.json similarity index 100% rename from pf/tests/testdata/genrandom/random-replace-update.json rename to pkg/pf/tests/testdata/genrandom/random-replace-update.json diff --git a/pf/tests/testdata/muxedbasicprogram/Pulumi.yaml b/pkg/pf/tests/testdata/muxedbasicprogram/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/muxedbasicprogram/Pulumi.yaml rename to pkg/pf/tests/testdata/muxedbasicprogram/Pulumi.yaml diff --git a/pf/tests/testdata/privst-program/Pulumi.yaml b/pkg/pf/tests/testdata/privst-program/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/privst-program/Pulumi.yaml rename to pkg/pf/tests/testdata/privst-program/Pulumi.yaml diff --git a/pf/tests/testdata/privst-program/edit-1/Pulumi.yaml b/pkg/pf/tests/testdata/privst-program/edit-1/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/privst-program/edit-1/Pulumi.yaml rename to pkg/pf/tests/testdata/privst-program/edit-1/Pulumi.yaml diff --git a/pf/tests/testdata/resource-without-id/Pulumi.yaml b/pkg/pf/tests/testdata/resource-without-id/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/resource-without-id/Pulumi.yaml rename to pkg/pf/tests/testdata/resource-without-id/Pulumi.yaml diff --git a/pf/tests/testdata/smac-program/Pulumi.yaml b/pkg/pf/tests/testdata/smac-program/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/smac-program/Pulumi.yaml rename to pkg/pf/tests/testdata/smac-program/Pulumi.yaml diff --git a/pf/tests/testdata/updateprogram-2/Pulumi.yaml b/pkg/pf/tests/testdata/updateprogram-2/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/updateprogram-2/Pulumi.yaml rename to pkg/pf/tests/testdata/updateprogram-2/Pulumi.yaml diff --git a/pf/tests/testdata/updateprogram-3/Pulumi.yaml b/pkg/pf/tests/testdata/updateprogram-3/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/updateprogram-3/Pulumi.yaml rename to pkg/pf/tests/testdata/updateprogram-3/Pulumi.yaml diff --git a/pf/tests/testdata/updateprogram-4/Pulumi.yaml b/pkg/pf/tests/testdata/updateprogram-4/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/updateprogram-4/Pulumi.yaml rename to pkg/pf/tests/testdata/updateprogram-4/Pulumi.yaml diff --git a/pf/tests/testdata/updateprogram.json b/pkg/pf/tests/testdata/updateprogram.json similarity index 100% rename from pf/tests/testdata/updateprogram.json rename to pkg/pf/tests/testdata/updateprogram.json diff --git a/pf/tests/testdata/updateprogram/Pulumi.yaml b/pkg/pf/tests/testdata/updateprogram/Pulumi.yaml similarity index 100% rename from pf/tests/testdata/updateprogram/Pulumi.yaml rename to pkg/pf/tests/testdata/updateprogram/Pulumi.yaml diff --git a/pf/tests/testdatagen/genrandom/Pulumi.yaml b/pkg/pf/tests/testdatagen/genrandom/Pulumi.yaml similarity index 100% rename from pf/tests/testdatagen/genrandom/Pulumi.yaml rename to pkg/pf/tests/testdatagen/genrandom/Pulumi.yaml diff --git a/pf/tests/testdatagen/genrandom/generate.sh b/pkg/pf/tests/testdatagen/genrandom/generate.sh similarity index 100% rename from pf/tests/testdatagen/genrandom/generate.sh rename to pkg/pf/tests/testdatagen/genrandom/generate.sh diff --git a/pf/tests/testdatagen/genrandom/go.mod b/pkg/pf/tests/testdatagen/genrandom/go.mod similarity index 100% rename from pf/tests/testdatagen/genrandom/go.mod rename to pkg/pf/tests/testdatagen/genrandom/go.mod diff --git a/pf/tests/testdatagen/genrandom/go.sum b/pkg/pf/tests/testdatagen/genrandom/go.sum similarity index 100% rename from pf/tests/testdatagen/genrandom/go.sum rename to pkg/pf/tests/testdatagen/genrandom/go.sum diff --git a/pf/tests/testdatagen/genrandom/main.go b/pkg/pf/tests/testdatagen/genrandom/main.go similarity index 100% rename from pf/tests/testdatagen/genrandom/main.go rename to pkg/pf/tests/testdatagen/genrandom/main.go diff --git a/pf/tests/tfgen_test.go b/pkg/pf/tests/tfgen_test.go similarity index 89% rename from pf/tests/tfgen_test.go rename to pkg/pf/tests/tfgen_test.go index 0c0b2a8ea..efdae40c8 100644 --- a/pf/tests/tfgen_test.go +++ b/pkg/pf/tests/tfgen_test.go @@ -20,9 +20,9 @@ import ( "os" "testing" - pb "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" + pb "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/internal/providerbuilder" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" helper "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/schema" diff --git a/pf/tests/util.go b/pkg/pf/tests/util.go similarity index 96% rename from pf/tests/util.go rename to pkg/pf/tests/util.go index 300071351..df419cb48 100644 --- a/pf/tests/util.go +++ b/pkg/pf/tests/util.go @@ -32,8 +32,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/util/rpcutil" pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tests/internal/providerbuilder" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/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" diff --git a/pf/tfbridge/detect_check_failures.go b/pkg/pf/tfbridge/detect_check_failures.go similarity index 100% rename from pf/tfbridge/detect_check_failures.go rename to pkg/pf/tfbridge/detect_check_failures.go diff --git a/pf/tfbridge/detect_check_failures_test.go b/pkg/pf/tfbridge/detect_check_failures_test.go similarity index 100% rename from pf/tfbridge/detect_check_failures_test.go rename to pkg/pf/tfbridge/detect_check_failures_test.go diff --git a/pf/tfbridge/dynamic_value.go b/pkg/pf/tfbridge/dynamic_value.go similarity index 100% rename from pf/tfbridge/dynamic_value.go rename to pkg/pf/tfbridge/dynamic_value.go diff --git a/pf/tfbridge/extend.go b/pkg/pf/tfbridge/extend.go similarity index 92% rename from pf/tfbridge/extend.go rename to pkg/pf/tfbridge/extend.go index 32238534f..45cb16099 100644 --- a/pf/tfbridge/extend.go +++ b/pkg/pf/tfbridge/extend.go @@ -19,8 +19,8 @@ import ( pfprovider "github.com/hashicorp/terraform-plugin-framework/provider" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/schemashim" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/schemashim" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tfbridge/ids.go b/pkg/pf/tfbridge/ids.go similarity index 100% rename from pf/tfbridge/ids.go rename to pkg/pf/tfbridge/ids.go diff --git a/pf/tfbridge/logging.go b/pkg/pf/tfbridge/logging.go similarity index 100% rename from pf/tfbridge/logging.go rename to pkg/pf/tfbridge/logging.go diff --git a/pf/tfbridge/main.go b/pkg/pf/tfbridge/main.go similarity index 96% rename from pf/tfbridge/main.go rename to pkg/pf/tfbridge/main.go index 7cac1ade3..b6b011c70 100644 --- a/pf/tfbridge/main.go +++ b/pkg/pf/tfbridge/main.go @@ -27,11 +27,11 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - pfmuxer "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + pfmuxer "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/metadata" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" ) // Implements main() or a bridged Pulumi plugin, complete with argument parsing. diff --git a/pf/tfbridge/metadata.go b/pkg/pf/tfbridge/metadata.go similarity index 100% rename from pf/tfbridge/metadata.go rename to pkg/pf/tfbridge/metadata.go diff --git a/pf/tfbridge/naming.go b/pkg/pf/tfbridge/naming.go similarity index 100% rename from pf/tfbridge/naming.go rename to pkg/pf/tfbridge/naming.go diff --git a/pf/tfbridge/package.go b/pkg/pf/tfbridge/package.go similarity index 100% rename from pf/tfbridge/package.go rename to pkg/pf/tfbridge/package.go diff --git a/pf/tfbridge/provider.go b/pkg/pf/tfbridge/provider.go similarity index 96% rename from pf/tfbridge/provider.go rename to pkg/pf/tfbridge/provider.go index 438530af9..bed8dcd5c 100644 --- a/pf/tfbridge/provider.go +++ b/pkg/pf/tfbridge/provider.go @@ -31,12 +31,12 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/configencoding" - pl "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/plugin" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/schemashim" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/configencoding" + pl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/plugin" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/schemashim" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/logging" diff --git a/pf/tfbridge/provider_attach.go b/pkg/pf/tfbridge/provider_attach.go similarity index 100% rename from pf/tfbridge/provider_attach.go rename to pkg/pf/tfbridge/provider_attach.go diff --git a/pf/tfbridge/provider_check.go b/pkg/pf/tfbridge/provider_check.go similarity index 98% rename from pf/tfbridge/provider_check.go rename to pkg/pf/tfbridge/provider_check.go index 619acdc0a..5012aa507 100644 --- a/pf/tfbridge/provider_check.go +++ b/pkg/pf/tfbridge/provider_check.go @@ -23,8 +23,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pf/tfbridge/provider_checkconfig.go b/pkg/pf/tfbridge/provider_checkconfig.go similarity index 99% rename from pf/tfbridge/provider_checkconfig.go rename to pkg/pf/tfbridge/provider_checkconfig.go index 241c932cb..62084f866 100644 --- a/pf/tfbridge/provider_checkconfig.go +++ b/pkg/pf/tfbridge/provider_checkconfig.go @@ -25,8 +25,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tfbridge/provider_configure.go b/pkg/pf/tfbridge/provider_configure.go similarity index 100% rename from pf/tfbridge/provider_configure.go rename to pkg/pf/tfbridge/provider_configure.go diff --git a/pf/tfbridge/provider_create.go b/pkg/pf/tfbridge/provider_create.go similarity index 100% rename from pf/tfbridge/provider_create.go rename to pkg/pf/tfbridge/provider_create.go diff --git a/pf/tfbridge/provider_datasources.go b/pkg/pf/tfbridge/provider_datasources.go similarity index 96% rename from pf/tfbridge/provider_datasources.go rename to pkg/pf/tfbridge/provider_datasources.go index 32743d7f3..6f2eba1b6 100644 --- a/pf/tfbridge/provider_datasources.go +++ b/pkg/pf/tfbridge/provider_datasources.go @@ -20,8 +20,8 @@ import ( "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tfbridge/provider_delete.go b/pkg/pf/tfbridge/provider_delete.go similarity index 100% rename from pf/tfbridge/provider_delete.go rename to pkg/pf/tfbridge/provider_delete.go diff --git a/pf/tfbridge/provider_diagnostics.go b/pkg/pf/tfbridge/provider_diagnostics.go similarity index 100% rename from pf/tfbridge/provider_diagnostics.go rename to pkg/pf/tfbridge/provider_diagnostics.go diff --git a/pf/tfbridge/provider_diff.go b/pkg/pf/tfbridge/provider_diff.go similarity index 100% rename from pf/tfbridge/provider_diff.go rename to pkg/pf/tfbridge/provider_diff.go diff --git a/pf/tfbridge/provider_diff_test.go b/pkg/pf/tfbridge/provider_diff_test.go similarity index 100% rename from pf/tfbridge/provider_diff_test.go rename to pkg/pf/tfbridge/provider_diff_test.go diff --git a/pf/tfbridge/provider_diffconfig.go b/pkg/pf/tfbridge/provider_diffconfig.go similarity index 100% rename from pf/tfbridge/provider_diffconfig.go rename to pkg/pf/tfbridge/provider_diffconfig.go diff --git a/pf/tfbridge/provider_get_mapping.go b/pkg/pf/tfbridge/provider_get_mapping.go similarity index 100% rename from pf/tfbridge/provider_get_mapping.go rename to pkg/pf/tfbridge/provider_get_mapping.go diff --git a/pf/tfbridge/provider_info_test.go b/pkg/pf/tfbridge/provider_info_test.go similarity index 100% rename from pf/tfbridge/provider_info_test.go rename to pkg/pf/tfbridge/provider_info_test.go diff --git a/pf/tfbridge/provider_invoke.go b/pkg/pf/tfbridge/provider_invoke.go similarity index 98% rename from pf/tfbridge/provider_invoke.go rename to pkg/pf/tfbridge/provider_invoke.go index c035c6a93..74c55f972 100644 --- a/pf/tfbridge/provider_invoke.go +++ b/pkg/pf/tfbridge/provider_invoke.go @@ -26,8 +26,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/defaults" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/propertyvalue" ) diff --git a/pf/tfbridge/provider_mux.go b/pkg/pf/tfbridge/provider_mux.go similarity index 100% rename from pf/tfbridge/provider_mux.go rename to pkg/pf/tfbridge/provider_mux.go diff --git a/pf/tfbridge/provider_plan.go b/pkg/pf/tfbridge/provider_plan.go similarity index 94% rename from pf/tfbridge/provider_plan.go rename to pkg/pf/tfbridge/provider_plan.go index a13b3e060..4d49c1321 100644 --- a/pf/tfbridge/provider_plan.go +++ b/pkg/pf/tfbridge/provider_plan.go @@ -22,8 +22,8 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" ) // Simplifies calling PlanResourceChanges in Terraform. diff --git a/pf/tfbridge/provider_read.go b/pkg/pf/tfbridge/provider_read.go similarity index 100% rename from pf/tfbridge/provider_read.go rename to pkg/pf/tfbridge/provider_read.go diff --git a/pf/tfbridge/provider_read_test.go b/pkg/pf/tfbridge/provider_read_test.go similarity index 100% rename from pf/tfbridge/provider_read_test.go rename to pkg/pf/tfbridge/provider_read_test.go diff --git a/pf/tfbridge/provider_resources.go b/pkg/pf/tfbridge/provider_resources.go similarity index 97% rename from pf/tfbridge/provider_resources.go rename to pkg/pf/tfbridge/provider_resources.go index 381c0cfaf..4540ba26b 100644 --- a/pf/tfbridge/provider_resources.go +++ b/pkg/pf/tfbridge/provider_resources.go @@ -22,8 +22,8 @@ import ( pulumiresource "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/runtypes" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/convert" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" ) diff --git a/pf/tfbridge/provider_streaminvoke.go b/pkg/pf/tfbridge/provider_streaminvoke.go similarity index 100% rename from pf/tfbridge/provider_streaminvoke.go rename to pkg/pf/tfbridge/provider_streaminvoke.go diff --git a/pf/tfbridge/provider_test.go b/pkg/pf/tfbridge/provider_test.go similarity index 100% rename from pf/tfbridge/provider_test.go rename to pkg/pf/tfbridge/provider_test.go diff --git a/pf/tfbridge/provider_update.go b/pkg/pf/tfbridge/provider_update.go similarity index 100% rename from pf/tfbridge/provider_update.go rename to pkg/pf/tfbridge/provider_update.go diff --git a/pf/tfbridge/provider_upgrade_resource_state.go b/pkg/pf/tfbridge/provider_upgrade_resource_state.go similarity index 96% rename from pf/tfbridge/provider_upgrade_resource_state.go rename to pkg/pf/tfbridge/provider_upgrade_resource_state.go index f6383ffb3..3c38d7a25 100644 --- a/pf/tfbridge/provider_upgrade_resource_state.go +++ b/pkg/pf/tfbridge/provider_upgrade_resource_state.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-go/tftypes" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/pfutils" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils" ) // Wraps running state migration via the underlying TF UpgradeResourceState method. diff --git a/pf/tfbridge/resource_state.go b/pkg/pf/tfbridge/resource_state.go similarity index 100% rename from pf/tfbridge/resource_state.go rename to pkg/pf/tfbridge/resource_state.go diff --git a/pf/tfbridge/resource_state_test.go b/pkg/pf/tfbridge/resource_state_test.go similarity index 100% rename from pf/tfbridge/resource_state_test.go rename to pkg/pf/tfbridge/resource_state_test.go diff --git a/pf/tfbridge/serve.go b/pkg/pf/tfbridge/serve.go similarity index 100% rename from pf/tfbridge/serve.go rename to pkg/pf/tfbridge/serve.go diff --git a/pf/tfgen/gen.go b/pkg/pf/tfgen/gen.go similarity index 94% rename from pf/tfgen/gen.go rename to pkg/pf/tfgen/gen.go index 637ef3368..983a3e95b 100644 --- a/pf/tfgen/gen.go +++ b/pkg/pf/tfgen/gen.go @@ -23,8 +23,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/check" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/check" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" sdkbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" realtfgen "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" ) diff --git a/pf/tfgen/main.go b/pkg/pf/tfgen/main.go similarity index 96% rename from pf/tfgen/main.go rename to pkg/pf/tfgen/main.go index cb90f5563..057b44aac 100644 --- a/pf/tfgen/main.go +++ b/pkg/pf/tfgen/main.go @@ -20,8 +20,8 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" - "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/check" - pfmuxer "github.com/pulumi/pulumi-terraform-bridge/v3/pf/internal/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/check" + pfmuxer "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/muxer" sdkBridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/metadata" diff --git a/pf/tfgen/package.go b/pkg/pf/tfgen/package.go similarity index 100% rename from pf/tfgen/package.go rename to pkg/pf/tfgen/package.go diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden diff --git a/pf/tfgen/testdata/TestTypeOverride/no-override.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/no-override.golden similarity index 100% rename from pf/tfgen/testdata/TestTypeOverride/no-override.golden rename to pkg/pf/tfgen/testdata/TestTypeOverride/no-override.golden diff --git a/pf/tfgen/tfgen_test.go b/pkg/pf/tfgen/tfgen_test.go similarity index 99% rename from pf/tfgen/tfgen_test.go rename to pkg/pf/tfgen/tfgen_test.go index 66f731170..0e006ceed 100644 --- a/pf/tfgen/tfgen_test.go +++ b/pkg/pf/tfgen/tfgen_test.go @@ -34,7 +34,7 @@ import ( pulumischema "github.com/pulumi/pulumi/pkg/v3/codegen/schema" "github.com/stretchr/testify/require" - pftfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pftfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pkg/tfbridge/provider.go b/pkg/tfbridge/provider.go index c9757ca71..5ed4eecef 100644 --- a/pkg/tfbridge/provider.go +++ b/pkg/tfbridge/provider.go @@ -49,10 +49,10 @@ import ( "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/typechecker" shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/walk" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/logging" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/metadata" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/propertyvalue" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" ) type providerOptions struct { diff --git a/pkg/tfgen/generate_schema.go b/pkg/tfgen/generate_schema.go index 2800a100d..eeeefb764 100644 --- a/pkg/tfgen/generate_schema.go +++ b/pkg/tfgen/generate_schema.go @@ -44,8 +44,8 @@ import ( "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen/internal/paths" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/metadata" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" ) const ( diff --git a/pkg/tfgen/generate_schema_test.go b/pkg/tfgen/generate_schema_test.go index 3f38f4abf..e10af75f6 100644 --- a/pkg/tfgen/generate_schema_test.go +++ b/pkg/tfgen/generate_schema_test.go @@ -41,8 +41,8 @@ import ( "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen/internal/testprovider" sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" "github.com/pulumi/pulumi-terraform-bridge/v3/unstable/metadata" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" ) // TestRegress611 tests against test_data/regress-611-schema.json. diff --git a/x/muxer/main.go b/pkg/x/muxer/main.go similarity index 100% rename from x/muxer/main.go rename to pkg/x/muxer/main.go diff --git a/x/muxer/mapping.go b/pkg/x/muxer/mapping.go similarity index 100% rename from x/muxer/mapping.go rename to pkg/x/muxer/mapping.go diff --git a/x/muxer/mapping_test.go b/pkg/x/muxer/mapping_test.go similarity index 100% rename from x/muxer/mapping_test.go rename to pkg/x/muxer/mapping_test.go diff --git a/x/muxer/muxer.go b/pkg/x/muxer/muxer.go similarity index 100% rename from x/muxer/muxer.go rename to pkg/x/muxer/muxer.go diff --git a/x/muxer/muxer_test.go b/pkg/x/muxer/muxer_test.go similarity index 100% rename from x/muxer/muxer_test.go rename to pkg/x/muxer/muxer_test.go diff --git a/x/muxer/tests/muxer_test.go b/pkg/x/muxer/tests/muxer_test.go similarity index 99% rename from x/muxer/tests/muxer_test.go rename to pkg/x/muxer/tests/muxer_test.go index 12f25b796..4095c2c7f 100644 --- a/x/muxer/tests/muxer_test.go +++ b/pkg/x/muxer/tests/muxer_test.go @@ -31,7 +31,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "github.com/pulumi/pulumi-terraform-bridge/v3/x/muxer" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" ) func TestSimpleDispatch(t *testing.T) { diff --git a/testing/x/json_match.go b/pkg/x/testing/json_match.go similarity index 100% rename from testing/x/json_match.go rename to pkg/x/testing/json_match.go diff --git a/testing/x/json_match_test.go b/pkg/x/testing/json_match_test.go similarity index 100% rename from testing/x/json_match_test.go rename to pkg/x/testing/json_match_test.go diff --git a/testing/x/package.go b/pkg/x/testing/package.go similarity index 100% rename from testing/x/package.go rename to pkg/x/testing/package.go diff --git a/testing/x/replay.go b/pkg/x/testing/replay.go similarity index 100% rename from testing/x/replay.go rename to pkg/x/testing/replay.go