ok fine maybe fix it for real?? pls??

aslilac · aslilac · commit 5e3930170e01 · 2025-05-07T20:55:59.000Z
diff --git a/provisioner/terraform/modules_internal_test.go b/provisioner/terraform/modules_internal_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
-	"fmt"
 	"io/fs"
 	"path/filepath"
 	"runtime"
@@ -18,9 +17,6 @@ import (
 
 func TestGetModulesArchive(t *testing.T) {
 	t.Parallel()
-	if runtime.GOOS == "windows" {
-		t.Skip()
-	}
 
 	archive, err := getModulesArchive(filepath.Join("testdata", "modules-source-caching"))
 	require.NoError(t, err)
@@ -31,39 +27,18 @@ func TestGetModulesArchive(t *testing.T) {
 	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, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hex.EncodeToString(hash[:]))
-}
-
-// The .tar archive is different on Windows because of git converting LF line
-// endings to CRLF line endings.
-func TestGetModulesArchiveWindows(t *testing.T) {
-	t.Parallel()
 	if runtime.GOOS != "windows" {
-		t.Skip()
+		require.Len(t, content, 3691)
+	} else {
+		require.Len(t, content, 3812)
 	}
 
-	archive, err := getModulesArchive(filepath.Join("testdata", "modules-source-caching"))
-	require.NoError(t, err)
-
-	// debug time baby
-	hashb := sha256.Sum256(archive)
-	fmt.Println("archive hash:", hex.EncodeToString(hashb[:]))
-
-	// 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")
-	fmt.Println("main.tf len:", len(content))
-	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, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hex.EncodeToString(hash[:]))
+	hashBytes := sha256.Sum256(archive)
+	hash := hex.EncodeToString(hashBytes[:])
+	if runtime.GOOS != "windows" {
+		require.Equal(t, "05d2994c1a50ce573fe2c2b29507e5131ba004d15812d8bb0a46dc732f3211f5", hash)
+	} else {
+		require.Equal(t, "0001fc95ac0ac18188931db2ef28c42f51919ee24bc18482fab38d1ea9c7a4e8", hash)
+	}
 }
