Skip to content

Commit

Permalink
Move ./pf, ./testing and ./x/muxer under ./pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
@blampe
blampe committed Oct 11, 2024
1 parent 8240cd7 commit 76ac2b8
Show file tree
Hide file tree
Showing 238 changed files with 141 additions and 141 deletions.
6 changes: 3 additions & 3 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dynamic/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dynamic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dynamic/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 pf/Makefile → pkg/pf/Makefile
View file
File renamed without changes.
0 pf/README.md → pkg/pf/README.md
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/check/check_test.go → pkg/pf/internal/check/check_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pf/internal/check/checks.go → pkg/pf/internal/check/checks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pf/internal/check/not_supported.go → pkg/pf/internal/check/not_supported.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/internal/check/not_supported_test.go → pkg/pf/internal/check/not_supported_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/configencoding/provider.go → pkg/pf/internal/configencoding/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/internal/defaults/defaults.go → pkg/pf/internal/defaults/defaults.go
View file
File renamed without changes.
0 pf/internal/defaults/defaults_test.go → pkg/pf/internal/defaults/defaults_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pf/internal/muxer/muxer.go → pkg/pf/internal/muxer/muxer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 pf/internal/muxer/union.go → pkg/pf/internal/muxer/union.go
View file
File renamed without changes.
0 pf/internal/muxer/union_test.go → pkg/pf/internal/muxer/union_test.go
View file
File renamed without changes.
0 pf/internal/pfutils/attr.go → pkg/pf/internal/pfutils/attr.go
View file
File renamed without changes.
0 pf/internal/pfutils/block.go → pkg/pf/internal/pfutils/block.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/pfutils/common.go → pkg/pf/internal/pfutils/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...ernal/pfutils/convert_rschema_to_proto.go → ...ernal/pfutils/convert_rschema_to_proto.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/pfutils/datasources.go → pkg/pf/internal/pfutils/datasources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/internal/pfutils/eq.go → pkg/pf/internal/pfutils/eq.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/pfutils/proposed_new.go → pkg/pf/internal/pfutils/proposed_new.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pf/internal/pfutils/proposed_new_test.go → pkg/pf/internal/pfutils/proposed_new_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/internal/pfutils/raw_state.go → pkg/pf/internal/pfutils/raw_state.go
View file
File renamed without changes.
0 pf/internal/pfutils/reflector.go → pkg/pf/internal/pfutils/reflector.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/pfutils/resources.go → pkg/pf/internal/pfutils/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/internal/pfutils/schema.go → pkg/pf/internal/pfutils/schema.go
View file
File renamed without changes.
0 pf/internal/pfutils/value_builder.go → pkg/pf/internal/pfutils/value_builder.go
View file
File renamed without changes.
0 pf/internal/pfutils/value_to_json.go → pkg/pf/internal/pfutils/value_to_json.go
View file
File renamed without changes.
0 pf/internal/plugin/package.go → pkg/pf/internal/plugin/package.go
View file
File renamed without changes.
0 pf/internal/plugin/provider_context.go → pkg/pf/internal/plugin/provider_context.go
View file
File renamed without changes.
0 pf/internal/plugin/provider_server.go → pkg/pf/internal/plugin/provider_server.go
View file
File renamed without changes.
0 pf/internal/runtypes/types.go → pkg/pf/internal/runtypes/types.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/schemashim/attr_schema.go → pkg/pf/internal/schemashim/attr_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/block_schema.go → pkg/pf/internal/schemashim/block_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 pf/internal/schemashim/convert_type.go → pkg/pf/internal/schemashim/convert_type.go
View file
File renamed without changes.
0 ...nal/schemashim/custom_object_type_test.go → ...nal/schemashim/custom_object_type_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/internal/schemashim/custom_type_test.go → ...f/internal/schemashim/custom_type_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/datasource.go → pkg/pf/internal/schemashim/datasource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/datasource_map.go → pkg/pf/internal/schemashim/datasource_map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ernal/schemashim/object_pseudoresource.go → ...ernal/schemashim/object_pseudoresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/object_type_test.go → ...f/internal/schemashim/object_type_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pf/internal/schemashim/provider.go → pkg/pf/internal/schemashim/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/resource.go → pkg/pf/internal/schemashim/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/resource_map.go → pkg/pf/internal/schemashim/resource_map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/schema_map.go → pkg/pf/internal/schemashim/schema_map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/schemashim.go → pkg/pf/internal/schemashim/schemashim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/internal/schemashim/type_schema.go → pkg/pf/internal/schemashim/type_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 pf/internal/schemashim/type_schema_test.go → ...f/internal/schemashim/type_schema_test.go
View file
File renamed without changes.
0 pf/proto/attribute.go → pkg/pf/proto/attribute.go
View file
File renamed without changes.
0 pf/proto/block.go → pkg/pf/proto/block.go
View file
File renamed without changes.
0 pf/proto/element.go → pkg/pf/proto/element.go
View file
File renamed without changes.
0 pf/proto/empty.go → pkg/pf/proto/empty.go
View file
File renamed without changes.
0 pf/proto/object.go → pkg/pf/proto/object.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/proto/protov6.go → pkg/pf/proto/protov6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pf/proto/protov6_test.go → pkg/pf/proto/protov6_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 pf/proto/resource.go → pkg/pf/proto/resource.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/proto/runtypes.go → pkg/pf/proto/runtypes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/proto/schema.go → pkg/pf/proto/schema.go
View file
File renamed without changes.
0 pf/proto/unsupported.go → pkg/pf/proto/unsupported.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/provider.go → pkg/pf/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/tests/.gitignore → pkg/pf/tests/.gitignore
View file
File renamed without changes.
0 pf/tests/.golangci.yml → pkg/pf/tests/.golangci.yml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/tests/dynamic_types_test.go → pkg/pf/tests/dynamic_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pf/tests/extract_inputs_test.go → pkg/pf/tests/extract_inputs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pf/tests/genrandom_test.go → pkg/pf/tests/genrandom_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pf/tests/genupdate_test.go → pkg/pf/tests/genupdate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/tests/integration/appdash_test.go → pkg/pf/tests/integration/appdash_test.go
View file
File renamed without changes.
0 pf/tests/integration/attach_test.go → pkg/pf/tests/integration/attach_test.go
View file
File renamed without changes.
0 pf/tests/integration/main_test.go → pkg/pf/tests/integration/main_test.go
View file
File renamed without changes.
0 pf/tests/integration/program_test.go → pkg/pf/tests/integration/program_test.go
View file
File renamed without changes.
0 pf/tests/internal/cross-tests/README.md → pkg/pf/tests/internal/cross-tests/README.md
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pf/tests/internal/cross-tests/configure.go → ...f/tests/internal/cross-tests/configure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 pf/tests/internal/cross-tests/util.go → pkg/pf/tests/internal/cross-tests/util.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pf/tests/internal/pftfcheck/pftf_test.go → pkg/pf/tests/internal/pftfcheck/pftf_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...nternal/providerbuilder/build_provider.go → ...nternal/providerbuilder/build_provider.go
View file
File renamed without changes.
0 ...nternal/providerbuilder/build_resource.go → ...nternal/providerbuilder/build_resource.go
View file
File renamed without changes.
0 pf/tests/internal/randomshim/go.mod → pkg/pf/tests/internal/randomshim/go.mod
View file
File renamed without changes.
0 pf/tests/internal/randomshim/go.sum → pkg/pf/tests/internal/randomshim/go.sum
View file
File renamed without changes.
0 pf/tests/internal/randomshim/shim.go → pkg/pf/tests/internal/randomshim/shim.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../internal/testprovider/assert_provider.go → .../internal/testprovider/assert_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pf/tests/internal/testprovider/aws.go → pkg/pf/tests/internal/testprovider/aws.go
View file
File renamed without changes.
0 .../pulumi-resource-aws/bridge-metadata.json → .../pulumi-resource-aws/bridge-metadata.json
View file
File renamed without changes.
0 ...resource-muxedrandom/bridge-metadata.json → ...resource-muxedrandom/bridge-metadata.json
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...r/cmd/pulumi-resource-muxedrandom/main.go → ...r/cmd/pulumi-resource-muxedrandom/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...d/pulumi-resource-muxedrandom/schema.json → ...d/pulumi-resource-muxedrandom/schema.json
View file
File renamed without changes.
0 ...lumi-resource-random/bridge-metadata.json → ...lumi-resource-random/bridge-metadata.json
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ovider/cmd/pulumi-resource-random/main.go → ...ovider/cmd/pulumi-resource-random/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...er/cmd/pulumi-resource-random/schema.json → ...er/cmd/pulumi-resource-random/schema.json
View file
File renamed without changes.
0 ...-resource-testbridge/bridge-metadata.json → ...-resource-testbridge/bridge-metadata.json
View file
File renamed without changes.
Loading

0 comments on commit 76ac2b8

Please sign in to comment.