rebase from main

hashicorp · Aug 5, 2024 · da59316 · da59316
1 parent cb4cec2
commit da59316
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 9 deletions.
diff --git a/internal/provider/data_source_archive_file_test.go b/internal/provider/data_source_archive_file_test.go
@@ -24,7 +24,7 @@ func TestAccArchiveFile_Basic(t *testing.T) {
 		ProtoV5ProviderFactories: protoV5ProviderFactories(),
 		Steps: []r.TestStep{
 			{
-				Config: testAccArchiveFileContentConfig(f),
+				Config: testAccArchiveFileContentConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
@@ -49,7 +49,7 @@ func TestAccArchiveFile_Basic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccArchiveFileFileConfig(f),
+				Config: testAccArchiveFileFileConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
@@ -74,7 +74,7 @@ func TestAccArchiveFile_Basic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccArchiveFileDirConfig(f),
+				Config: testAccArchiveFileDirConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
@@ -99,21 +99,21 @@ func TestAccArchiveFile_Basic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccArchiveFileDirExcludesConfig(f),
+				Config: testAccArchiveFileDirExcludesConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
 				),
 			},
 			{
-				Config: testAccArchiveFileDirExcludesGlobConfig(f),
+				Config: testAccArchiveFileDirExcludesGlobConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
 				),
 			},
 			{
-				Config: testAccArchiveFileMultiSourceConfig(f),
+				Config: testAccArchiveFileMultiSourceConfig("zip", f),
 				Check: r.ComposeTestCheckFunc(
 					testAccArchiveFileSize(f, &fileSize),
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
@@ -1404,15 +1404,15 @@ data "archive_file" "foo" {
 `, format, filepath.ToSlash(outputPath))
 }
 
-func testAccArchiveFileDirExcludesGlobConfig(outputPath string) string {
+func testAccArchiveFileDirExcludesGlobConfig(format, outputPath string) string {
 	return fmt.Sprintf(`
 data "archive_file" "foo" {
-  type        = "zip"
+  type        = "%s"
   source_dir  = "test-fixtures/test-dir/test-dir1"
   excludes    = ["test-fixtures/test-dir/test-dir1/file2.txt", "**/file[2-3].txt"]
   output_path = "%s"
 }
-`, filepath.ToSlash(outputPath))
+`, format, filepath.ToSlash(outputPath))
 }
 
 func testAccArchiveFileMultiSourceConfig(format, outputPath string) string {

diff --git a/internal/provider/tar_archiver_test.go b/internal/provider/tar_archiver_test.go
@@ -306,6 +306,32 @@ func TestTarArchiver_Dir_Exclude_DoNotExcludeSymlinkDirectories(t *testing.T) {
 	})
 }
 
+func TestTarArchiver_Dir_Exclude_Glob_DoNotExcludeSymlinkDirectories(t *testing.T) {
+	tarFilePath := filepath.Join(t.TempDir(), "archive-dir-with-symlink-dir.tar")
+
+	archiver := NewTarGzArchiver(tarFilePath)
+	if err := archiver.ArchiveDir("./test-fixtures", ArchiveDirOpts{
+		Excludes: []string{
+			"**/file1.txt",
+			"**/file2.*",
+			"test-dir-with-symlink-dir/test-symlink-dir",
+			"test-symlink-dir-with-symlink-file/test-symlink.txt",
+		},
+	}); err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	ensureTarContents(t, tarFilePath, map[string][]byte{
+		"test-dir/test-dir1/file3.txt":                     []byte("This is file 3"),
+		"test-dir/test-dir2/file3.txt":                     []byte("This is file 3"),
+		"test-dir/test-file.txt":                           []byte("This is test content"),
+		"test-dir-with-symlink-file/test-file.txt":         []byte("This is test content"),
+		"test-dir-with-symlink-file/test-symlink.txt":      []byte("This is test content"),
+		"test-symlink-dir/file3.txt":                       []byte("This is file 3"),
+		"test-symlink-dir-with-symlink-file/test-file.txt": []byte("This is test content"),
+	})
+}
+
 func TestTarArchiver_Dir_Exclude_ExcludeSymlinkDirectories(t *testing.T) {
 	tarFilePath := filepath.Join(t.TempDir(), "archive-dir-with-symlink-dir.tar.gz")
 
@@ -334,6 +360,29 @@ func TestTarArchiver_Dir_Exclude_ExcludeSymlinkDirectories(t *testing.T) {
 	})
 }
 
+func TestTarArchiver_Dir_Exclude_Glob_ExcludeSymlinkDirectories(t *testing.T) {
+	tarFilePath := filepath.Join(t.TempDir(), "archive-dir-with-symlink-dir.zip")
+
+	archiver := NewTarGzArchiver(tarFilePath)
+	err := archiver.ArchiveDir("./test-fixtures", ArchiveDirOpts{
+		Excludes: []string{
+			"test-dir/test-dir1/file1.txt",
+			"**/file[2-3].txt",
+			"test-dir-with-symlink-file",
+		},
+		ExcludeSymlinkDirectories: true,
+	})
+
+	if err != nil {
+		t.Errorf("expected no error: %s", err)
+	}
+
+	ensureTarContents(t, tarFilePath, map[string][]byte{
+		"test-dir/test-dir2/file1.txt": []byte("This is file 1"),
+		"test-dir/test-file.txt":       []byte("This is test content"),
+	})
+}
+
 func ensureTarContents(t *testing.T, tarFilePath string, wants map[string][]byte) {
 	t.Helper()