testing and cleanup

aslilac · aslilac · commit d8768e11a0d2 · 2025-05-09T18:28:50.000Z
diff --git a/provisioner/terraform/modules.go b/provisioner/terraform/modules.go
@@ -68,25 +68,32 @@ func getModules(workdir string) ([]*proto.Module, error) {
 }
 
 func getModulesArchive(workdir string) ([]byte, error) {
-	modulesFile := getModulesFilePath(workdir)
-	modulesFileBytes, err := os.ReadFile(modulesFile)
+	modulesFile, err := os.ReadFile(getModulesFilePath(workdir))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return []byte{}, nil
 		}
 		return nil, xerrors.Errorf("failed to read modules.json: %w", err)
 	}
-	var modules []*proto.Module
-	err = json.Unmarshal(modulesFileBytes, &modules)
+	var m struct{ Modules []*proto.Module }
+	err = json.Unmarshal(modulesFile, &m)
 	if err != nil {
 		return nil, xerrors.Errorf("failed to parse modules.json: %w", err)
 	}
 
 	empty := true
 	var b bytes.Buffer
 	w := tar.NewWriter(&b)
-	for _, module := range modules {
-		err := filepath.WalkDir(module.Dir, func(filePath string, info fs.DirEntry, err error) error {
+
+	for _, module := range m.Modules {
+		// Check to make sure that the module is a remote module fetched by
+		// Terraform. Any module that doesn't start with this path is already local,
+		// and should be part of the template files already.
+		if !strings.HasPrefix(module.Dir, ".terraform/modules/") {
+			continue
+		}
+
+		err := filepath.WalkDir(filepath.Join(workdir, module.Dir), func(filePath string, info fs.DirEntry, err error) error {
 			if err != nil {
 				return xerrors.Errorf("failed to create modules archive: %w", err)
 			}
@@ -122,6 +129,22 @@ func getModulesArchive(workdir string) ([]byte, error) {
 			return nil, err
 		}
 	}
+
+	err = w.WriteHeader(&tar.Header{
+		Name: ".terraform/modules/modules.json",
+		Size: int64(len(modulesFile)),
+		Mode: 0o644,
+		Uid:  1000,
+		Gid:  1000,
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("failed to write modules.json to archive: %w", err)
+	}
+	_, err = w.Write(modulesFile)
+	if err != nil {
+		return nil, xerrors.Errorf("failed to write modules.json to archive: %w", err)
+	}
+
 	err = w.Close()
 	if err != nil {
 		return nil, xerrors.Errorf("failed to close module files archive: %w", err)
diff --git a/provisioner/terraform/modules_internal_test.go b/provisioner/terraform/modules_internal_test.go
@@ -25,9 +25,14 @@ func TestGetModulesArchive(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check that all of the files it should contain are correct
-	r := bytes.NewBuffer(archive)
-	tarfs := archivefs.FromTarReader(r)
-	content, err := fs.ReadFile(tarfs, ".terraform/modules/example_module/main.tf")
+	b := bytes.NewBuffer(archive)
+	tarfs := archivefs.FromTarReader(b)
+
+	content, err := fs.ReadFile(tarfs, ".terraform/modules/modules.json")
+	require.NoError(t, err)
+	require.True(t, strings.HasPrefix(string(content), `{"Modules":[{"Key":"","Source":"","Dir":"."},`))
+
+	content, err = fs.ReadFile(tarfs, ".terraform/modules/example_module/main.tf")
 	require.NoError(t, err)
 	require.True(t, strings.HasPrefix(string(content), "terraform {"))
 	if runtime.GOOS != "windows" {
@@ -36,6 +41,9 @@ func TestGetModulesArchive(t *testing.T) {
 		require.Len(t, content, 3812)
 	}
 
+	_, err = fs.ReadFile(tarfs, ".terraform/modules/stuff_that_should_not_be_included/nothing.txt")
+	require.Error(t, err)
+
 	// It should always be byte-identical to optimize storage
 	hashBytes := sha256.Sum256(archive)
 	hash := hex.EncodeToString(hashBytes[:])
diff --git a/provisioner/terraform/testdata/modules-source-caching/.terraform/modules/stuff_that_should_not_be_included/nothing.txt b/provisioner/terraform/testdata/modules-source-caching/.terraform/modules/stuff_that_should_not_be_included/nothing.txt
@@ -0,0 +1 @@
+ここには何もありません
