diff --git a/internal/cmd/branch/vtctld/keyspaces.go b/internal/cmd/branch/vtctld/keyspaces.go index 76772411..4f9de954 100644 --- a/internal/cmd/branch/vtctld/keyspaces.go +++ b/internal/cmd/branch/vtctld/keyspaces.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/planetscale/cli/internal/cmdutil" - "github.com/planetscale/cli/internal/printer" ps "github.com/planetscale/planetscale-go/planetscale" "github.com/spf13/cobra" ) @@ -28,8 +27,8 @@ func ListKeyspacesCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching keyspaces for %s/%s\u2026", - printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching keyspaces for %s\u2026", + progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Vtctld.ListKeyspaces(ctx, &ps.VtctldListKeyspacesRequest{ diff --git a/internal/cmd/branch/vtctld/lookup_vindex.go b/internal/cmd/branch/vtctld/lookup_vindex.go index 9fb1b0ac..1ae9244e 100644 --- a/internal/cmd/branch/vtctld/lookup_vindex.go +++ b/internal/cmd/branch/vtctld/lookup_vindex.go @@ -56,8 +56,8 @@ func LookupVindexCreateCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Creating Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Creating Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.LookupVindexCreateRequest{ @@ -134,8 +134,8 @@ func LookupVindexShowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.LookupVindex.Show(ctx, &ps.LookupVindexShowRequest{ @@ -184,8 +184,8 @@ func LookupVindexExternalizeCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Externalizing Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Externalizing Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.LookupVindexExternalizeRequest{ @@ -242,8 +242,8 @@ func LookupVindexInternalizeCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Internalizing Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Internalizing Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.LookupVindex.Internalize(ctx, &ps.LookupVindexInternalizeRequest{ @@ -292,8 +292,8 @@ func LookupVindexCancelCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Canceling Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Canceling Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.LookupVindex.Cancel(ctx, &ps.LookupVindexCancelRequest{ @@ -341,8 +341,8 @@ func LookupVindexCompleteCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Completing Lookup Vindex %s on %s/%s\u2026", - printer.BoldBlue(flags.name), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Completing Lookup Vindex %s on %s\u2026", + printer.BoldBlue(flags.name), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.LookupVindex.Complete(ctx, &ps.LookupVindexCompleteRequest{ diff --git a/internal/cmd/branch/vtctld/materialize.go b/internal/cmd/branch/vtctld/materialize.go index cca5c558..b2b09b11 100644 --- a/internal/cmd/branch/vtctld/materialize.go +++ b/internal/cmd/branch/vtctld/materialize.go @@ -56,8 +56,8 @@ func MaterializeCreateCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Creating Materialize workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Creating Materialize workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MaterializeCreateRequest{ @@ -141,8 +141,8 @@ func MaterializeShowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching Materialize workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching Materialize workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MaterializeShowRequest{ @@ -197,8 +197,8 @@ func MaterializeStartCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Starting Materialize workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Starting Materialize workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Materialize.Start(ctx, &ps.MaterializeStartRequest{ @@ -246,8 +246,8 @@ func MaterializeStopCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Stopping Materialize workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Stopping Materialize workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Materialize.Stop(ctx, &ps.MaterializeStopRequest{ @@ -297,8 +297,8 @@ func MaterializeCancelCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Canceling Materialize workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Canceling Materialize workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MaterializeCancelRequest{ diff --git a/internal/cmd/branch/vtctld/move_tables.go b/internal/cmd/branch/vtctld/move_tables.go index c2e95aa8..b81b76da 100644 --- a/internal/cmd/branch/vtctld/move_tables.go +++ b/internal/cmd/branch/vtctld/move_tables.go @@ -69,8 +69,8 @@ func MoveTablesCreateCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Creating MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Creating MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MoveTablesCreateRequest{ @@ -160,8 +160,8 @@ func MoveTablesShowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.MoveTables.Show(ctx, &ps.MoveTablesShowRequest{ @@ -208,8 +208,8 @@ func MoveTablesStatusCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching MoveTables workflow status for %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching MoveTables workflow status for %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.MoveTables.Status(ctx, &ps.MoveTablesStatusRequest{ @@ -260,8 +260,8 @@ func MoveTablesSwitchTrafficCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Switching traffic for MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Switching traffic for MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MoveTablesSwitchTrafficRequest{ @@ -333,8 +333,8 @@ func MoveTablesReverseTrafficCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Reversing traffic for MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Reversing traffic for MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MoveTablesReverseTrafficRequest{ @@ -401,8 +401,8 @@ func MoveTablesCancelCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Canceling MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Canceling MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MoveTablesCancelRequest{ @@ -464,8 +464,8 @@ func MoveTablesCompleteCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Completing MoveTables workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Completing MoveTables workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.MoveTablesCompleteRequest{ diff --git a/internal/cmd/branch/vtctld/progress_test.go b/internal/cmd/branch/vtctld/progress_test.go new file mode 100644 index 00000000..4b4fe775 --- /dev/null +++ b/internal/cmd/branch/vtctld/progress_test.go @@ -0,0 +1,143 @@ +package vtctld + +import ( + "bytes" + "context" + "encoding/json" + "io" + "testing" + + qt "github.com/frankban/quicktest" + + "github.com/planetscale/cli/internal/cmdutil" + "github.com/planetscale/cli/internal/config" + "github.com/planetscale/cli/internal/mock" + "github.com/planetscale/cli/internal/printer" + ps "github.com/planetscale/planetscale-go/planetscale" +) + +func setNonTTYProgress(t *testing.T) { + t.Helper() + + previous := printer.IsTTY + printer.IsTTY = false + + t.Cleanup(func() { + printer.IsTTY = previous + }) +} + +func newHumanProgressHelper(org string, humanOut io.Writer, client *ps.Client) *cmdutil.Helper { + format := printer.Human + p := printer.NewPrinter(&format) + p.SetHumanOutput(humanOut) + p.SetResourceOutput(io.Discard) + + return &cmdutil.Helper{ + Printer: p, + Config: &config.Config{Organization: org}, + Client: func() (*ps.Client, error) { + return client, nil + }, + } +} + +func TestListWorkflowsProgressIncludesOrganization(t *testing.T) { + c := qt.New(t) + setNonTTYProgress(t) + + org := "my-org" + db := "my-db" + branch := "my-branch" + + svc := &mock.VtctldService{ + ListWorkflowsFn: func(ctx context.Context, req *ps.VtctldListWorkflowsRequest) (json.RawMessage, error) { + return json.RawMessage(`{"workflows":[]}`), nil + }, + } + + var progress bytes.Buffer + ch := newHumanProgressHelper(org, &progress, &ps.Client{Vtctld: svc}) + + cmd := ListWorkflowsCmd(ch) + cmd.SetArgs([]string{db, branch, "--keyspace", "my-keyspace"}) + + err := cmd.Execute() + c.Assert(err, qt.IsNil) + c.Assert(progress.String(), qt.Contains, "Fetching workflows for my-org/my-db/my-branch…") +} + +func TestStartWorkflowProgressIncludesOrganization(t *testing.T) { + c := qt.New(t) + setNonTTYProgress(t) + + org := "my-org" + db := "my-db" + branch := "my-branch" + + svc := &mock.VtctldService{ + StartWorkflowFn: func(ctx context.Context, req *ps.VtctldStartWorkflowRequest) (json.RawMessage, error) { + return json.RawMessage(`{"summary":"started"}`), nil + }, + } + + var progress bytes.Buffer + ch := newHumanProgressHelper(org, &progress, &ps.Client{Vtctld: svc}) + + cmd := StartWorkflowCmd(ch) + cmd.SetArgs([]string{db, branch, "my-workflow", "--keyspace", "my-keyspace"}) + + err := cmd.Execute() + c.Assert(err, qt.IsNil) + c.Assert(progress.String(), qt.Contains, "Starting workflow my-workflow on my-org/my-db/my-branch…") +} + +func TestMoveTablesShowProgressIncludesOrganization(t *testing.T) { + c := qt.New(t) + setNonTTYProgress(t) + + org := "my-org" + db := "my-db" + branch := "my-branch" + + svc := &mock.MoveTablesService{ + ShowFn: func(ctx context.Context, req *ps.MoveTablesShowRequest) (json.RawMessage, error) { + return json.RawMessage(`{"workflow":"my-workflow"}`), nil + }, + } + + var progress bytes.Buffer + ch := newHumanProgressHelper(org, &progress, &ps.Client{MoveTables: svc}) + + cmd := MoveTablesCmd(ch) + cmd.SetArgs([]string{"show", db, branch, "--workflow", "my-workflow", "--target-keyspace", "target-ks"}) + + err := cmd.Execute() + c.Assert(err, qt.IsNil) + c.Assert(progress.String(), qt.Contains, "Fetching MoveTables workflow my-workflow on my-org/my-db/my-branch…") +} + +func TestVDiffListProgressIncludesOrganization(t *testing.T) { + c := qt.New(t) + setNonTTYProgress(t) + + org := "my-org" + db := "my-db" + branch := "my-branch" + + svc := &mock.VDiffService{ + ListFn: func(ctx context.Context, req *ps.VDiffListRequest) (json.RawMessage, error) { + return json.RawMessage(`{"vdiffs":[]}`), nil + }, + } + + var progress bytes.Buffer + ch := newHumanProgressHelper(org, &progress, &ps.Client{VDiff: svc}) + + cmd := VDiffCmd(ch) + cmd.SetArgs([]string{"list", db, branch, "--workflow", "my-workflow", "--target-keyspace", "target-ks"}) + + err := cmd.Execute() + c.Assert(err, qt.IsNil) + c.Assert(progress.String(), qt.Contains, "Fetching VDiffs for workflow my-workflow on my-org/my-db/my-branch…") +} diff --git a/internal/cmd/branch/vtctld/start_workflow.go b/internal/cmd/branch/vtctld/start_workflow.go index ca68d495..bdc118de 100644 --- a/internal/cmd/branch/vtctld/start_workflow.go +++ b/internal/cmd/branch/vtctld/start_workflow.go @@ -28,8 +28,8 @@ func StartWorkflowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Starting workflow %s on %s/%s\u2026", - printer.BoldBlue(workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Starting workflow %s on %s\u2026", + printer.BoldBlue(workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Vtctld.StartWorkflow(ctx, &ps.VtctldStartWorkflowRequest{ diff --git a/internal/cmd/branch/vtctld/stop_workflow.go b/internal/cmd/branch/vtctld/stop_workflow.go index c359b050..1e375b57 100644 --- a/internal/cmd/branch/vtctld/stop_workflow.go +++ b/internal/cmd/branch/vtctld/stop_workflow.go @@ -28,8 +28,8 @@ func StopWorkflowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Stopping workflow %s on %s/%s\u2026", - printer.BoldBlue(workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Stopping workflow %s on %s\u2026", + printer.BoldBlue(workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Vtctld.StopWorkflow(ctx, &ps.VtctldStopWorkflowRequest{ diff --git a/internal/cmd/branch/vtctld/target.go b/internal/cmd/branch/vtctld/target.go new file mode 100644 index 00000000..ab5cce8e --- /dev/null +++ b/internal/cmd/branch/vtctld/target.go @@ -0,0 +1,14 @@ +package vtctld + +import ( + "fmt" + + "github.com/planetscale/cli/internal/printer" +) + +func progressTarget(organization, database, branch string) string { + return fmt.Sprintf("%s/%s/%s", + printer.BoldBlue(organization), + printer.BoldBlue(database), + printer.BoldBlue(branch)) +} diff --git a/internal/cmd/branch/vtctld/vdiff.go b/internal/cmd/branch/vtctld/vdiff.go index ab0e38bb..6a2b8330 100644 --- a/internal/cmd/branch/vtctld/vdiff.go +++ b/internal/cmd/branch/vtctld/vdiff.go @@ -45,8 +45,8 @@ func VDiffListCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching VDiffs for workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching VDiffs for workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.VDiff.List(ctx, &ps.VDiffListRequest{ @@ -107,8 +107,8 @@ func VDiffCreateCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Creating VDiff for workflow %s on %s/%s\u2026", - printer.BoldBlue(flags.workflow), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Creating VDiff for workflow %s on %s\u2026", + printer.BoldBlue(flags.workflow), progressTarget(ch.Config.Organization, database, branch))) defer end() req := &ps.VDiffCreateRequest{ @@ -201,8 +201,8 @@ func VDiffShowCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching VDiff %s on %s/%s\u2026", - printer.BoldBlue(flags.uuid), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching VDiff %s on %s\u2026", + printer.BoldBlue(flags.uuid), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.VDiff.Show(ctx, &ps.VDiffShowRequest{ @@ -254,8 +254,8 @@ func VDiffStopCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Stopping VDiff %s on %s/%s\u2026", - printer.BoldBlue(flags.uuid), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Stopping VDiff %s on %s\u2026", + printer.BoldBlue(flags.uuid), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.VDiff.Stop(ctx, &ps.VDiffStopRequest{ @@ -309,8 +309,8 @@ func VDiffResumeCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Resuming VDiff %s on %s/%s\u2026", - printer.BoldBlue(flags.uuid), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Resuming VDiff %s on %s\u2026", + printer.BoldBlue(flags.uuid), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.VDiff.Resume(ctx, &ps.VDiffResumeRequest{ @@ -363,8 +363,8 @@ func VDiffDeleteCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Deleting VDiff %s on %s/%s\u2026", - printer.BoldBlue(flags.uuid), printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Deleting VDiff %s on %s\u2026", + printer.BoldBlue(flags.uuid), progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.VDiff.Delete(ctx, &ps.VDiffDeleteRequest{ diff --git a/internal/cmd/branch/vtctld/workflows.go b/internal/cmd/branch/vtctld/workflows.go index 68582a4c..5d9da369 100644 --- a/internal/cmd/branch/vtctld/workflows.go +++ b/internal/cmd/branch/vtctld/workflows.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/planetscale/cli/internal/cmdutil" - "github.com/planetscale/cli/internal/printer" ps "github.com/planetscale/planetscale-go/planetscale" "github.com/spf13/cobra" ) @@ -29,8 +28,8 @@ func ListWorkflowsCmd(ch *cmdutil.Helper) *cobra.Command { } end := ch.Printer.PrintProgress( - fmt.Sprintf("Fetching workflows for %s/%s\u2026", - printer.BoldBlue(database), printer.BoldBlue(branch))) + fmt.Sprintf("Fetching workflows for %s\u2026", + progressTarget(ch.Config.Organization, database, branch))) defer end() data, err := client.Vtctld.ListWorkflows(ctx, &ps.VtctldListWorkflowsRequest{