Merge pull request #483 from dgageot/simpler-commands

Simpler code for cobra commands

Author: dgageot

cmd/root/catalog.go

@@ -20,9 +20,6 @@ func NewCatalogCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "catalog",
 		Short: "Manage the agent catalog",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return cmd.Help()
-		},
 	}
 
 	cmd.AddCommand(newCatalogListCmd())
@@ -31,7 +28,7 @@ func NewCatalogCmd() *cobra.Command {
 }
 
 func newCatalogListCmd() *cobra.Command {
-	cmd := &cobra.Command{
+	return &cobra.Command{
 		Use:   "list [org]",
 		Short: "List catalog entries",
 		Args:  cobra.MaximumNArgs(1),
@@ -49,8 +46,6 @@ func newCatalogListCmd() *cobra.Command {
 			return listCatalog(cmd.Context(), org)
 		},
 	}
-
-	return cmd
 }
 
 type hubRepoList struct {

cmd/root/pull.go

@@ -15,7 +15,7 @@ import (
 )
 
 func NewPullCmd() *cobra.Command {
-	cmd := &cobra.Command{
+	return &cobra.Command{
 		Use:   "pull <registry-ref>",
 		Short: "Pull an artifact from Docker Hub",
 		Long:  `Pull an artifact from Docker Hub`,
@@ -25,8 +25,6 @@ func NewPullCmd() *cobra.Command {
 			return runPullCommand(args[0])
 		},
 	}
-
-	return cmd
 }
 
 func runPullCommand(registryRef string) error {

cmd/root/push.go

@@ -14,7 +14,7 @@ import (
 )
 
 func NewPushCmd() *cobra.Command {
-	cmd := &cobra.Command{
+	return &cobra.Command{
 		Use:   "push <agent file> <reference>",
 		Short: "Push an agent to an OCI registry",
 		Long: `Push an agent to an OCI registry.
@@ -27,8 +27,6 @@ from the build command.`,
 			return runPushCommand(args[0], args[1])
 		},
 	}
-
-	return cmd
 }
 
 func runPushCommand(filePath, tag string) error {

cmd/root/root.go

@@ -109,7 +109,6 @@ func NewRootCmd() *cobra.Command {
 	cmd.AddCommand(NewVersionCmd())
 	cmd.AddCommand(NewRunCmd())
 	cmd.AddCommand(NewExecCmd())
-	cmd.AddCommand(NewTuiCmd())
 	cmd.AddCommand(NewNewCmd())
 	cmd.AddCommand(NewAPICmd())
 	cmd.AddCommand(NewEvalCmd())

cmd/root/run.go

@@ -80,18 +80,6 @@ func NewRunCmd() *cobra.Command {
 	return cmd
 }
 
-func NewTuiCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:    "tui",
-		Short:  "Deprecated. Use `cagent run` instead.",
-		Hidden: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Fprintln(os.Stderr, "'cagent tui' is deprecated. Please use 'cagent run' instead.")
-			return nil
-		},
-	}
-}
-
 func runCommand(cmd *cobra.Command, args []string) error {
 	telemetry.TrackCommand("run", args)
 	return doRunCommand(cmd.Context(), args, false)