You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/08/30 07:46:08 UTC
[camel-k] 02/02: fix: Align the code of commands with --all flag
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit eff8256cf50a1d3a1e18cd7908fd750ea5694825
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Mon Aug 29 18:16:08 2022 +0200
fix: Align the code of commands with --all flag
---
pkg/cmd/delete.go | 10 +++-------
pkg/cmd/kamelet_delete.go | 15 +++++----------
pkg/cmd/kit_delete.go | 15 +++++----------
pkg/cmd/rebuild.go | 12 ++++--------
pkg/cmd/trait_help.go | 4 ++--
5 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 2fd5aa347..ff12d31b8 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -46,11 +46,7 @@ func newCmdDelete(rootCmdOptions *RootCmdOptions) (*cobra.Command, *deleteCmdOpt
if err := options.validate(args); err != nil {
return err
}
- if err := options.run(cmd, args); err != nil {
- fmt.Fprintln(cmd.ErrOrStderr(), err.Error())
- }
-
- return nil
+ return options.run(cmd, args)
},
}
@@ -66,10 +62,10 @@ type deleteCmdOptions struct {
func (command *deleteCmdOptions) validate(args []string) error {
if command.DeleteAll && len(args) > 0 {
- return errors.New("invalid combination: both all flag and named integrations are set")
+ return errors.New("invalid combination: --all flag is set and at least one integration name is provided")
}
if !command.DeleteAll && len(args) == 0 {
- return errors.New("invalid combination: neither all flag nor named integrations are set")
+ return errors.New("invalid combination: provide one or several integration names or set --all flag for all integrations")
}
return nil
diff --git a/pkg/cmd/kamelet_delete.go b/pkg/cmd/kamelet_delete.go
index 36fcc049c..4d50a859f 100644
--- a/pkg/cmd/kamelet_delete.go
+++ b/pkg/cmd/kamelet_delete.go
@@ -35,19 +35,14 @@ func newKameletDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kamel
}
cmd := cobra.Command{
- Use: "delete <name>",
- Short: "Delete a Kamelet",
- Long: `Delete a Kamelet.`,
+ Use: "delete [Kamelet1] [Kamelet2] ...",
+ Short: "Delete Kamelets deployed on Kubernetes",
PreRunE: decode(&options),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
}
- if err := options.run(cmd, args); err != nil {
- fmt.Fprintln(cmd.ErrOrStderr(), err.Error())
- }
-
- return nil
+ return options.run(cmd, args)
},
}
@@ -63,10 +58,10 @@ type kameletDeleteCommandOptions struct {
func (command *kameletDeleteCommandOptions) validate(args []string) error {
if command.All && len(args) > 0 {
- return errors.New("invalid combination: both all flag and named kamelets are set")
+ return errors.New("invalid combination: --all flag is set and at least one kamelet name is provided")
}
if !command.All && len(args) == 0 {
- return errors.New("invalid combination: neither all flag nor named kamelets are set")
+ return errors.New("invalid combination: provide one or several kamelet names or set --all flag for all kamelets")
}
return nil
diff --git a/pkg/cmd/kit_delete.go b/pkg/cmd/kit_delete.go
index ec1c5ebd1..33515ee06 100644
--- a/pkg/cmd/kit_delete.go
+++ b/pkg/cmd/kit_delete.go
@@ -36,19 +36,14 @@ func newKitDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitDelete
}
cmd := cobra.Command{
- Use: "delete <name>",
- Short: "Delete an Integration Kit",
- Long: `Delete an Integration Kit.`,
+ Use: "delete [integration kit1] [integration kit2] ...",
+ Short: "Delete integration kits deployed on Kubernetes",
PreRunE: decode(&options),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
}
- if err := options.run(cmd, args); err != nil {
- fmt.Fprintln(cmd.ErrOrStderr(), err.Error())
- }
-
- return nil
+ return options.run(cmd, args)
},
}
@@ -64,10 +59,10 @@ type kitDeleteCommandOptions struct {
func (command *kitDeleteCommandOptions) validate(args []string) error {
if command.All && len(args) > 0 {
- return errors.New("invalid combination: both all flag and named Kits are set")
+ return errors.New("invalid combination: --all flag is set and at least one integration kit name is provided")
}
if !command.All && len(args) == 0 {
- return errors.New("invalid combination: neither all flag nor named Kits are set")
+ return errors.New("invalid combination: provide one or several integration kit names or set --all flag for all integration kits")
}
return nil
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index bcdd3c96e..9c402c23a 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -42,11 +42,7 @@ func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdO
if err := options.validate(args); err != nil {
return err
}
- if err := options.rebuild(cmd, args); err != nil {
- fmt.Fprintln(cmd.ErrOrStderr(), err.Error())
- }
-
- return nil
+ return options.run(cmd, args)
},
}
@@ -62,16 +58,16 @@ type rebuildCmdOptions struct {
func (o *rebuildCmdOptions) validate(args []string) error {
if o.RebuildAll && len(args) > 0 {
- return errors.New("invalid combination: both all flag and named integrations are set")
+ return errors.New("invalid combination: --all flag is set and at least one integration name is provided")
}
if !o.RebuildAll && len(args) == 0 {
- return errors.New("invalid combination: neither all flag nor named integrations are set")
+ return errors.New("invalid combination: provide one or several integration names or set --all flag for all integrations")
}
return nil
}
-func (o *rebuildCmdOptions) rebuild(cmd *cobra.Command, args []string) error {
+func (o *rebuildCmdOptions) run(cmd *cobra.Command, args []string) error {
c, err := o.GetCmdClient()
if err != nil {
return err
diff --git a/pkg/cmd/trait_help.go b/pkg/cmd/trait_help.go
index 0ef7bc9af..163e1cd9a 100644
--- a/pkg/cmd/trait_help.go
+++ b/pkg/cmd/trait_help.go
@@ -89,10 +89,10 @@ type traitMetaData struct {
func (command *traitHelpCommandOptions) validate(args []string) error {
if command.IncludeAll && len(args) > 0 {
- return errors.New("invalid combination: both all flag and a named trait is set")
+ return errors.New("invalid combination: --all flag is set and a trait name is provided")
}
if !command.IncludeAll && len(args) == 0 {
- return errors.New("invalid combination: neither all flag nor a named trait is set")
+ return errors.New("invalid combination: provide a trait name or set --all flag for all traits")
}
return nil
}