diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 944754644..af46e3c68 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -17,6 +17,10 @@ |=== | | Description | PR +| 🐣 +| Removes unnecessary help message introduced for machine-readable outputs for commands which does not have -o url flag +| https://github.com/knative/client/pull/1152[#1152] + | 🐣 | Improve error handling in clients | https://github.com/knative/client/pull/1154[#1154] diff --git a/pkg/kn/commands/source/apiserver/describe.go b/pkg/kn/commands/source/apiserver/describe.go index 52dfab188..331e4be3c 100644 --- a/pkg/kn/commands/source/apiserver/describe.go +++ b/pkg/kn/commands/source/apiserver/describe.go @@ -18,11 +18,10 @@ import ( "errors" "fmt" "sort" - "strings" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - v1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2" + "knative.dev/eventing/pkg/apis/sources/v1alpha2" "knative.dev/client/lib/printing" "knative.dev/client/pkg/kn/commands" @@ -114,7 +113,6 @@ func NewAPIServerDescribeCommand(p *commands.KnParams) *cobra.Command { commands.AddNamespaceFlags(flags, false) flags.BoolP("verbose", "v", false, "More output.") machineReadablePrintFlags.AddFlags(command) - command.Flag("output").Usage = fmt.Sprintf("Output format. One of: %s.", strings.Join(machineReadablePrintFlags.AllowedFormats(), "|")) return command } diff --git a/pkg/kn/commands/source/ping/describe.go b/pkg/kn/commands/source/ping/describe.go index d5d12d2a1..aa6229dbb 100644 --- a/pkg/kn/commands/source/ping/describe.go +++ b/pkg/kn/commands/source/ping/describe.go @@ -16,9 +16,7 @@ package ping import ( "errors" - "fmt" "sort" - "strings" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" @@ -113,7 +111,6 @@ func NewPingDescribeCommand(p *commands.KnParams) *cobra.Command { commands.AddNamespaceFlags(flags, false) flags.BoolP("verbose", "v", false, "More output.") machineReadablePrintFlags.AddFlags(command) - command.Flag("output").Usage = fmt.Sprintf("Output format. One of: %s.", strings.Join(machineReadablePrintFlags.AllowedFormats(), "|")) return command } diff --git a/pkg/kn/commands/trigger/describe.go b/pkg/kn/commands/trigger/describe.go index a607c6e0d..85c6c003d 100644 --- a/pkg/kn/commands/trigger/describe.go +++ b/pkg/kn/commands/trigger/describe.go @@ -16,18 +16,14 @@ package trigger import ( "errors" - "fmt" - "strings" - - "k8s.io/cli-runtime/pkg/genericclioptions" "github.com/spf13/cobra" - - v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1" + "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/client/lib/printing" "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/printers" + "knative.dev/eventing/pkg/apis/eventing/v1beta1" ) var describeExample = ` @@ -114,7 +110,6 @@ func NewTriggerDescribeCommand(p *commands.KnParams) *cobra.Command { commands.AddNamespaceFlags(flags, false) flags.BoolP("verbose", "v", false, "More output.") machineReadablePrintFlags.AddFlags(command) - command.Flag("output").Usage = fmt.Sprintf("Output format. One of: %s.", strings.Join(machineReadablePrintFlags.AllowedFormats(), "|")) return command }