root
/
helm
mirror of https://github.com/helm/helm.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ref(cmd): rename `helm plugin remove` to `helm plugin uninstall` 

Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
This commit is contained in:
Matthew Fisher 2019-10-28 13:40:20 -07:00
parent 51fbcc8cf0
commit a759f09127
No known key found for this signature in database
GPG Key ID: 92AA783CBAAE8E3B
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/helm/plugin.go
View File

@ -33,13 +33,13 @@ Manage client-side Helm plugins.
func newPluginCmd(out io.Writer) *cobra.Command {
cmd := &cobra.Command{
Use: "plugin",
Short: "add, list, or remove Helm plugins",
Short: "install, list, or uninstall Helm plugins",
Long: pluginHelp,
}
cmd.AddCommand(
newPluginInstallCmd(out),
newPluginListCmd(out),
newPluginRemoveCmd(out),
newPluginUninstallCmd(out),
newPluginUpdateCmd(out),
)
return cmd

9
cmd/helm/plugin_install.go
View File

@ -41,10 +41,11 @@ Example usage:
func newPluginInstallCmd(out io.Writer) *cobra.Command {
o := &pluginInstallOptions{}
cmd := &cobra.Command{
Use: "install [options] <path|url>...",
Short: "install one or more Helm plugins",
Long: pluginInstallDesc,
Args: require.ExactArgs(1),
Use: "install [options] <path|url>...",
Short: "install one or more Helm plugins",
Long: pluginInstallDesc,
Aliases: []string{"add"},
Args: require.ExactArgs(1),
PreRunE: func(cmd *cobra.Command, args []string) error {
return o.complete(args)
},

26
cmd/helm/plugin_remove.go → cmd/helm/plugin_uninstall.go
View File

@ -27,16 +27,16 @@ import (
"helm.sh/helm/v3/pkg/plugin"
)
type pluginRemoveOptions struct {
type pluginUninstallOptions struct {
names []string
}
func newPluginRemoveCmd(out io.Writer) *cobra.Command {
o := &pluginRemoveOptions{}
func newPluginUninstallCmd(out io.Writer) *cobra.Command {
o := &pluginUninstallOptions{}
cmd := &cobra.Command{
Use: "remove <plugin>...",
Aliases: []string{"rm"},
Short: "remove one or more Helm plugins",
Use: "uninstall <plugin>...",
Aliases: []string{"rm", "remove"},
Short: "uninstall one or more Helm plugins",
PreRunE: func(cmd *cobra.Command, args []string) error {
return o.complete(args)
},
@ -47,15 +47,15 @@ func newPluginRemoveCmd(out io.Writer) *cobra.Command {
return cmd
}
func (o *pluginRemoveOptions) complete(args []string) error {
func (o *pluginUninstallOptions) complete(args []string) error {
if len(args) == 0 {
return errors.New("please provide plugin name to remove")
return errors.New("please provide plugin name to uninstall")
}
o.names = args
return nil
}
func (o *pluginRemoveOptions) run(out io.Writer) error {
func (o *pluginUninstallOptions) run(out io.Writer) error {
debug("loading installed plugins from %s", settings.PluginsDirectory)
plugins, err := findPlugins(settings.PluginsDirectory)
if err != nil {
@ -64,10 +64,10 @@ func (o *pluginRemoveOptions) run(out io.Writer) error {
var errorPlugins []string
for _, name := range o.names {
if found := findPlugin(plugins, name); found != nil {
if err := removePlugin(found); err != nil {
errorPlugins = append(errorPlugins, fmt.Sprintf("Failed to remove plugin %s, got error (%v)", name, err))
if err := uninstallPlugin(found); err != nil {
errorPlugins = append(errorPlugins, fmt.Sprintf("Failed to uninstall plugin %s, got error (%v)", name, err))
} else {
fmt.Fprintf(out, "Removed plugin: %s\n", name)
fmt.Fprintf(out, "Uninstalled plugin: %s\n", name)
}
} else {
errorPlugins = append(errorPlugins, fmt.Sprintf("Plugin: %s not found", name))
@ -79,7 +79,7 @@ func (o *pluginRemoveOptions) run(out io.Writer) error {
return nil
}
func removePlugin(p *plugin.Plugin) error {
func uninstallPlugin(p *plugin.Plugin) error {
if err := os.RemoveAll(p.Dir); err != nil {
return err
}