Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Migration to fixup bridge imports #1103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions tools/sourcemigrator/bridge-imports.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/pf"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf"

alias

@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/pf/proto"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto"

alias

@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/pf/tfgen"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen"

alias

@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge"

alias

@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/testing/x"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing"

alias

@@
var alias identifier
@@
-import alias "github.com/pulumi/pulumi-terraform-bridge/x/muxer"
+import alias "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer"

alias

53 changes: 26 additions & 27 deletions tools/sourcemigrator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,31 @@ function run(command: string): shell.ShellString {
return checkError(shell.exec(command));
}

// function respectSchemaVersion(): SourceMigration {
// return {
// name: "Respect Schema Version",
// async execute(context) {
// const patchPath = fs.realpathSync("respectSchemaVersion.patch");
// shell.pushd(context.dir);
// try {
// // Apply patch
// run(
// `go run github.com/uber-go/gopatch@latest -p "${patchPath}" ./provider/resources.go`
// );
// // Format the code - twice to ensure that the code is formatted correctly
// run(`go install mvdan.cc/gofumpt@latest`);
// run(`gofumpt -w ./provider/resources.go`);
// run(`gofumpt -w ./provider/resources.go`);
// // Check if we've made changes
// const gitStatus = run(`git status --porcelain`).stdout;
// if (gitStatus.includes("provider/resources.go")) {
// run(`make tfgen build`);
// }
// } finally {
// shell.popd();
// }
// },
// };
// }
function fixupBridgeImports(): SourceMigration {
return {
name: "Fixup Bridge Imports",
async execute(context) {
const patchPath = fs.realpathSync("bridge-imports.patch");
shell.pushd(context.dir);
try {
// Apply patch
run(`go run github.com/uber-go/gopatch@v0.4.0 -p "${patchPath}" .`);
run(
`for MODFILE in $(find . -name go.mod); do pushd $(dirname $MODFILE); go mod tidy; popd; done`
);
// Format the code - twice to ensure that the code is formatted correctly
run(
`go run mvdan.cc/gofumpt@v0.7.0 -w $(git diff --name-only) || true`
);
run(
`go run mvdan.cc/gofumpt@v0.7.0 -w $(git diff --name-only) || true`
);
} finally {
shell.popd();
}
},
};
}

function removeExplicitSDKDependency(): SourceMigration {
return {
Expand Down Expand Up @@ -137,7 +136,7 @@ async function runMigrations(
}

function allMigrations(): SourceMigration[] {
return [removeExplicitSDKDependency()];
return [fixupBridgeImports(), removeExplicitSDKDependency()];
}

async function main() {
Expand Down
91 changes: 0 additions & 91 deletions tools/sourcemigrator/respectSchemaVersion.patch

This file was deleted.

Loading