From 8a273dbf63893159569865ea20cfcd9a845f4c44 Mon Sep 17 00:00:00 2001 From: Pasha Sviderski Date: Thu, 11 Sep 2025 20:21:07 +1000 Subject: [PATCH] chore: rename cluster -> context option in commands for consistency --- cmd/uncloud/context/ls.go | 9 +-------- cmd/uncloud/service/inspect.go | 6 +++--- cmd/uncloud/service/ls.go | 11 +++++------ cmd/uncloud/service/rm.go | 6 +++--- cmd/uncloud/service/run.go | 6 +++--- cmd/uncloud/service/scale.go | 6 +++--- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/cmd/uncloud/context/ls.go b/cmd/uncloud/context/ls.go index b91de526..80d0e92f 100644 --- a/cmd/uncloud/context/ls.go +++ b/cmd/uncloud/context/ls.go @@ -12,8 +12,6 @@ import ( ) func NewListCommand() *cobra.Command { - var clusterContext string - cmd := &cobra.Command{ Use: "ls", Aliases: []string{"list"}, @@ -24,11 +22,6 @@ func NewListCommand() *cobra.Command { }, } - cmd.Flags().StringVarP( - &clusterContext, "context", "c", "", - "Name of the cluster context. (default is the current context)", - ) - return cmd } @@ -51,7 +44,7 @@ func list(uncli *cli.CLI) error { for _, name := range contextNames { current := "" if name == currentContext { - current = "*" + current = "✓" } connCount := len(uncli.Config.Contexts[name].Connections) fmt.Fprintf(tw, "%s\t%s\t%d\n", name, current, connCount) diff --git a/cmd/uncloud/service/inspect.go b/cmd/uncloud/service/inspect.go index 7d63b89d..c852ea8b 100644 --- a/cmd/uncloud/service/inspect.go +++ b/cmd/uncloud/service/inspect.go @@ -15,7 +15,7 @@ import ( type inspectOptions struct { service string - cluster string + context string } func NewInspectCommand() *cobra.Command { @@ -31,14 +31,14 @@ func NewInspectCommand() *cobra.Command { }, } cmd.Flags().StringVarP( - &opts.cluster, "context", "c", "", + &opts.context, "context", "c", "", "Name of the cluster context. (default is the current context)", ) return cmd } func inspect(ctx context.Context, uncli *cli.CLI, opts inspectOptions) error { - client, err := uncli.ConnectCluster(ctx, opts.cluster) + client, err := uncli.ConnectCluster(ctx, opts.context) if err != nil { return fmt.Errorf("connect to cluster: %w", err) } diff --git a/cmd/uncloud/service/ls.go b/cmd/uncloud/service/ls.go index 9e9aec01..22d76f85 100644 --- a/cmd/uncloud/service/ls.go +++ b/cmd/uncloud/service/ls.go @@ -12,26 +12,25 @@ import ( ) func NewListCommand() *cobra.Command { - // TODO(lhf): rename to context - var cluster string + var contextName string cmd := &cobra.Command{ Use: "ls", Aliases: []string{"list"}, Short: "List services.", RunE: func(cmd *cobra.Command, args []string) error { uncli := cmd.Context().Value("cli").(*cli.CLI) - return list(cmd.Context(), uncli, cluster) + return list(cmd.Context(), uncli, contextName) }, } cmd.Flags().StringVarP( - &cluster, "context", "c", "", + &contextName, "context", "c", "", "Name of the cluster context. (default is the current context)", ) return cmd } -func list(ctx context.Context, uncli *cli.CLI, clusterName string) error { - client, err := uncli.ConnectCluster(ctx, clusterName) +func list(ctx context.Context, uncli *cli.CLI, contextName string) error { + client, err := uncli.ConnectCluster(ctx, contextName) if err != nil { return fmt.Errorf("connect to cluster: %w", err) } diff --git a/cmd/uncloud/service/rm.go b/cmd/uncloud/service/rm.go index 5609ab60..500c3744 100644 --- a/cmd/uncloud/service/rm.go +++ b/cmd/uncloud/service/rm.go @@ -11,7 +11,7 @@ import ( type rmOptions struct { services []string - cluster string + context string } func NewRmCommand() *cobra.Command { @@ -28,14 +28,14 @@ func NewRmCommand() *cobra.Command { }, } cmd.Flags().StringVarP( - &opts.cluster, "context", "c", "", + &opts.context, "context", "c", "", "Name of the cluster context. (default is the current context)", ) return cmd } func rm(ctx context.Context, uncli *cli.CLI, opts rmOptions) error { - client, err := uncli.ConnectCluster(ctx, opts.cluster) + client, err := uncli.ConnectCluster(ctx, opts.context) if err != nil { return fmt.Errorf("connect to cluster: %w", err) } diff --git a/cmd/uncloud/service/run.go b/cmd/uncloud/service/run.go index a53e00eb..f6f3120a 100644 --- a/cmd/uncloud/service/run.go +++ b/cmd/uncloud/service/run.go @@ -35,7 +35,7 @@ type runOptions struct { user string volumes []string - cluster string + context string } func NewRunCommand() *cobra.Command { @@ -113,7 +113,7 @@ func NewRunCommand() *cobra.Command { " -v /host/path:/container/path:ro Bind mount a host directory or file as read-only") cmd.Flags().StringVarP( - &opts.cluster, "context", "c", "", + &opts.context, "context", "c", "", "Name of the cluster context to run the service in. (default is the current context)", ) @@ -126,7 +126,7 @@ func run(ctx context.Context, uncli *cli.CLI, opts runOptions) error { return err } - clusterClient, err := uncli.ConnectCluster(ctx, opts.cluster) + clusterClient, err := uncli.ConnectCluster(ctx, opts.context) if err != nil { return fmt.Errorf("connect to cluster: %w", err) } diff --git a/cmd/uncloud/service/scale.go b/cmd/uncloud/service/scale.go index 30909d9e..d7a590d8 100644 --- a/cmd/uncloud/service/scale.go +++ b/cmd/uncloud/service/scale.go @@ -15,7 +15,7 @@ import ( type scaleOptions struct { service string replicas uint - cluster string + context string } func NewScaleCommand() *cobra.Command { @@ -40,7 +40,7 @@ func NewScaleCommand() *cobra.Command { } cmd.Flags().StringVarP( - &opts.cluster, "context", "c", "", + &opts.context, "context", "c", "", "Name of the cluster context. (default is the current context)", ) @@ -57,7 +57,7 @@ func scale(ctx context.Context, uncli *cli.CLI, opts scaleOptions) error { ) } - clusterClient, err := uncli.ConnectCluster(ctx, opts.cluster) + clusterClient, err := uncli.ConnectCluster(ctx, opts.context) if err != nil { return fmt.Errorf("connect to cluster: %w", err) }