fix flag selection

Author: paul

pkg/cli/prerun/prerun.go

@@ -25,7 +25,7 @@ type LoadNamespaceListMode string
 
 const (
 	TemporarySetNamespace           LoadNamespaceListMode = ""
-	RunNamespaceSelectionAndPersist LoadNamespaceListMode = "don't load namespaces"
+	RunNamespaceSelectionAndPersist LoadNamespaceListMode = "run namespace selection and persist"
 )
 
 func (mode LoadNamespaceListMode) String() string {
@@ -136,31 +136,42 @@ func PreRun(ctx *context.Context, optional ...Config) error {
 			if !ok {
 				return chkitErrors.FatalString("you have no namespaces")
 			}
+			ctx.SetNamespace(context.NamespaceFromModel(ns))
 		case "":
 			if nsList.Len() == 0 {
 				return chkitErrors.FatalString("you have no namespaces")
 			}
 			(&activekit.Menu{
 				Items: activekit.StringSelector(nsList.OwnersAndLabels(), func(s string) error {
 					ns, _ = nsList.GetByUserFriendlyID(s)
+					ctx.SetNamespace(context.NamespaceFromModel(ns))
 					return nil
 				}),
 			}).Run()
 		default:
 			var tokens = str.SplitS(config.Namespace, "/", 2).Map(strings.TrimSpace)
-			if !ctx.GetNamespace().Match(tokens.GetDefault(0, ""), tokens.GetDefault(1, "")) {
+			var owner, label string
+			if tokens.Len() == 2 {
+				owner, label = tokens[0], tokens[1]
+			} else {
+				label = tokens[0]
+			}
+			logger.Debugf("owner=%q label=%q", owner, label)
+			if !ctx.GetNamespace().Match(owner, label) || ctx.GetNamespace().IsEmpty() {
+				logger.Debugf("getting namespace list")
 				var nsList, err = ctx.Client.GetNamespaceList()
 				if err != nil {
 					return chkitErrors.Fatal(err)
 				}
+				logger.Debugf("searching namespace %q", tokens.Join("/"))
 				var ns, ok = nsList.GetByUserFriendlyID(tokens.Join("/"))
 				if !ok {
-					return chkitErrors.FatalString("you have no namespaces")
+					return chkitErrors.FatalString("namespace %s not found", tokens.Join("/"))
 				}
-				ctx.SetTemporaryNamespace(ns)
+				logger.Debugf("%v", ns.OwnerAndLabel())
+				ctx.SetNamespace(context.NamespaceFromModel(ns))
 			}
 		}
-		ctx.SetNamespace(context.NamespaceFromModel(ns))
 	case TemporarySetNamespace:
 		var tokens = str.SplitS(config.Namespace, "/", 2).Map(strings.TrimSpace)
 		if config.Namespace != "" && !ctx.GetNamespace().Match(tokens.GetDefault(0, ""), tokens.GetDefault(1, "")) {

pkg/cli/set/defaultns.go

@@ -5,9 +5,7 @@ import (
 
 	"github.com/containerum/chkit/pkg/cli/prerun"
 	"github.com/containerum/chkit/pkg/context"
-	"github.com/containerum/chkit/pkg/model/namespace"
 	"github.com/containerum/chkit/pkg/util/activekit"
-	"github.com/containerum/chkit/pkg/util/ferr"
 	"github.com/spf13/cobra"
 )
 
@@ -17,58 +15,17 @@ func DefaultNamespace(ctx *context.Context) *cobra.Command {
 		Short:   "Set default namespace",
 		Aliases: []string{"def-ns", "default-ns", "defns", "def-namespace"},
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			if err := prerun.PreRun(ctx); err != nil {
+			var ns, _ = cmd.Flags().GetString("namespace")
+			if err := prerun.PreRun(ctx, prerun.Config{
+				NamespaceSelection: prerun.RunNamespaceSelectionAndPersist,
+				Namespace:          ns,
+			}); err != nil {
 				activekit.Attention(err.Error())
 				ctx.Exit(1)
 			}
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) == 1 {
-				nsList, err := ctx.Client.GetNamespaceList()
-				if err != nil {
-					ferr.Println(err)
-					ctx.Exit(1)
-				}
-				var ns, ok = nsList.GetByUserFriendlyID(args[0])
-				if !ok {
-					fmt.Printf("Namespace %q not found!\n", args[0])
-					ctx.Exit(1)
-				}
-				ctx.SetNamespace(context.NamespaceFromModel(ns))
-				fmt.Printf("Using %q as default namespace!\n", ctx.GetNamespace())
-				ctx.Changed = true
-				return
-			}
-			nsList, err := ctx.Client.GetNamespaceList()
-			if err != nil || len(nsList) == 0 {
-				fmt.Printf("You have no namespaces :(\n")
-			}
-			var menu []*activekit.MenuItem
-			for _, ns := range nsList {
-				menu = append(menu, &activekit.MenuItem{
-					Label: ns.LabelAndID(),
-					Action: func(ns namespace.Namespace) func() error {
-						return func() error {
-							ctx.SetNamespace(context.NamespaceFromModel(ns))
-							fmt.Printf("Using %q as default namespace\n", ns.LabelAndID())
-							return nil
-						}
-					}(ns),
-				})
-			}
-			menu = append(menu, &activekit.MenuItem{
-				Label: "Exit",
-			})
-			var title string
-			if ctx.GetNamespace().IsEmpty() {
-				title = fmt.Sprintf("Default namespace isn't defined")
-			} else {
-				title = fmt.Sprintf("%q is current default namespace", ctx.GetNamespace())
-			}
-			(&activekit.Menu{
-				Title: title,
-				Items: menu,
-			}).Run()
+			fmt.Printf("Using %q as default namespace", ctx.GetNamespace())
 		},
 	}