Move ./pf, ./testing and ./x/muxer under ./pkg (#2477)

This moves `pf`, `testing` and `x/muxer` under `pkg`. This will allow us
to restore modules at those paths in order to not break existing consumers.

More specifically, the new import paths are:

`github.com/pulumi-terraform-bridge/pf` →
    `github.com/pulumi-terraform-bridge/v3/pkg/pf`

`github.com/pulumi-terraform-bridge/x/muxer` →
    `github.com/pulumi-terraform-bridge/v3/pkg/x/muxer`

`github.com/pulumi-terraform-bridge/testing` →
    `github.com/pulumi-terraform-bridge/v3/pkg/x/testing`

(I put this under `x` since `testing/x` is the only package in this module)

Refs #1445.

Author: blampe

.github/workflows/build-and-test.yml

@@ -44,11 +44,11 @@ jobs:
       - name: Build
         run: make build
       - name: Build PF
-        run: cd pf && make build
+        run: cd pkg/pf && make build
       - name: Test
         run: make test
       - name: Test PF
-        run: cd pf && make test
+        run: cd pkg/pf && make test
       - name: Test Dynamic
         run: cd dynamic && make test
       - name: Upload coverage reports to Codecov
@@ -74,9 +74,9 @@ jobs:
       - name: Install golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-            skip-cache: true
-            skip-pkg-cache: true
-            skip-build-cache: true
-            version: v1.60
+          skip-cache: true
+          skip-pkg-cache: true
+          skip-build-cache: true
+          version: v1.60
       - name: Lint
         run: make lint

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           go-version: 1.23.x
           cache-dependency-path: |
             **/go.sum
-      - run: make -C pf build.testproviders
+      - run: make -C pkg/pf build.testproviders
       - name: Ensure Clean Repo
         run: git diff-files --quiet
       - name: Show Dirty Repo File Changes

.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:

Makefile

@@ -17,7 +17,6 @@ build::
 	go mod tidy
 	go build ${PROJECT}/v3/pkg/...
 	go build ${PROJECT}/v3/internal/...
-	cd testing && go build ./...
 
 fmt::
 	@gofmt -w -s .

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"

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"

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.

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