From a6c0d3b0b37692f00beb85fbc9bdf8483d5e9f22 Mon Sep 17 00:00:00 2001 From: leevic31 Date: Wed, 15 May 2024 15:29:12 -0400 Subject: [PATCH 1/4] removed tty message --- pkg/cmd/extension/command.go | 12 +----------- pkg/cmd/extension/command_test.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/pkg/cmd/extension/command.go b/pkg/cmd/extension/command.go index ae0cc7703..aa005ddbc 100644 --- a/pkg/cmd/extension/command.go +++ b/pkg/cmd/extension/command.go @@ -63,17 +63,7 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command { } return cmdutil.SilentError } - if io.IsStdoutTTY() { - successStr := "Successfully" - if flagDryRun { - successStr = "Would have" - } - extensionStr := "extension" - if name == "" { - extensionStr = "extensions" - } - fmt.Fprintf(io.Out, "%s %s upgraded %s\n", cs.SuccessIcon(), successStr, extensionStr) - } + return nil } diff --git a/pkg/cmd/extension/command_test.go b/pkg/cmd/extension/command_test.go index a7e9d5171..e16ab69b1 100644 --- a/pkg/cmd/extension/command_test.go +++ b/pkg/cmd/extension/command_test.go @@ -332,7 +332,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extension\n", + wantStdout: "", }, { name: "upgrade an extension dry run", @@ -352,7 +352,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Would have upgraded extension\n", + wantStdout: "", }, { name: "upgrade an extension notty", @@ -385,7 +385,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extension\n", + wantStdout: "", }, { name: "upgrade extension error", @@ -420,7 +420,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extension\n", + wantStdout: "", }, { name: "upgrade an extension full name", @@ -436,7 +436,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extension\n", + wantStdout: "", }, { name: "upgrade all", @@ -452,7 +452,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extensions\n", + wantStdout: "", }, { name: "upgrade all dry run", @@ -472,7 +472,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Would have upgraded extensions\n", + wantStdout: "", }, { name: "upgrade all none installed", @@ -853,7 +853,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "✓ Successfully upgraded extension\n", + wantStdout: "", }, } From 1dfcaab1022883b497161929d4db770d64cc5c96 Mon Sep 17 00:00:00 2001 From: leevic31 Date: Thu, 16 May 2024 15:31:56 -0400 Subject: [PATCH 2/4] Added TTY message to summarize checking extension upgrades --- pkg/cmd/extension/command.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/cmd/extension/command.go b/pkg/cmd/extension/command.go index aa005ddbc..82e81c15f 100644 --- a/pkg/cmd/extension/command.go +++ b/pkg/cmd/extension/command.go @@ -64,6 +64,10 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command { return cmdutil.SilentError } + if io.IsStdoutTTY() { + fmt.Fprintf(io.Out, "%s Successfully checked extension upgrades\n", cs.SuccessIcon()) + } + return nil } From e3d5c063ef38ff4ecbe3de3152003b54d7a7f05d Mon Sep 17 00:00:00 2001 From: leevic31 Date: Thu, 16 May 2024 15:38:49 -0400 Subject: [PATCH 3/4] Added summary TTY message to tests --- pkg/cmd/extension/command_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/cmd/extension/command_test.go b/pkg/cmd/extension/command_test.go index e16ab69b1..fc9c414a3 100644 --- a/pkg/cmd/extension/command_test.go +++ b/pkg/cmd/extension/command_test.go @@ -332,7 +332,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade an extension dry run", @@ -352,7 +352,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade an extension notty", @@ -385,7 +385,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade extension error", @@ -420,7 +420,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade an extension full name", @@ -436,7 +436,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade all", @@ -452,7 +452,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade all dry run", @@ -472,7 +472,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, { name: "upgrade all none installed", @@ -853,7 +853,7 @@ func TestNewCmdExtension(t *testing.T) { } }, isTTY: true, - wantStdout: "", + wantStdout: "✓ Successfully checked extension upgrades\n", }, } From 222d6c8e658ea46952af2560cedbce30716951b1 Mon Sep 17 00:00:00 2001 From: leevic31 Date: Thu, 16 May 2024 15:41:47 -0400 Subject: [PATCH 4/4] Removed unused param flagDryRun from upgradeFunc --- pkg/cmd/extension/command.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/extension/command.go b/pkg/cmd/extension/command.go index 82e81c15f..b3c7b0c9f 100644 --- a/pkg/cmd/extension/command.go +++ b/pkg/cmd/extension/command.go @@ -50,7 +50,7 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command { Aliases: []string{"extensions", "ext"}, } - upgradeFunc := func(name string, flagForce, flagDryRun bool) error { + upgradeFunc := func(name string, flagForce bool) error { cs := io.ColorScheme() err := m.Upgrade(name, flagForce) if err != nil { @@ -330,7 +330,7 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command { if ext, err := checkValidExtension(cmd.Root(), m, repo.RepoName(), repo.RepoOwner()); err != nil { // If an existing extension was found and --force was specified, attempt to upgrade. if forceFlag && ext != nil { - return upgradeFunc(ext.Name(), forceFlag, false) + return upgradeFunc(ext.Name(), forceFlag) } if errors.Is(err, alreadyInstalledError) { @@ -399,7 +399,7 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command { if flagDryRun { m.EnableDryRunMode() } - return upgradeFunc(name, flagForce, flagDryRun) + return upgradeFunc(name, flagForce) }, } cmd.Flags().BoolVar(&flagAll, "all", false, "Upgrade all extensions")