Merge pull request #577 from sttts/sttts-ctx-unify-path-string

ctx: unify path string

cmd/up/ctx/actions.go

@@ -41,7 +41,7 @@ func (s *Space) Accept(upCtx *upbound.Context, navCtx *navContext) (msg string,
 		return "", err
 	}
 
-	return fmt.Sprintf(contextSwitchedFmt, s.Breadcrumbs()), nil
+	return fmt.Sprintf(contextSwitchedFmt, withUpboundPrefix(s.Breadcrumbs())), nil
 }
 
 // Accept upserts the "upbound" kubeconfig context and cluster to the chosen
@@ -59,7 +59,7 @@ func (g *Group) Accept(upCtx *upbound.Context, navCtx *navContext) (msg string,
 		return "", err
 	}
 
-	return fmt.Sprintf(contextSwitchedFmt, g.Breadcrumbs()), nil
+	return fmt.Sprintf(contextSwitchedFmt, withUpboundPrefix(g.Breadcrumbs())), nil
 }
 
 // Accept upserts a controlplane context and cluster to the chosen kubeconfig.
@@ -76,5 +76,5 @@ func (ctp *ControlPlane) Accept(upCtx *upbound.Context, navCtx *navContext) (msg
 		return "", err
 	}
 
-	return fmt.Sprintf(contextSwitchedFmt, ctp.Breadcrumbs()), nil
+	return fmt.Sprintf(contextSwitchedFmt, withUpboundPrefix(ctp.Breadcrumbs())), nil
 }

cmd/up/ctx/cmd.go

@@ -134,7 +134,7 @@ func (c *Cmd) Run(ctx context.Context, kongCtx *kong.Context, upCtx *upbound.Con
 	case "":
 		return c.RunInteractive(ctx, kongCtx, upCtx, navCtx, initialState)
 	default:
-		return c.RunRelative(ctx, upCtx, navCtx, initialState)
+		return c.RunNonInteractive(ctx, upCtx, navCtx, initialState)
 	}
 }
 
@@ -168,10 +168,18 @@ func (c *Cmd) RunSwap(ctx context.Context, upCtx *upbound.Context, navCtx *navCo
 	if err := writeLastContext(oldContext); err != nil {
 		return err
 	}
-	fmt.Printf(contextSwitchedFmt, state.Breadcrumbs())
+	if c.Short {
+		fmt.Println(state.Breadcrumbs())
+	} else {
+		fmt.Printf(contextSwitchedFmt, withUpboundPrefix(state.Breadcrumbs()))
+	}
 	return nil
 }
 
+func withUpboundPrefix(s string) string {
+	return fmt.Sprintf("%s %s", upboundRootStyle.Render("Upbound"), s)
+}
+
 func activateContext(conf *clientcmdapi.Config, sourceContext, preferredContext string) (newConf *clientcmdapi.Config, newLastContext string, err error) { // nolint:gocyclo // little long, but well tested
 	// switch to non-upbound last context trivially via CurrentContext e.g.
 	// - upbound <-> other
@@ -258,7 +266,7 @@ func activateContext(conf *clientcmdapi.Config, sourceContext, preferredContext
 	return conf, newLastContext, nil
 }
 
-func (c *Cmd) RunRelative(ctx context.Context, upCtx *upbound.Context, navCtx *navContext, initialState NavigationState) error { // nolint:gocyclo // a bit long but ¯\_(ツ)_/¯
+func (c *Cmd) RunNonInteractive(ctx context.Context, upCtx *upbound.Context, navCtx *navContext, initialState NavigationState) error { // nolint:gocyclo // a bit long but ¯\_(ツ)_/¯
 	// begin from root unless we're starting from a relative . or ..
 	state := initialState
 	if !strings.HasPrefix(c.Argument, ".") {
@@ -310,7 +318,7 @@ func (c *Cmd) RunRelative(ctx context.Context, upCtx *upbound.Context, navCtx *n
 	}
 
 	// final step if we moved: accept the state
-	msg := fmt.Sprintf("Kubeconfig context %q: %s\n", c.KubeContext, m.state.Breadcrumbs())
+	msg := fmt.Sprintf("Kubeconfig context %q: %s\n", c.KubeContext, withUpboundPrefix(m.state.Breadcrumbs()))
 	if m.state.Breadcrumbs() != initialState.Breadcrumbs() {
 		accepting, ok := m.state.(Accepting)
 		if !ok {
@@ -324,19 +332,10 @@ func (c *Cmd) RunRelative(ctx context.Context, upCtx *upbound.Context, navCtx *n
 	}
 
 	// don't print anything else or we are going to pollute stdout
-	if c.File != "-" {
-		if c.Short {
-			switch state := m.state.(type) {
-			case *Space:
-				fmt.Printf("%s/%s\n", state.Org.Name, state.Name)
-			case *Group:
-				fmt.Printf("%s/%s/%s\n", state.Space.Org.Name, state.Space.Name, state.Name)
-			case *ControlPlane:
-				fmt.Printf("%s/%s/%s/%s\n", state.Group.Space.Org.Name, state.Group.Space.Name, state.NamespacedName().Namespace, state.NamespacedName().Name)
-			}
-		} else {
-			fmt.Print(msg)
-		}
+	if c.Short {
+		fmt.Println(state.Breadcrumbs())
+	} else {
+		fmt.Print(msg)
 	}
 
 	return nil

cmd/up/ctx/navigation.go

@@ -146,12 +146,8 @@ func (r *Root) Items(ctx context.Context, upCtx *upbound.Context, navCtx *navCon
 	}), nil
 }
 
-func (r *Root) breadcrumbs() string {
-	return upboundRootStyle.Render("Upbound")
-}
-
 func (r *Root) Breadcrumbs() string {
-	return r.breadcrumbs()
+	return ""
 }
 
 type Disconnected struct{}
@@ -241,7 +237,7 @@ func spaceItemFromKubeContext(ctx context.Context, kubeconfig clientcmdapi.Confi
 }
 
 func (d *Disconnected) breadcrumbs(styles breadcrumbStyle) string {
-	return upboundRootStyle.Render("Upbound ") + styles.currentLevel.Render("disconnected/")
+	return styles.currentLevel.Render("disconnected/")
 }
 
 func (d *Disconnected) Breadcrumbs() string {
@@ -374,7 +370,7 @@ func (o *Organization) BackLabel() string {
 }
 
 func (o *Organization) breadcrumbs(styles breadcrumbStyle) string {
-	return upboundRootStyle.Render("Upbound ") + styles.currentLevel.Render(fmt.Sprintf("%s/", o.Name))
+	return styles.currentLevel.Render(fmt.Sprintf("%s/", o.Name))
 }
 
 func (o *Organization) Breadcrumbs() string {