Fixes for manifest with symlink

src/pkg/utils/io.go

@@ -249,7 +249,11 @@ func CreatePathAndCopy(source string, destination string) error {
  }
 
  // Copy all the source data into the destination location
- if err := copy.Copy(source, destination); err != nil {
+ if err := copy.Copy(source, destination, copy.Options{
+ OnSymlink: func(_ string) copy.SymlinkAction {
+ return copy.Deep
+ },
+ }); err != nil {
  return err
  }
 
@@ -470,7 +474,7 @@ func CreateReproducibleTarballFromDir(dirPath, dirPrefix, tarballPath string) er
  }
 
  // If it's a file, write its content
- if !info.IsDir() {
+ if info.Mode().IsRegular() {
  file, err := os.Open(filePath)
  if err != nil {
  return fmt.Errorf("error opening file: %w", err)

src/test/e2e/34_manifest_with_symlink_test.go

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+// Package test provides e2e tests for Zarf.
+package test
+
+import (
+ "fmt"
+ "path/filepath"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestManifestWithSymlink(t *testing.T) {
+ t.Log("E2E: Manifest With Symlink")
+ tmpdir := t.TempDir()
+ cachePath := filepath.Join(tmpdir, ".cache-location")
+
+ // Build the package, should succeed, even though there is a symlink in the package.
+ buildPath := filepath.Join("src", "test", "packages", "34-manifest-with-symlink")
+ stdOut, stdErr, err := e2e.Zarf("package", "create", buildPath, "--zarf-cache", cachePath, "-o=build", "--confirm")
+ require.NoError(t, err, stdOut, stdErr)
+
+ path := fmt.Sprintf("build/zarf-package-manifest-with-symlink-%s-0.0.1.tar.zst", e2e.Arch)
+ require.FileExists(t, path)
+ defer e2e.CleanFiles(path)
+}

src/test/packages/34-manifest-with-symlink/manifests/img/test.txt

@@ -0,0 +1 @@
+test

src/test/packages/34-manifest-with-symlink/manifests/resources/img

@@ -0,0 +1 @@
+../img

src/test/packages/34-manifest-with-symlink/zarf.yaml

@@ -0,0 +1,14 @@
+kind: ZarfPackageConfig
+metadata:
+ name: manifest-with-symlink
+ description: Example with a symbolic link embedded in it
+ version: 0.0.1
+
+components:
+ - name: manifest-with-symlink
+ required: true
+ manifests:
+ - name: manifest-with-symlink
+ namespace: manifest-symlink
+ files:
+ - manifests