Handle workspaces

Author: blampe

provider-ci/internal/pkg/migrations/consolidate_modules.go

@@ -51,6 +51,9 @@ func (consolidateModules) Migrate(_, outDir string) error {
 	if _, err := run("git", "mv", "-f", "provider/go.sum", "go.sum"); err != nil {
 		return fmt.Errorf("moving provider/go.sum: %w", err)
 	}
+	// Update our workspace, if it exists. It's OK if these fail.
+	_, _ = run("go", "work", "edit", "-dropuse=./provider")
+	_, _ = run("go", "work", "edit", "-use=./")
 
 	// Load the module as JSON.
 	out, err := run("go", "mod", "edit", "-json", "go.mod")
@@ -91,6 +94,8 @@ func (consolidateModules) Migrate(_, outDir string) error {
 	_, _ = run("git", "rm", "examples/go.sum")
 	_, _ = run("git", "rm", "tests/go.mod")
 	_, _ = run("git", "rm", "tests/go.sum")
+	_, _ = run("go", "work", "edit", "-dropuse=./examples")
+	_, _ = run("go", "work", "edit", "-dropuse=./tests")
 
 	// Rewrite our module path and determine our new import, if it's changed.
 	//

provider-ci/internal/pkg/migrations/migrations_test.go

@@ -63,7 +63,7 @@ func assertDirectoryContains(t *testing.T, dir1, dir2 string) {
 		}
 
 		stat, err := os.Stat(filepath.Join(dir1, entry.Name()))
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, entry.IsDir(), stat.IsDir())
 
 		subPath1 := filepath.Join(dir1, entry.Name())

provider-ci/internal/pkg/migrations/testdata/modules/vMajor/GIVEN/go.work

@@ -0,0 +1,7 @@
+go 1.23.3
+
+use (
+    ./examples
+    ./provider
+    ./tests
+)

provider-ci/internal/pkg/migrations/testdata/modules/vMajor/WANT/go.work

@@ -0,0 +1,3 @@
+go 1.23.3
+
+use ./