Skip snapshotter root path creation for standalone convert mode

Signed-off-by: Praful Gupta <prafulgupta6@gmail.com>

Author: prafgup

cmd/soci/commands/convert.go

@@ -96,6 +96,15 @@ var ConvertCommand = &cli.Command{
 				},
 			},
 		}),
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		// Standalone mode uses temp directories and doesn't need the snapshotter root path.
+		// Skipping avoids failures in minimal environments (e.g., scratch images) where the
+		// default root path cannot be created.
+		if cmd.Bool(standaloneFlag) {
+			return ctx, nil
+		}
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Action: func(ctx context.Context, cmd *cli.Command) error {
 		src := cmd.Args().Get(0)
 		if src == "" {

cmd/soci/commands/create.go

@@ -74,6 +74,9 @@ var CreateCommand = &cli.Command{
 	Usage:     "create SOCI index",
 	ArgsUsage: "[flags] <image_ref>",
 	Flags:     slices.Concat(internal.PlatformFlags, createZtocFlags, internal.PrefetchFlags),
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Action: func(ctx context.Context, cmd *cli.Command) error {
 		srcRef := cmd.Args().Get(0)
 		if srcRef == "" {

cmd/soci/commands/index/index.go

@@ -17,12 +17,19 @@
 package index
 
 import (
+	"context"
+
+	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/global"
+	"github.com/awslabs/soci-snapshotter/soci"
 	"github.com/urfave/cli/v3"
 )
 
 var Command = &cli.Command{
 	Name:  "index",
 	Usage: "manage indices",
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Commands: []*cli.Command{
 		listCommand,
 		infoCommand,

cmd/soci/commands/prefetch/prefetch.go

@@ -17,6 +17,10 @@
 package prefetch
 
 import (
+	"context"
+
+	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/global"
+	"github.com/awslabs/soci-snapshotter/soci"
 	"github.com/urfave/cli/v3"
 )
 
@@ -25,6 +29,9 @@ const JSONFlag = "json"
 var Command = &cli.Command{
 	Name:  "prefetch",
 	Usage: "manage prefetch artifacts",
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Commands: []*cli.Command{
 		listCommand,
 		infoCommand,

cmd/soci/commands/push.go

@@ -83,6 +83,9 @@ if they are available in the snapshotter's local content store.
 			},
 		},
 	),
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Action: func(ctx context.Context, cmd *cli.Command) error {
 		ref := cmd.Args().First()
 		if ref == "" {

cmd/soci/commands/rebuild_db.go

@@ -36,6 +36,9 @@ var RebuildDBCommand = &cli.Command{
 	Use after pulling an image to discover SOCI indices/ztocs or after "index rm"
 	when using the containerd content store to clear the database of removed zTOCs.
 	`,
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Action: func(ctx context.Context, cmd *cli.Command) error {
 		client, ctx, cancel, err := internal.NewClient(ctx, cmd)
 		if err != nil {

cmd/soci/commands/ztoc/ztoc.go

@@ -16,11 +16,20 @@
 
 package ztoc
 
-import "github.com/urfave/cli/v3"
+import (
+	"context"
+
+	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/global"
+	"github.com/awslabs/soci-snapshotter/soci"
+	"github.com/urfave/cli/v3"
+)
 
 var Command = &cli.Command{
 	Name:  "ztoc",
 	Usage: "manage ztocs",
+	Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		return ctx, soci.EnsureSnapshotterRootPath(cmd.Root().String(global.RootFlag))
+	},
 	Commands: []*cli.Command{
 		infoCommand,
 		getFileCommand,

cmd/soci/main.go

@@ -42,7 +42,6 @@ import (
 	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/index"
 	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/prefetch"
 	"github.com/awslabs/soci-snapshotter/cmd/soci/commands/ztoc"
-	"github.com/awslabs/soci-snapshotter/soci"
 	"github.com/awslabs/soci-snapshotter/version"
 	"github.com/urfave/cli/v3"
 )
@@ -61,9 +60,6 @@ func main() {
 			commands.PushCommand,
 			commands.RebuildDBCommand,
 		},
-		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
-			return ctx, soci.EnsureSnapshotterRootPath(cmd.String(global.RootFlag))
-		},
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())

soci/fs.go

@@ -33,7 +33,7 @@ func EnsureSnapshotterRootPath(root string) error {
 	// it has the limited permission set as drwx--x--x.
 	// The subsequent oci.New creates a root path dir with too broad permission set.
 	if _, err := os.Stat(root); os.IsNotExist(err) {
-		if err = os.Mkdir(root, 0700); err != nil {
+		if err = os.MkdirAll(root, 0700); err != nil {
 			return err
 		}
 	} else if err != nil {

soci/fs_test.go

@@ -38,6 +38,19 @@ func TestEnsureSnapshotterRootPath(t *testing.T) {
 		}
 	})
 
+	t.Run("root path and parent directories do not exist", func(t *testing.T) {
+		testRoot := t.TempDir()
+
+		root := testRoot + "/var/lib/soci-snapshotter-grpc"
+		if err := EnsureSnapshotterRootPath(root); err != nil {
+			t.Fatalf("expected no error, got %q", err)
+		}
+
+		if _, err := os.Stat(root); err != nil {
+			t.Fatalf("expected %q to exist, got %q", root, err)
+		}
+	})
+
 	t.Run("root path already exists", func(t *testing.T) {
 		testRoot := t.TempDir()
 		root := testRoot + "/var/lib/soci-snapshotter-grpc"