git-bundle-server: add constructors for all commands

In later patches, a logger struct will need to be a member of each command
struct to facilitate structured logging & tracing. Like the 'web-server'
command in ca23190 (bundle-server: add 'web-server' subcommand, 2023-01-05),
add explicit constructors (i.e., 'New<Command>()') to the remaining
commands.

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

cmd/git-bundle-server/delete.go

@@ -8,19 +8,23 @@ import (
 	"github.com/github/git-bundle-server/internal/core"
 )
 
-type Delete struct{}
+type deleteCmd struct{}
 
-func (Delete) Name() string {
+func NewDeleteCommand() argparse.Subcommand {
+	return &deleteCmd{}
+}
+
+func (deleteCmd) Name() string {
 	return "delete"
 }
 
-func (Delete) Description() string {
+func (deleteCmd) Description() string {
 	return `
 Remove the configuration for the given '<route>' and delete its repository
 data.`
 }
 
-func (Delete) Run(ctx context.Context, args []string) error {
+func (deleteCmd) Run(ctx context.Context, args []string) error {
 	parser := argparse.NewArgParser("git-bundle-server delete <route>")
 	route := parser.PositionalString("route", "the route to delete")
 	parser.Parse(ctx, args)

cmd/git-bundle-server/init.go

@@ -10,19 +10,23 @@ import (
 	"github.com/github/git-bundle-server/internal/git"
 )
 
-type Init struct{}
+type initCmd struct{}
 
-func (Init) Name() string {
+func NewInitCommand() argparse.Subcommand {
+	return &initCmd{}
+}
+
+func (initCmd) Name() string {
 	return "init"
 }
 
-func (Init) Description() string {
+func (initCmd) Description() string {
 	return `
 Initialize a repository by cloning a bare repo from '<url>', whose bundles
 should be hosted at '<route>'.`
 }
 
-func (Init) Run(ctx context.Context, args []string) error {
+func (initCmd) Run(ctx context.Context, args []string) error {
 	parser := argparse.NewArgParser("git-bundle-server init <url> <route>")
 	url := parser.PositionalString("url", "the URL of a repository to clone")
 	// TODO: allow parsing <route> out of <url>

cmd/git-bundle-server/main.go

@@ -10,12 +10,12 @@ import (
 
 func all() []argparse.Subcommand {
 	return []argparse.Subcommand{
-		Delete{},
-		Init{},
-		Start{},
-		Stop{},
-		Update{},
-		UpdateAll{},
+		NewDeleteCommand(),
+		NewInitCommand(),
+		NewStartCommand(),
+		NewStopCommand(),
+		NewUpdateCommand(),
+		NewUpdateAllCommand(),
 		NewWebServerCommand(),
 	}
 }

cmd/git-bundle-server/start.go

@@ -9,19 +9,23 @@ import (
 	"github.com/github/git-bundle-server/internal/core"
 )
 
-type Start struct{}
+type startCmd struct{}
 
-func (Start) Name() string {
+func NewStartCommand() argparse.Subcommand {
+	return &startCmd{}
+}
+
+func (startCmd) Name() string {
 	return "start"
 }
 
-func (Start) Description() string {
+func (startCmd) Description() string {
 	return `
 Start computing bundles and serving content for the repository at the
 specified '<route>'.`
 }
 
-func (Start) Run(ctx context.Context, args []string) error {
+func (startCmd) Run(ctx context.Context, args []string) error {
 	parser := argparse.NewArgParser("git-bundle-server start <route>")
 	route := parser.PositionalString("route", "the route for which bundles should be generated")
 	parser.Parse(ctx, args)

cmd/git-bundle-server/stop.go

@@ -7,19 +7,23 @@ import (
 	"github.com/github/git-bundle-server/internal/core"
 )
 
-type Stop struct{}
+type stopCmd struct{}
 
-func (Stop) Name() string {
+func NewStopCommand() argparse.Subcommand {
+	return &stopCmd{}
+}
+
+func (stopCmd) Name() string {
 	return "stop"
 }
 
-func (Stop) Description() string {
+func (stopCmd) Description() string {
 	return `
 Stop computing bundles or serving content for the repository at the
 specified '<route>'.`
 }
 
-func (Stop) Run(ctx context.Context, args []string) error {
+func (stopCmd) Run(ctx context.Context, args []string) error {
 	parser := argparse.NewArgParser("git-bundle-server stop <route>")
 	route := parser.PositionalString("route", "the route for which bundles should stop being generated")
 	parser.Parse(ctx, args)

cmd/git-bundle-server/update-all.go

@@ -11,18 +11,22 @@ import (
 	"github.com/github/git-bundle-server/internal/core"
 )
 
-type UpdateAll struct{}
+type updateAllCmd struct{}
 
-func (UpdateAll) Name() string {
+func NewUpdateAllCommand() argparse.Subcommand {
+	return &updateAllCmd{}
+}
+
+func (updateAllCmd) Name() string {
 	return "update-all"
 }
 
-func (UpdateAll) Description() string {
+func (updateAllCmd) Description() string {
 	return `
 For every configured route, run 'git-bundle-server update <options> <route>'.`
 }
 
-func (UpdateAll) Run(ctx context.Context, args []string) error {
+func (updateAllCmd) Run(ctx context.Context, args []string) error {
 	user, err := common.NewUserProvider().CurrentUser()
 	if err != nil {
 		return err

cmd/git-bundle-server/update.go

@@ -9,20 +9,24 @@ import (
 	"github.com/github/git-bundle-server/internal/core"
 )
 
-type Update struct{}
+type updateCmd struct{}
 
-func (Update) Name() string {
+func NewUpdateCommand() argparse.Subcommand {
+	return &updateAllCmd{}
+}
+
+func (updateCmd) Name() string {
 	return "update"
 }
 
-func (Update) Description() string {
+func (updateCmd) Description() string {
 	return `
 For the repository in the current directory (or the one specified by
 '<route>'), fetch the latest content from the remote, create a new set of
 bundles, and update the bundle list.`
 }
 
-func (Update) Run(ctx context.Context, args []string) error {
+func (updateCmd) Run(ctx context.Context, args []string) error {
 	parser := argparse.NewArgParser("git-bundle-server update <route>")
 	route := parser.PositionalString("route", "the route to update")
 	parser.Parse(ctx, args)

cmd/git-bundle-server/web-server.go

@@ -15,30 +15,30 @@ import (
 	"github.com/github/git-bundle-server/internal/daemon"
 )
 
-type webServer struct {
+type webServerCmd struct {
 	user       common.UserProvider
 	cmdExec    common.CommandExecutor
 	fileSystem common.FileSystem
 }
 
-func NewWebServerCommand() *webServer {
-	// Create dependencies
-	return &webServer{
+func NewWebServerCommand() argparse.Subcommand {
+	// Create subcommand-specific dependencies
+	return &webServerCmd{
 		user:       common.NewUserProvider(),
 		cmdExec:    common.NewCommandExecutor(),
 		fileSystem: common.NewFileSystem(),
 	}
 }
 
-func (webServer) Name() string {
+func (webServerCmd) Name() string {
 	return "web-server"
 }
 
-func (webServer) Description() string {
+func (webServerCmd) Description() string {
 	return `Manage the web server hosting bundle content`
 }
 
-func (w *webServer) getDaemonConfig() (*daemon.DaemonConfig, error) {
+func (w *webServerCmd) getDaemonConfig() (*daemon.DaemonConfig, error) {
 	// Find git-bundle-web-server
 	// First, search for it on the path
 	programPath, err := exec.LookPath("git-bundle-web-server")
@@ -77,7 +77,7 @@ func (w *webServer) getDaemonConfig() (*daemon.DaemonConfig, error) {
 	}, nil
 }
 
-func (w *webServer) startServer(ctx context.Context, args []string) error {
+func (w *webServerCmd) startServer(ctx context.Context, args []string) error {
 	// Parse subcommand arguments
 	parser := argparse.NewArgParser("git-bundle-server web-server start [-f|--force]")
 
@@ -144,7 +144,7 @@ func (w *webServer) startServer(ctx context.Context, args []string) error {
 	return nil
 }
 
-func (w *webServer) stopServer(ctx context.Context, args []string) error {
+func (w *webServerCmd) stopServer(ctx context.Context, args []string) error {
 	// Parse subcommand arguments
 	parser := argparse.NewArgParser("git-bundle-server web-server stop [--remove]")
 	remove := parser.Bool("remove", false, "Remove the web server daemon configuration from the system after stopping")
@@ -175,7 +175,7 @@ func (w *webServer) stopServer(ctx context.Context, args []string) error {
 	return nil
 }
 
-func (w *webServer) Run(ctx context.Context, args []string) error {
+func (w *webServerCmd) Run(ctx context.Context, args []string) error {
 	// Parse command arguments
 	parser := argparse.NewArgParser("git-bundle-server web-server (start|stop) <options>")
 	parser.Subcommand(argparse.NewSubcommand("start", "Start the web server", w.startServer))