chore(mod): clean up code

Co-authored-by: Sindre Rødseth Hansen <[email protected]>
Co-authored-by: Carl Hedgren <[email protected]>

Author: 3 people

cmd/debugcmd/debugcmd.go

@@ -17,13 +17,12 @@ const (
 func Command() *cli.Command {
 	return &cli.Command{
 		Name:      "debug",
-		Usage:     "Debug nais application",
+		Usage:     "Debug an application",
 		ArgsUsage: "appname",
 		Subcommands: []*cli.Command{
 			tidyCommand(),
 		},
 		Flags: []cli.Flag{
-			namespaceFlag(),
 			kubeConfigFlag(),
 		},
 		Before: func(context *cli.Context) error {
@@ -36,11 +35,9 @@ func Command() *cli.Command {
 		Action: func(cCtx *cli.Context) error {
 			cfg := makeConfig(cCtx)
 			cluster := cCtx.String(contextFlagName)
-			namespace := cCtx.String(namespaceFlagName)
 			client := k8s.SetupControllerRuntimeClient(k8s.WithKubeContext(cluster))
-			cfg.Namespace = client.CurrentNamespace
-			if namespace != "" {
-				cfg.Namespace = namespace
+			if cfg.Namespace == "" {
+				cfg.Namespace = client.CurrentNamespace
 			}
 
 			clientset, err := k8s.SetupClientGo(cluster)
@@ -50,22 +47,13 @@ func Command() *cli.Command {
 
 			dg := debug.Setup(clientset, cfg)
 			if err := dg.Debug(); err != nil {
-				return fmt.Errorf("error debugging instance: %w", err)
+				return fmt.Errorf("debugging instance: %w", err)
 			}
 			return nil
 		},
 	}
 }
 
-func namespaceFlag() *cli.StringFlag {
-	return &cli.StringFlag{
-		Name:        namespaceFlagName,
-		DefaultText: "The namespace from your current kubeconfig context",
-		Usage:       "The kubernetes `NAMESPACE` to use",
-		Aliases:     []string{"n"},
-	}
-}
-
 func kubeConfigFlag() *cli.StringFlag {
 	return &cli.StringFlag{
 		Name:        contextFlagName,
@@ -76,7 +64,7 @@ func kubeConfigFlag() *cli.StringFlag {
 }
 
 func makeConfig(cCtx *cli.Context) debug.Config {
-	appName := cCtx.Args().Get(0)
+	appName := cCtx.Args().First()
 	namespace := cCtx.Args().Get(1)
 
 	return debug.Config{

cmd/debugcmd/tidycmd.go

@@ -14,7 +14,6 @@ func tidyCommand() *cli.Command {
 		Usage:     "Clean up ephemeral containers and debug pods",
 		ArgsUsage: "appname",
 		Flags: []cli.Flag{
-			namespaceFlag(),
 			kubeConfigFlag(),
 		},
 		Before: func(context *cli.Context) error {
@@ -41,7 +40,7 @@ func tidyCommand() *cli.Command {
 
 			dg := debug.Setup(clientset, cfg)
 			if err := dg.Tidy(); err != nil {
-				return fmt.Errorf("error debugging instance: %w", err)
+				return fmt.Errorf("debugging instance: %w", err)
 			}
 			return nil
 		},

pkg/debug/debug.go

@@ -41,7 +41,7 @@ func Setup(client kubernetes.Interface, cfg Config) *Debug {
 func (d *Debug) getApp() (*v1.Deployment, error) {
 	app, err := d.client.AppsV1().Deployments(d.cfg.Namespace).Get(d.ctx, d.cfg.AppName, metav1.GetOptions{})
 	if err != nil {
-		return nil, fmt.Errorf("failed to get application: %w", err)
+		return nil, fmt.Errorf("failed to get application in namespace \"%s\": %w", d.cfg.Namespace, err)
 	}
 	return app, nil
 }