fixed test

aslilac · aslilac · commit 64cb41ad768d · 2025-05-07T18:04:47.000Z
diff --git a/provisioner/terraform/modules.go b/provisioner/terraform/modules.go
@@ -83,7 +83,6 @@ func getModulesArchive(workdir string) ([]byte, error) {
 		if info.IsDir() {
 			return nil
 		}
-		empty = false
 		archivePath, found := strings.CutPrefix(filePath, workdir+"/")
 		if !found {
 			return xerrors.Errorf("walked invalid file path: %q", filePath)
@@ -93,6 +92,7 @@ func getModulesArchive(workdir string) ([]byte, error) {
 		if err != nil {
 			return xerrors.Errorf("failed to read module file while archiving: %w", err)
 		}
+		empty = false
 		err = w.WriteHeader(&tar.Header{
 			Name: archivePath,
 			Size: int64(len(content)),
diff --git a/provisioner/terraform/modules_internal_test.go b/provisioner/terraform/modules_internal_test.go
@@ -1,10 +1,14 @@
 package terraform
 
 import (
+	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
+	"io/fs"
+	"strings"
 	"testing"
 
+	archivefs "github.com/coder/coder/v2/archive/fs"
 	"github.com/stretchr/testify/require"
 )
 
@@ -13,6 +17,16 @@ func TestGetModulesArchive(t *testing.T) {
 
 	archive, err := getModulesArchive("testdata/modules-source-caching")
 	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")
+	require.NoError(t, err)
+	require.True(t, strings.HasPrefix(string(content), "terraform {"))
+	require.Len(t, content, 3691)
+
+	// It should always be byte-identical to optimize storage
 	hash := sha256.Sum256(archive)
-	require.Equal(t, "0ac7b7b3ff92d1e4bfd7ea1bef64fd7d7ac40434409fac158e383dcdd5ebeb73", hex.EncodeToString(hash[:]))
+	require.Equal(t, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hex.EncodeToString(hash[:]))
 }
