add flag for decompressing component layer tars

src/cmd/tools.go

@@ -6,6 +6,8 @@ package cmd
 
 import (
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/anchore/syft/cmd/syft/cli"
 	"github.com/defenseunicorns/zarf/src/config"
@@ -22,6 +24,7 @@ import (
 )
 
 var subAltNames []string
+var decompressLayers bool
 
 var toolsCmd = &cobra.Command{
 	Use:     "tools",
@@ -64,6 +67,23 @@ var archiverDecompressCmd = &cobra.Command{
 		if err != nil {
 			message.Fatal(err, lang.CmdToolsArchiverDecompressErr)
 		}
+
+		// Decompress component layers in the destination path
+		if decompressLayers {
+			layersDir := filepath.Join(destinationPath, "components")
+
+			files, err := os.ReadDir(layersDir)
+			if err != nil {
+				message.Fatalf(err, "failed to read the layers of components")
+			}
+			for _, file := range files {
+				if strings.HasSuffix(file.Name(), "tar.zst") {
+					if err := archiver.Unarchive(filepath.Join(layersDir, file.Name()), layersDir); err != nil {
+						message.Fatalf(err, "failed to decompress the component layer")
+					}
+				}
+			}
+		}
 	},
 }
 
@@ -173,6 +193,7 @@ func init() {
 
 	archiverCmd.AddCommand(archiverCompressCmd)
 	archiverCmd.AddCommand(archiverDecompressCmd)
+	archiverDecompressCmd.Flags().BoolVar(&decompressLayers, "decompress-all", false, "Decompress all layers in the archive")
 
 	cranePlatformOptions := config.GetCraneOptions(false)
 

src/test/e2e/04_create_templating_test.go

@@ -36,7 +36,7 @@ func TestCreateTemplating(t *testing.T) {
 	stdOut, stdErr, err := e2e.execZarfCommand("package", "create", "examples/package-variables", "--set", "CONFIG_MAP=simple-configmap.yaml", "--set", "ACTION=template", "--confirm", "--zarf-cache", cachePath)
 	require.NoError(t, err, stdOut, stdErr)
 
-	stdOut, stdErr, err = e2e.execZarfCommand("t", "archiver", "decompress", pkgName, decompressPath)
+	stdOut, stdErr, err = e2e.execZarfCommand("t", "archiver", "decompress", pkgName, decompressPath, "--decompress-all")
 	require.NoError(t, err, stdOut, stdErr)
 
 	// Check that the configmap exists and is readable

src/test/e2e/22_git_and_flux_test.go

@@ -162,7 +162,7 @@ func testRemovingTagsOnCreate(t *testing.T) {
 
 	// Extract the built package so we can inspect the repositories that are included
 	extractedDirPath := "tmp-extraction"
-	stdOut, stdErr, err := e2e.execZarfCommand("tools", "archiver", "decompress", testPackagePath, extractedDirPath, "-l=trace")
+	stdOut, stdErr, err := e2e.execZarfCommand("tools", "archiver", "decompress", testPackagePath, extractedDirPath, "-l=trace", "--decompress-all")
 	defer e2e.cleanFiles(extractedDirPath)
 	require.NoError(t, err, stdOut, stdErr)