fix: restorer command has no -daemon args in Platform API version 0.11 (#2393)

Author: jamesgetx

cnb-builder-shim/cmd/lifecycle-driver/main.go

@@ -205,7 +205,7 @@ func getBuilderSteps(ctx context.Context) []phase.Step {
 	}
 	if *cacheImage != "" {
 		steps = append(steps, phase.MakeRestorerStep(ctx, *lifecycleDir, *cacheImage, *groupPath, *layersDir,
-			*logLevel, *useDaemon, *uid, *gid))
+			*logLevel, *uid, *gid))
 	}
 	steps = append(steps,
 		phase.MakeBuilderStep(ctx, *lifecycleDir, *appDir, *groupPath, *planPath, *layersDir,

cnb-builder-shim/pkg/lifecycle/phase/analyzer.go

@@ -34,6 +34,8 @@ func MakeAnalyzerStep(
 	uid, gid uint32,
 ) Step {
 	var opts []CmdOptsProvider
+
+	// see analyzer command args: https://github.com/buildpacks/spec/blob/platform/v0.11/platform.md#analyzer
 	args := []string{
 		"-analyzed", analyzedPath,
 		"-layers", layersDir,
@@ -54,5 +56,4 @@ func MakeAnalyzerStep(
 	args = append(args, outputImage)
 	cmd := exec.CommandContext(ctx, filepath.Join(lifecycleDir, "analyzer"), args...)
 	return makeStep("Analyze", "Analyzing optimization plan...", cmd, opts...)
-
 }

cnb-builder-shim/pkg/lifecycle/phase/builder.go

@@ -31,6 +31,7 @@ func MakeBuilderStep(
 	lifecycleDir, appDir, groupPath, planPath, layersDir, logLevel string,
 	uid, gid uint32,
 ) Step {
+	// see builder command args: https://github.com/buildpacks/spec/blob/platform/v0.11/platform.md#builder
 	args := []string{
 		"-app", appDir,
 		"-group", groupPath,

cnb-builder-shim/pkg/lifecycle/phase/detector.go

@@ -31,6 +31,7 @@ func MakeDetectorStep(
 	ctx context.Context,
 	lifecycleDir, appDir, orderPath, groupPath, planPath, layersDir, logLevel string, uid, gid uint32,
 ) Step {
+	// see detector command args: https://github.com/buildpacks/spec/blob/platform/v0.11/platform.md#detector
 	args := []string{
 		"-app", appDir,
 		"-order", orderPath,

cnb-builder-shim/pkg/lifecycle/phase/exporter.go

@@ -30,8 +30,11 @@ import (
 func MakeExporterStep(ctx context.Context,
 	lifecycleDir, outputImage, appDir, analyzedPath, cacheImage, groupPath, layersDir, logLevel string,
 	useDaemon bool,
-	uid, gid uint32) Step {
+	uid, gid uint32,
+) Step {
 	var opts []CmdOptsProvider
+
+	// see exporter command args: https://github.com/buildpacks/spec/blob/platform/v0.11/platform.md#exporter
 	args := []string{
 		"-app", appDir,
 		"-analyzed", analyzedPath,
@@ -44,7 +47,6 @@ func MakeExporterStep(ctx context.Context,
 	// export cache when cacheImage is set
 	if cacheImage != "" {
 		args = append(args, "-cache-image", cacheImage)
-
 	}
 	if useDaemon {
 		args = append(args, "-daemon")

cnb-builder-shim/pkg/lifecycle/phase/restorer.go

@@ -30,10 +30,11 @@ import (
 func MakeRestorerStep(
 	ctx context.Context,
 	lifecycleDir, cacheImage, groupPath, layersDir, logLevel string,
-	useDaemon bool,
 	uid, gid uint32,
 ) Step {
 	var opts []CmdOptsProvider
+
+	// see restorer command args: https://github.com/buildpacks/spec/blob/platform/v0.11/platform.md#restorer
 	args := []string{
 		"-cache-image", cacheImage,
 		"-group", groupPath,
@@ -42,12 +43,9 @@ func MakeRestorerStep(
 		"-uid", fmt.Sprintf("%d", uid),
 		"-gid", fmt.Sprintf("%d", gid),
 	}
-	if useDaemon {
-		args = append(args, "-daemon")
-		opts = append(opts, WithRoot())
-	} else {
-		opts = append(opts, WithUser(uid, gid))
-	}
+
+	opts = append(opts, WithUser(uid, gid))
+
 	cmd := exec.CommandContext(ctx, filepath.Join(lifecycleDir, "restorer"), args...)
 	return makeStep("Restore", "Restoring layers from the cache...", cmd, opts...)
 }