refactor: move minio/worker/workstealer subcommands to be under a com…

…ponents/ command subtree

Signed-off-by: Nick Mitchell <[email protected]>

cmd/subcommands/component.go

@@ -0,0 +1,19 @@
+package subcommands
+
+import (
+	"github.com/spf13/cobra"
+
+	"lunchpail.io/cmd/subcommands/component"
+)
+
+func init() {
+	cmd := &cobra.Command{
+		Use:   "component",
+		Short: "Commands related to specific components",
+	}
+	rootCmd.AddCommand(cmd)
+
+	cmd.AddCommand(component.Minio())
+	cmd.AddCommand(component.Worker())
+	cmd.AddCommand(component.WorkStealer())
+}

cmd/subcommands/minio.go → cmd/subcommands/component/minio.go

@@ -1,21 +1,19 @@
-package subcommands
+package component
 
 import (
 	"github.com/spf13/cobra"
 
-	"lunchpail.io/cmd/subcommands/minio"
+	"lunchpail.io/cmd/subcommands/component/minio"
 )
 
-func newMinioCmd() *cobra.Command {
-	return &cobra.Command{
+func Minio() *cobra.Command {
+	cmd := &cobra.Command{
 		Use:   "minio",
 		Short: "Commands for running minio components",
 		Long:  "Commands for running minio components",
 	}
-}
 
-func init() {
-	cmd := newMinioCmd()
-	rootCmd.AddCommand(cmd)
 	cmd.AddCommand(minio.Server())
+
+	return cmd
 }

cmd/subcommands/component/worker.go

@@ -0,0 +1,20 @@
+package component
+
+import (
+	"github.com/spf13/cobra"
+
+	"lunchpail.io/cmd/subcommands/component/worker"
+)
+
+func Worker() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "worker",
+		Short: "Commands that act as an application worker",
+		Long:  "Commands that act as an application worker",
+	}
+
+	cmd.AddCommand(worker.Run())
+	cmd.AddCommand(worker.PreStop())
+
+	return cmd
+}

cmd/subcommands/worker/prestop.go → cmd/subcommands/component/worker/prestop.go

@@ -8,7 +8,7 @@ import (
 	"lunchpail.io/pkg/runtime/worker"
 )
 
-func NewPreStopCmd() *cobra.Command {
+func PreStop() *cobra.Command {
 	var cmd = &cobra.Command{
 		Use:   "prestop",
 		Short: "Mark this worker as dead",

cmd/subcommands/worker/run.go → cmd/subcommands/component/worker/run.go

@@ -10,7 +10,7 @@ import (
 	"lunchpail.io/pkg/runtime/worker"
 )
 
-func NewRunCmd() *cobra.Command {
+func Run() *cobra.Command {
 	var cmd = &cobra.Command{
 		Use:   "run [-- workerCommand workerCommandArg1 workerCommandArg2 ...]",
 		Short: "Run as an application worker",

cmd/subcommands/workstealer.go → cmd/subcommands/component/workstealer.go

@@ -1,4 +1,4 @@
-package subcommands
+package component
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"lunchpail.io/pkg/runtime/workstealer"
 )
 
-func newWorkstealerCmd() *cobra.Command {
+func WorkStealer() *cobra.Command {
 	var cmd = &cobra.Command{
 		Use:   "workstealer",
 		Short: "Run a work stealer",
@@ -21,7 +21,3 @@ func newWorkstealerCmd() *cobra.Command {
 
 	return cmd
 }
-
-func init() {
-	rootCmd.AddCommand(newWorkstealerCmd())
-}

pkg/fe/transformer/api/minio/transpile.go

@@ -18,7 +18,7 @@ func transpile(runname string, ir llir.LLIR) (hlir.Application, error) {
 	app.Spec.Image = "docker.io/minio/minio:RELEASE.2024-07-04T14-25-45Z"
 	app.Spec.Role = "queue"
 	app.Spec.Expose = []string{fmt.Sprintf("%d:%d", ir.Queue.Port, ir.Queue.Port)}
-	app.Spec.Command = fmt.Sprintf("$LUNCHPAIL_EXE minio server --port %d", ir.Queue.Port)
+	app.Spec.Command = fmt.Sprintf("$LUNCHPAIL_EXE component minio server --port %d", ir.Queue.Port)
 
 	prefixIncludingBucket := api.QueuePrefixPath(ir.Queue, runname)
 	A := strings.Split(prefixIncludingBucket, "/")

pkg/fe/transformer/api/workerpool/lower.go

@@ -30,8 +30,8 @@ func Lower(compilationName, runname string, app hlir.Application, pool hlir.Work
 	}
 	app.Spec.Env["LUNCHPAIL_STARTUP_DELAY"] = strconv.Itoa(startupDelay)
 
-	app.Spec.Command = fmt.Sprintf(`trap "$LUNCHPAIL_EXE worker prestop" EXIT
-$LUNCHPAIL_EXE worker run --debug=%v -- %s`, opts.Log.Debug, app.Spec.Command)
+	app.Spec.Command = fmt.Sprintf(`trap "$LUNCHPAIL_EXE component worker prestop" EXIT
+$LUNCHPAIL_EXE component worker run --debug=%v -- %s`, opts.Log.Debug, app.Spec.Command)
 
 	return shell.LowerAsComponent(
 		compilationName,

pkg/fe/transformer/api/workstealer/transpile.go

@@ -14,7 +14,7 @@ func transpile(runname string) (hlir.Application, error) {
 
 	app.Spec.Image = fmt.Sprintf("%s/%s/lunchpail:%s", lunchpail.ImageRegistry, lunchpail.ImageRepo, lunchpail.Version())
 	app.Spec.Role = "workstealer"
-	app.Spec.Command = "$LUNCHPAIL_EXE workstealer"
+	app.Spec.Command = "$LUNCHPAIL_EXE component workstealer"
 
 	app.Spec.Env = hlir.Env{}
 	app.Spec.Env["LUNCHPAIL_RUN_NAME"] = runname