STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9088 from leevic31/8535-remove-message-when-checking-for-extension-upgrades

Browse source 
Removed tty message when checking for extension upgrades
This commit is contained in:
Andy Feller 2024-05-20 08:55:52 -04:00 • committed by GitHub
commit ff3a59802d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/cmd/extension/command.go
View file

@ -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 {
@ -63,17 +63,11 @@ 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)
fmt.Fprintf(io.Out, "%s Successfully checked extension upgrades\n", cs.SuccessIcon())
}
return nil
}
@ -336,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) {
@ -405,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")

16
pkg/cmd/extension/command_test.go
View file

@ -332,7 +332,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade an extension dry run",
@ -352,7 +352,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Would have upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade an extension notty",
@ -385,7 +385,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade extension error",
@ -420,7 +420,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade an extension full name",
@ -436,7 +436,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade all",
@ -452,7 +452,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extensions\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade all dry run",
@ -472,7 +472,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Would have upgraded extensions\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
{
name: "upgrade all none installed",
@ -853,7 +853,7 @@ func TestNewCmdExtension(t *testing.T) {
}
},
isTTY: true,
wantStdout: "✓ Successfully upgraded extension\n",
wantStdout: "✓ Successfully checked extension upgrades\n",
},
}