Commit afb2b934 authored by Matt Butcher's avatar Matt Butcher Committed by GitHub

Merge pull request #1104 from technosophos/feat/1100-multi-args

feat(helm): allow multiple args for fetch, package, delete
parents 88fc5e8c f3022a09
...@@ -50,7 +50,7 @@ func newDeleteCmd(c helm.Interface, out io.Writer) *cobra.Command { ...@@ -50,7 +50,7 @@ func newDeleteCmd(c helm.Interface, out io.Writer) *cobra.Command {
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "delete [flags] RELEASE_NAME", Use: "delete [flags] RELEASE_NAME [...]",
Aliases: []string{"del"}, Aliases: []string{"del"},
SuggestFor: []string{"remove", "rm"}, SuggestFor: []string{"remove", "rm"},
Short: "given a release name, delete the release from Kubernetes", Short: "given a release name, delete the release from Kubernetes",
...@@ -60,9 +60,15 @@ func newDeleteCmd(c helm.Interface, out io.Writer) *cobra.Command { ...@@ -60,9 +60,15 @@ func newDeleteCmd(c helm.Interface, out io.Writer) *cobra.Command {
if len(args) == 0 { if len(args) == 0 {
return errors.New("command 'delete' requires a release name") return errors.New("command 'delete' requires a release name")
} }
del.name = args[0]
del.client = ensureHelmClient(del.client) del.client = ensureHelmClient(del.client)
return del.run()
for i := 0; i < len(args); i++ {
del.name = args[i]
if err := del.run(); err != nil {
return err
}
}
return nil
}, },
} }
f := cmd.Flags() f := cmd.Flags()
......
...@@ -64,15 +64,20 @@ func newFetchCmd(out io.Writer) *cobra.Command { ...@@ -64,15 +64,20 @@ func newFetchCmd(out io.Writer) *cobra.Command {
fch := &fetchCmd{out: out} fch := &fetchCmd{out: out}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "fetch [chart URL | repo/chartname]", Use: "fetch [flags] [chart URL | repo/chartname] [...]",
Short: "download a chart from a repository and (optionally) unpack it in local directory", Short: "download a chart from a repository and (optionally) unpack it in local directory",
Long: fetchDesc, Long: fetchDesc,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("This command needs at least one argument, url or repo/name of the chart.") return fmt.Errorf("This command needs at least one argument, url or repo/name of the chart.")
} }
fch.chartRef = args[0] for i := 0; i < len(args); i++ {
return fch.run() fch.chartRef = args[i]
if err := fch.run(); err != nil {
return err
}
}
return nil
}, },
} }
......
...@@ -57,14 +57,13 @@ func newPackageCmd(client helm.Interface, out io.Writer) *cobra.Command { ...@@ -57,14 +57,13 @@ func newPackageCmd(client helm.Interface, out io.Writer) *cobra.Command {
out: out, out: out,
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "package [CHART_PATH]", Use: "package [flags] [CHART_PATH] [...]",
Short: "package a chart directory into a chart archive", Short: "package a chart directory into a chart archive",
Long: packageDesc, Long: packageDesc,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("This command needs at least one argument, the path to the chart.") return fmt.Errorf("This command needs at least one argument, the path to the chart.")
} }
pkg.path = args[0]
if pkg.sign { if pkg.sign {
if pkg.key == "" { if pkg.key == "" {
return errors.New("--key is required for signing a package") return errors.New("--key is required for signing a package")
...@@ -73,7 +72,13 @@ func newPackageCmd(client helm.Interface, out io.Writer) *cobra.Command { ...@@ -73,7 +72,13 @@ func newPackageCmd(client helm.Interface, out io.Writer) *cobra.Command {
return errors.New("--keyring is required for signing a package") return errors.New("--keyring is required for signing a package")
} }
} }
return pkg.run(cmd, args) for i := 0; i < len(args); i++ {
pkg.path = args[i]
if err := pkg.run(cmd, args); err != nil {
return err
}
}
return nil
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment