adjust to make registry and fileserver subcommands

cmd/hauler/cli/store.go

@@ -108,12 +108,28 @@ func addStoreLoad() *cobra.Command {
 }
 
 func addStoreServe() *cobra.Command {
-	o := &store.ServeOpts{RootOpts: rootStoreOpts}
-
 	cmd := &cobra.Command{
 		Use:   "serve",
 		Short: "Expose the content of a local store through an OCI compliant registry or file server",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			return cmd.Help()
+		},
+	}
+	cmd.AddCommand(
+		addStoreServeRegistry(),
+		addStoreServeFiles(),
+	)
+
+	return cmd
+}
+
+// RegistryCmd serves the embedded registry
+func addStoreServeRegistry() *cobra.Command {
+    o := &store.ServeRegistryOpts{RootOpts: rootStoreOpts}
+	cmd := &cobra.Command{
+        Use:   "registry",
+        Short: "Serve the embedded registry",
+        RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
 			s, err := o.Store(ctx)
@@ -121,12 +137,36 @@ func addStoreServe() *cobra.Command {
 				return err
 			}
 
-			return store.ServeCmd(ctx, o, s)
-		},
-	}
-	o.AddFlags(cmd)
+			return store.ServeRegistryCmd(ctx, o, s)
+        },
+    }
 
-	return cmd
+    o.AddFlags(cmd)
+
+    return cmd
+}
+
+// FileServerCmd serves the file server
+func addStoreServeFiles() *cobra.Command {
+    o := &store.ServeFilesOpts{RootOpts: rootStoreOpts}
+	cmd := &cobra.Command{
+        Use:   "fileserver",
+        Short: "Serve the file server",
+        RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+
+			s, err := o.Store(ctx)
+			if err != nil {
+				return err
+			}
+
+			return store.ServeFilesCmd(ctx, o, s)
+        },
+    }
+
+    o.AddFlags(cmd)
+
+    return cmd
 }
 
 func addStoreSave() *cobra.Command {

cmd/hauler/cli/store/serve.go

@@ -20,109 +20,100 @@ import (
 	"github.com/rancherfederal/hauler/pkg/log"
 )
 
-type ServeOpts struct {
+type ServeRegistryOpts struct {
 	*RootOpts
 
 	Port       int
 	RootDir    string
 	ConfigFile string
 
-	Files      bool
+	storedir string
+}
+
+func (o *ServeRegistryOpts) AddFlags(cmd *cobra.Command) {
+	f := cmd.Flags()
+
+	f.IntVarP(&o.Port, "port", "p", 5000, "Port to listen on.")
+	f.StringVar(&o.RootDir, "directory", "registry", "Directory to use for backend.  Defaults to $PWD/registry")
+	f.StringVarP(&o.ConfigFile, "config", "c", "", "Path to a config file, will override all other configs")
+}
+
+func ServeRegistryCmd(ctx context.Context, o *ServeRegistryOpts, s *store.Layout) error {
+	l := log.FromContext(ctx)
+	ctx = dcontext.WithVersion(ctx, version.Version)
+
+	tr := server.NewTempRegistry(ctx, o.RootDir)
+	if err := tr.Start(); err != nil {
+		return err
+	}
+
+	opts := &CopyOpts{}
+	if err := CopyCmd(ctx, opts, s, "registry://"+tr.Registry()); err != nil {
+		return err
+	}
+
+	tr.Close()
+
+	cfg := o.defaultRegistryConfig()
+	if o.ConfigFile != "" {
+		ucfg, err := loadConfig(o.ConfigFile)
+		if err != nil {
+			return err
+		}
+		cfg = ucfg
+	}
+
+	l.Infof("starting registry on port [%d]", o.Port)
+	r, err := server.NewRegistry(ctx, cfg)
+	if err != nil {
+		return err
+	}
+	
+	if err = r.ListenAndServe(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type ServeFilesOpts struct {
+	*RootOpts
+
+	Port       int
+	RootDir    string
 
 	storedir string
 }
 
-func (o *ServeOpts) AddFlags(cmd *cobra.Command) {
+func (o *ServeFilesOpts) AddFlags(cmd *cobra.Command) {
 	f := cmd.Flags()
 
-	f.BoolVarP(&o.Files, "files", "f", false, "Toggle file server instead of registry")
-	f.IntVarP(&o.Port, "port", "p", 0, "Port to listen on.  Defaults to 5000 for registry and 8080 for file server.")
-	f.StringVar(&o.RootDir, "directory", "", "Directory to use for backend.  Defaults to $PWD/registry for registry and $PWD/store-files for file server.")
-	f.StringVarP(&o.ConfigFile, "config", "c", "", "Path to a config file, will override all other configs")
-
-	cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
-		if o.Port == 0 {
-			o.Port = getDefaultPort(o.Files)
-		}
-		if o.RootDir == "" {
-			o.RootDir = getDefaultDirectory(o.Files)
-		}
-		return nil
-	}
+	f.IntVarP(&o.Port, "port", "p", 8080, "Port to listen on.")
+	f.StringVar(&o.RootDir, "directory", "store-files", "Directory to use for backend.  Defaults to $PWD/store-files")
 }
 
-func getDefaultPort(files bool) int {
-	if files {
-		return 8080
-	}
-	return 5000
-}
-
-func getDefaultDirectory(files bool) string {
-	if files {
-		return "store-files"
-	}
-	return "registry"
-}
-
-// ServeCmd serves the embedded registry almost identically to how distribution/v3 does it
-func ServeCmd(ctx context.Context, o *ServeOpts, s *store.Layout) error {
+func ServeFilesCmd(ctx context.Context, o *ServeFilesOpts, s *store.Layout) error {
 	l := log.FromContext(ctx)
 	ctx = dcontext.WithVersion(ctx, version.Version)
 
-	if o.Files {
-		opts := &CopyOpts{}
-		if err := CopyCmd(ctx, opts, s, "dir://"+o.RootDir); err != nil {
-			return err
-		}
-		
-		cfg := server.FileConfig{
-			Root: o.RootDir,
-			Port: o.Port,
-		}
+	opts := &CopyOpts{}
+	if err := CopyCmd(ctx, opts, s, "dir://"+o.RootDir); err != nil {
+		return err
+	}
 	
-		f, err := server.NewFile(ctx, cfg)
-		if err != nil {
-			return err
-		}
-		
-		l.Infof("starting file server on port [%d]", o.Port)
-		if err := f.ListenAndServe(); err != nil {
-			return err
-		}
+	cfg := server.FileConfig{
+		Root: o.RootDir,
+		Port: o.Port,
+	}
 
-	} else { // start registry
-
-		tr := server.NewTempRegistry(ctx, o.RootDir)
-		if err := tr.Start(); err != nil {
-			return err
-		}
-
-		opts := &CopyOpts{}
-		if err := CopyCmd(ctx, opts, s, "registry://"+tr.Registry()); err != nil {
-			return err
-		}
-
-		tr.Close()
-
-		cfg := o.defaultConfig()
-		if o.ConfigFile != "" {
-			ucfg, err := loadConfig(o.ConfigFile)
-			if err != nil {
-				return err
-			}
-			cfg = ucfg
-		}
-
-		l.Infof("starting registry on port [%d]", o.Port)
-		r, err := server.NewRegistry(ctx, cfg)
-		if err != nil {
-			return err
-		}
-		
-		if err = r.ListenAndServe(); err != nil {
-			return err
-		}
+	f, err := server.NewFile(ctx, cfg)
+	if err != nil {
+		return err
+	}
+	
+	l.Infof("starting file server on port [%d]", o.Port)
+	if err := f.ListenAndServe(); err != nil {
+		return err
 	}
 
 	return nil
@@ -137,7 +128,7 @@ func loadConfig(filename string) (*configuration.Configuration, error) {
 	return configuration.Parse(f)
 }
 
-func (o *ServeOpts) defaultConfig() *configuration.Configuration {
+func (o *ServeRegistryOpts) defaultRegistryConfig() *configuration.Configuration {
 	cfg := &configuration.Configuration{
 		Version: "0.1",
 		Storage: configuration.Storage{