From 61d01766985b7bc58649eb9b0f4f955524fa282c Mon Sep 17 00:00:00 2001
From: Sushil Kumar <Sushil.Kumar@suse.com>
Date: Thu, 4 May 2017 21:36:43 -0700
Subject: [PATCH] Fixes messages for plugin remove option
Fixes issues/2398 - helm plugin remove does not works as expected
- [ ] plugin remove option is coded to remove multiple plugins, but instead returns error when more than one plugin is requested to be removed.
- [ ] plugin remove does not show any error/message for non-existent plugin.
---
cmd/helm/plugin_remove.go | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/cmd/helm/plugin_remove.go b/cmd/helm/plugin_remove.go
index da2041f89..6eec206d5 100644
--- a/cmd/helm/plugin_remove.go
+++ b/cmd/helm/plugin_remove.go
@@ -16,6 +16,7 @@ limitations under the License.
package main
import (
+ "errors"
"fmt"
"io"
"os"
@@ -48,8 +49,8 @@ func newPluginRemoveCmd(out io.Writer) *cobra.Command {
}
func (pcmd *pluginRemoveCmd) complete(args []string) error {
- if err := checkArgsLength(len(args), "plugin"); err != nil {
- return err
+ if len(args) == 0 {
+ return errors.New("please provide plugin name to remove")
}
pcmd.names = args
pcmd.home = settings.Home
@@ -67,9 +68,12 @@ func (pcmd *pluginRemoveCmd) run() error {
for _, name := range pcmd.names {
if found := findPlugin(plugins, name); found != nil {
if err := removePlugin(found, pcmd.home); err != nil {
- return err
+ fmt.Fprintf(pcmd.out, "Failed to remove plugin %s, got error (%v)\n", name, err)
+ } else {
+ fmt.Fprintf(pcmd.out, "Removed plugin: %s\n", name)
}
- fmt.Fprintf(pcmd.out, "Removed plugin: %s\n", name)
+ } else {
+ fmt.Fprintf(pcmd.out, "Plugin: %s not found\n", name)
}
}
return nil
--
GitLab