code cleanup

cmd/root.go

@@ -5,7 +5,6 @@ package cmd
 
 import (
 	"os"
-	"os/exec"
 
 	"optimus/config"
 
@@ -30,17 +29,9 @@ func Execute() {
 func init() {
 	AppConfig = config.LoadConfig()
 
-	for name, command := range AppConfig.AdditionalCommands {
-		rootCmd.AddCommand(&cobra.Command{
-			Use:   name,
-			Short: command.Description,
-			Run: func(cmd *cobra.Command, args []string) {
-				e := exec.Command("bash", "-c", command.Run)
-				e.Stdout = os.Stdout
-
-				e.Run()
-			},
-		})
+	for _, command := range AppConfig.AdditionalCommands {
+		cobraCmd := command.ToCobraCommand()
+		rootCmd.AddCommand(&cobraCmd)
 	}
 
 	for _, svc := range AppConfig.Services {

config/command.go

@@ -1,17 +1,25 @@
 package config
 
-import "log"
+import (
+	"log"
+	"os"
+	"os/exec"
+
+	"github.com/spf13/cobra"
+)
 
 type Cmd struct {
 	Run         string
+	Name        string
 	Description string
 	File        string
 	Shell       string
 }
 
-func ParseCmd(a any) Cmd {
+func ParseCmd(name string, a any) Cmd {
 	command := Cmd{
 		Run:         "",
+		Name:        name,
 		Description: "",
 		File:        "",
 		Shell:       "bash -c",
@@ -53,6 +61,20 @@ func ParseCmd(a any) Cmd {
 	return command
 }
 
+func (c *Cmd) ToCobraCommand() cobra.Command {
+	return cobra.Command{
+		Use:   c.Name,
+		Short: c.Description,
+		Run: func(cmd *cobra.Command, args []string) {
+			e := exec.Command("bash", "-c", c.Run)
+			e.Stdout = os.Stdout
+			e.Stderr = os.Stderr
+
+			e.Run()
+		},
+	}
+}
+
 type TestCmd struct {
 	Cmd       Cmd
 	DependsOn []Service

config/config.go

@@ -71,7 +71,7 @@ func LoadConfigFromPath(p string) Config {
 			g := ParseGlobal(v2)
 			conf.Global = &g
 		} else if k == "e2e_tests" {
-			c := ParseCmd(v2)
+			c := ParseCmd(k, v2)
 			conf.E2eTests = &c
 		} else if k == "services" {
 			servicesAny, o := v2.(map[string]any)
@@ -83,7 +83,7 @@ func LoadConfigFromPath(p string) Config {
 				conf.Services[svcName] = &s
 			}
 		} else {
-			cmd := ParseCmd(v2)
+			cmd := ParseCmd(k, v2)
 			conf.AdditionalCommands[k] = &cmd
 		}
 

config/service.go

@@ -36,10 +36,10 @@ func ParseService(name string, a any) Service {
 
 	for k, v := range amap {
 		if k == "dev" {
-			c := ParseCmd(v)
+			c := ParseCmd(k, v)
 			s.Dev = &c
 		} else if k == "build" {
-			c := ParseCmd(v)
+			c := ParseCmd(k, v)
 			s.Build = &c
 		} else if k == "root" {
 			str := v.(string)
@@ -77,6 +77,7 @@ func (s *Service) ToCobraCommand() cobra.Command {
 			Run: func(cmd *cobra.Command, args []string) {
 				e := exec.Command("bash", "-c", c.Run)
 				e.Stdout = os.Stdout
+				e.Stderr = os.Stderr
 
 				e.Run()
 

optimus.yaml

@@ -9,6 +9,7 @@ start:
   description: |
     Start the application
   run: |
+    echo "sup"
     docker compose -f compose.yml -f compose.dev.yml up -d