diff --git a/docs/cmd/tkn.md b/docs/cmd/tkn.md index 8aa5fbe462..0cb104ebdd 100644 --- a/docs/cmd/tkn.md +++ b/docs/cmd/tkn.md @@ -23,7 +23,7 @@ CLI for tekton pipelines * [tkn clustertask](tkn_clustertask.md) - Manage ClusterTasks * [tkn clustertriggerbinding](tkn_clustertriggerbinding.md) - Manage clustertriggerbindings * [tkn completion](tkn_completion.md) - Prints shell completion scripts -* [tkn condition](tkn_condition.md) - Manage conditions +* [tkn condition](tkn_condition.md) - Manage Conditions * [tkn eventlistener](tkn_eventlistener.md) - Manage EventListeners * [tkn pipeline](tkn_pipeline.md) - Manage pipelines * [tkn pipelinerun](tkn_pipelinerun.md) - Manage PipelineRuns diff --git a/docs/cmd/tkn_condition.md b/docs/cmd/tkn_condition.md index 76c9c07c29..4e15674d63 100644 --- a/docs/cmd/tkn_condition.md +++ b/docs/cmd/tkn_condition.md @@ -1,6 +1,6 @@ ## tkn condition -Manage conditions +Manage Conditions ***Aliases**: cond,conditions* @@ -12,7 +12,7 @@ tkn condition ### Synopsis -Manage conditions +Manage Conditions ### Options @@ -27,7 +27,7 @@ Manage conditions ### SEE ALSO * [tkn](tkn.md) - CLI for tekton pipelines -* [tkn condition delete](tkn_condition_delete.md) - Delete a condition in a namespace +* [tkn condition delete](tkn_condition_delete.md) - Delete Conditions in a namespace * [tkn condition describe](tkn_condition_describe.md) - Describe Conditions in a namespace -* [tkn condition list](tkn_condition_list.md) - Lists conditions in a namespace +* [tkn condition list](tkn_condition_list.md) - Lists Conditions in a namespace diff --git a/docs/cmd/tkn_condition_delete.md b/docs/cmd/tkn_condition_delete.md index 0459b2dcf9..0a906c6be5 100644 --- a/docs/cmd/tkn_condition_delete.md +++ b/docs/cmd/tkn_condition_delete.md @@ -1,6 +1,6 @@ ## tkn condition delete -Delete a condition in a namespace +Delete Conditions in a namespace ***Aliases**: rm* @@ -12,7 +12,7 @@ tkn condition delete ### Synopsis -Delete a condition in a namespace +Delete Conditions in a namespace ### Examples @@ -47,5 +47,5 @@ or ### SEE ALSO -* [tkn condition](tkn_condition.md) - Manage conditions +* [tkn condition](tkn_condition.md) - Manage Conditions diff --git a/docs/cmd/tkn_condition_describe.md b/docs/cmd/tkn_condition_describe.md index 81181db147..0534b231a1 100644 --- a/docs/cmd/tkn_condition_describe.md +++ b/docs/cmd/tkn_condition_describe.md @@ -45,5 +45,5 @@ or ### SEE ALSO -* [tkn condition](tkn_condition.md) - Manage conditions +* [tkn condition](tkn_condition.md) - Manage Conditions diff --git a/docs/cmd/tkn_condition_list.md b/docs/cmd/tkn_condition_list.md index 276c7c48cb..84c2782af3 100644 --- a/docs/cmd/tkn_condition_list.md +++ b/docs/cmd/tkn_condition_list.md @@ -1,6 +1,6 @@ ## tkn condition list -Lists conditions in a namespace +Lists Conditions in a namespace ***Aliases**: ls* @@ -12,7 +12,7 @@ tkn condition list ### Synopsis -Lists conditions in a namespace +Lists Conditions in a namespace ### Options @@ -34,5 +34,5 @@ Lists conditions in a namespace ### SEE ALSO -* [tkn condition](tkn_condition.md) - Manage conditions +* [tkn condition](tkn_condition.md) - Manage Conditions diff --git a/docs/man/man1/tkn-condition-delete.1 b/docs/man/man1/tkn-condition-delete.1 index b716dda744..83b761baf9 100644 --- a/docs/man/man1/tkn-condition-delete.1 +++ b/docs/man/man1/tkn-condition-delete.1 @@ -5,7 +5,7 @@ .SH NAME .PP -tkn\-condition\-delete \- Delete a condition in a namespace +tkn\-condition\-delete \- Delete Conditions in a namespace .SH SYNOPSIS @@ -15,7 +15,7 @@ tkn\-condition\-delete \- Delete a condition in a namespace .SH DESCRIPTION .PP -Delete a condition in a namespace +Delete Conditions in a namespace .SH OPTIONS diff --git a/docs/man/man1/tkn-condition-list.1 b/docs/man/man1/tkn-condition-list.1 index 4d978603bf..745e487c3a 100644 --- a/docs/man/man1/tkn-condition-list.1 +++ b/docs/man/man1/tkn-condition-list.1 @@ -5,7 +5,7 @@ .SH NAME .PP -tkn\-condition\-list \- Lists conditions in a namespace +tkn\-condition\-list \- Lists Conditions in a namespace .SH SYNOPSIS @@ -15,7 +15,7 @@ tkn\-condition\-list \- Lists conditions in a namespace .SH DESCRIPTION .PP -Lists conditions in a namespace +Lists Conditions in a namespace .SH OPTIONS diff --git a/docs/man/man1/tkn-condition.1 b/docs/man/man1/tkn-condition.1 index 766e0902fb..08902fe7d3 100644 --- a/docs/man/man1/tkn-condition.1 +++ b/docs/man/man1/tkn-condition.1 @@ -5,7 +5,7 @@ .SH NAME .PP -tkn\-condition \- Manage conditions +tkn\-condition \- Manage Conditions .SH SYNOPSIS @@ -15,7 +15,7 @@ tkn\-condition \- Manage conditions .SH DESCRIPTION .PP -Manage conditions +Manage Conditions .SH OPTIONS diff --git a/pkg/cmd/condition/condition.go b/pkg/cmd/condition/condition.go index 09f793495d..f8333d26fb 100644 --- a/pkg/cmd/condition/condition.go +++ b/pkg/cmd/condition/condition.go @@ -24,7 +24,7 @@ func Command(p cli.Params) *cobra.Command { cmd := &cobra.Command{ Use: "condition", Aliases: []string{"cond", "conditions"}, - Short: "Manage conditions", + Short: "Manage Conditions", Annotations: map[string]string{ "commandType": "main", }, diff --git a/pkg/cmd/condition/delete.go b/pkg/cmd/condition/delete.go index 0ddc6a60c4..54d2454fc1 100644 --- a/pkg/cmd/condition/delete.go +++ b/pkg/cmd/condition/delete.go @@ -41,7 +41,7 @@ or c := &cobra.Command{ Use: "delete", Aliases: []string{"rm"}, - Short: "Delete a condition in a namespace", + Short: "Delete Conditions in a namespace", Example: eg, Args: cobra.MinimumNArgs(0), SilenceUsage: true, diff --git a/pkg/cmd/condition/describe.go b/pkg/cmd/condition/describe.go index 82d49fa416..f3d75ceeaf 100644 --- a/pkg/cmd/condition/describe.go +++ b/pkg/cmd/condition/describe.go @@ -17,7 +17,6 @@ package condition import ( "context" "fmt" - "os" "text/tabwriter" "text/template" @@ -108,8 +107,7 @@ or output, err := cmd.LocalFlags().GetString("output") if err != nil { - fmt.Fprint(os.Stderr, "Error: output option not set properly \n") - return err + return fmt.Errorf("output option not set properly: %v", err) } condition, err := getCondition(p, args[0]) @@ -141,7 +139,7 @@ func getCondition(p cli.Params, name string) (*v1alpha1.Condition, error) { condition, err := cs.Tekton.TektonV1alpha1().Conditions(p.Namespace()).Get(context.Background(), name, metav1.GetOptions{}) if err != nil { - return nil, fmt.Errorf("failed to find condition %q", name) + return nil, fmt.Errorf("failed to find Condition %q", name) } // NOTE: this is required for -o json|yaml to work properly since diff --git a/pkg/cmd/condition/list.go b/pkg/cmd/condition/list.go index 76a586106e..ac4049bcd1 100644 --- a/pkg/cmd/condition/list.go +++ b/pkg/cmd/condition/list.go @@ -42,7 +42,7 @@ func listCommand(p cli.Params) *cobra.Command { c := &cobra.Command{ Use: "list", Aliases: []string{"ls"}, - Short: "Lists conditions in a namespace", + Short: "Lists Conditions in a namespace", Annotations: map[string]string{ "commandType": "main", }, @@ -54,8 +54,7 @@ func listCommand(p cli.Params) *cobra.Command { output, err := cmd.LocalFlags().GetString("output") if err != nil { - fmt.Fprint(stream.Err, "Error: output option not set properly \n") - return err + return fmt.Errorf("output option not set properly: %v", err) } if output != "" { @@ -78,8 +77,7 @@ func printConditionDetails(s *cli.Stream, p cli.Params) error { conditions, err := listAllConditions(cs.Tekton, p.Namespace()) if err != nil { - fmt.Fprintf(s.Err, "Failed to list conditions from %s namespace \n", p.Namespace()) - return err + return fmt.Errorf("failed to list Conditions from %s namespace: %v", p.Namespace(), err) } if len(conditions.Items) == 0 { @@ -108,8 +106,7 @@ func printConditionListObj(s *cli.Stream, p cli.Params, f *cliopts.PrintFlags) e conditions, err := listAllConditions(cs.Tekton, p.Namespace()) if err != nil { - fmt.Fprintf(s.Err, "Failed to list conditions from %s namespace \n", p.Namespace()) - return err + return fmt.Errorf("failed to list Conditions from %s namespace: %v", p.Namespace(), err) } return printer.PrintObject(s.Out, conditions, f) } diff --git a/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_condition_name.golden b/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_condition_name.golden index 0f6c534bbe..48b18af5e4 100644 --- a/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_condition_name.golden +++ b/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_condition_name.golden @@ -1 +1 @@ -Error: failed to find condition "invalid" +Error: failed to find Condition "invalid" diff --git a/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_namespace.golden b/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_namespace.golden index 678c920b5d..142fb552ae 100644 --- a/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_namespace.golden +++ b/pkg/cmd/condition/testdata/TestConditionDescribe-invalid_namespace.golden @@ -1 +1 @@ -Error: failed to find condition "cond-2" +Error: failed to find Condition "cond-2" diff --git a/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources.golden b/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources.golden index e51bc920e4..b0464de2c1 100644 --- a/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources.golden +++ b/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources.golden @@ -1,2 +1 @@ -Failed to list conditions from ns namespace -Error: test error +Error: failed to list Conditions from ns namespace: test error diff --git a/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources_with_specify_output_flag.golden b/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources_with_specify_output_flag.golden index e51bc920e4..b0464de2c1 100644 --- a/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources_with_specify_output_flag.golden +++ b/pkg/cmd/condition/testdata/TestConditionList-Failed_to_list_condition_resources_with_specify_output_flag.golden @@ -1,2 +1 @@ -Failed to list conditions from ns namespace -Error: test error +Error: failed to list Conditions from ns namespace: test error