Merge branch 'main' into chisel-db-manifest-package

.github/workflows/spread.yml

@@ -29,4 +29,4 @@ jobs:
       - name: Build and run spread
         run: |
           (cd _spread/cmd/spread && go build)
-          _spread/cmd/spread/spread -v focal jammy mantic
+          _spread/cmd/spread/spread -v focal jammy mantic noble

internal/slicer/slicer.go

@@ -180,7 +180,7 @@ func Run(options *RunOptions) (*Report, error) {
 			return nil
 		}
 
-		relPath := filepath.Clean("/" + strings.TrimLeft(o.Path, targetDir))
+		relPath := filepath.Clean("/" + strings.TrimPrefix(o.Path, targetDir))
 		if o.Mode.IsDir() {
 			relPath = relPath + "/"
 		}

internal/slicer/slicer_test.go

@@ -1021,6 +1021,36 @@ var slicerTests = []slicerTest{{
 	},
 	filesystem: map[string]string{},
 	report:     map[string]string{},
+}, {
+	summary: "Relative paths are properly trimmed during extraction",
+	slices:  []setup.SliceKey{{"test-package", "myslice"}},
+	pkgs: map[string][]byte{
+		"test-package": testutil.MustMakeDeb([]testutil.TarEntry{
+			// This particular path starting with "/foo" is chosen to test for
+			// a particular bug; which appeared due to the usage of
+			// strings.TrimLeft() instead strings.TrimPrefix() to determine a
+			// relative path. Since TrimLeft takes in a cutset instead of a
+			// prefix, the desired relative path was not produced.
+			// See https://github.com/canonical/chisel/pull/145.
+			testutil.Dir(0755, "./foo-bar/"),
+		}),
+	},
+	hackopt: func(c *C, opts *slicer.RunOptions) {
+		opts.TargetDir = filepath.Join(filepath.Clean(opts.TargetDir), "foo")
+		err := os.Mkdir(opts.TargetDir, 0755)
+		c.Assert(err, IsNil)
+	},
+	release: map[string]string{
+		"slices/mydir/test-package.yaml": `
+			package: test-package
+			slices:
+				myslice:
+					contents:
+						/foo-bar/:
+					mutate: |
+						content.list("/foo-bar/")
+		`,
+	},
 }}
 
 var defaultChiselYaml = `

tests/basic/task.yaml

@@ -4,16 +4,18 @@ execute: |
   rootfs_folder=rootfs_${RELEASE}
   mkdir -p $rootfs_folder
   chisel cut --release ${OS}-${RELEASE} \
-    --root $rootfs_folder ca-certificates_data openssl_bins
-  
+    --root $rootfs_folder base-passwd_data openssl_bins
+
   # make sure $rootfs_folder is not empty
   ls ${rootfs_folder}/*
 
-  # with the ca-certificates mutation script, we can assert that:
-  # - etc/ssl/certs/ca-certificates.crt is not empty
-  # - usr/share/ca-certificates/mozilla/ does not exist
-  test -s ${rootfs_folder}/etc/ssl/certs/ca-certificates.crt 
-  test ! -d ${rootfs_folder}/usr/share/ca-certificates/mozilla 
+  # with the base-passwd mutation script, we can assert that:
+  # - etc/{group,passwd} are not empty and not equal to FIXME
+  # - usr/share/base-passwd/{group.master,passwd.master} do not exist
+  test -s ${rootfs_folder}/etc/group && test "$(< ${rootfs_folder}/etc/group)" != "FIXME"
+  test -s ${rootfs_folder}/etc/passwd && test "$(< ${rootfs_folder}/etc/passwd)" != "FIXME"
+  test ! -e ${rootfs_folder}/usr/share/base-passwd/group.master
+  test ! -e ${rootfs_folder}/usr/share/base-passwd/passwd.master
 
   # with the openssl pkg, both internal and external dependencies need to be met, for:
   # - libc6_libs