Add SilenceUsage for all commands to not to print usage on error

gnufied · Apr 23, 2021 · e2b9e9c · e2b9e9c
1 parent 62f758b
commit e2b9e9c
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 36 deletions.
diff --git a/cmd/cluster/create.go b/cmd/cluster/create.go
@@ -46,8 +46,9 @@ type Options struct {
 
 func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "cluster",
-		Short: "Creates basic functional HostedCluster resources",
+		Use:          "cluster",
+		Short:        "Creates basic functional HostedCluster resources",
+		SilenceUsage: true,
 	}
 
 	var releaseImage string

diff --git a/cmd/cluster/destroy.go b/cmd/cluster/destroy.go
@@ -33,8 +33,9 @@ type DestroyOptions struct {
 
 func NewDestroyCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "cluster",
-		Short: "Destroys a HostedCluster and its associated infrastructure.",
+		Use:          "cluster",
+		Short:        "Destroys a HostedCluster and its associated infrastructure.",
+		SilenceUsage: true,
 	}
 
 	opts := DestroyOptions{

diff --git a/cmd/cluster/dump.go b/cmd/cluster/dump.go
@@ -34,8 +34,9 @@ type DumpOptions struct {
 
 func NewDumpCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "cluster",
-		Short: "Creates basic functional HostedCluster resources",
+		Use:          "cluster",
+		Short:        "Creates basic functional HostedCluster resources",
+		SilenceUsage: true,
 	}
 
 	opts := &DumpOptions{

diff --git a/cmd/create/create.go b/cmd/create/create.go
@@ -11,8 +11,9 @@ import (
 
 func NewCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create",
-		Short: "Commands for creating HyperShift resources",
+		Use:          "create",
+		Short:        "Commands for creating HyperShift resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(cluster.NewCreateCommand())

diff --git a/cmd/destroy/destroy.go b/cmd/destroy/destroy.go
@@ -9,8 +9,9 @@ import (
 
 func NewCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "destroy",
-		Short: "Commands for destroying HyperShift resources",
+		Use:          "destroy",
+		Short:        "Commands for destroying HyperShift resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(infra.NewDestroyCommand())

diff --git a/cmd/dump/dump.go b/cmd/dump/dump.go
@@ -8,8 +8,9 @@ import (
 
 func NewCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "dump",
-		Short: "Commands for dumping resources for debugging",
+		Use:          "dump",
+		Short:        "Commands for dumping resources for debugging",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(cluster.NewDumpCommand())

diff --git a/cmd/infra/aws/create.go b/cmd/infra/aws/create.go
@@ -54,8 +54,9 @@ const (
 
 func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "aws",
-		Short: "Creates AWS infrastructure resources for a cluster",
+		Use:          "aws",
+		Short:        "Creates AWS infrastructure resources for a cluster",
+		SilenceUsage: true,
 	}
 
 	opts := CreateInfraOptions{

diff --git a/cmd/infra/aws/create_iam.go b/cmd/infra/aws/create_iam.go
@@ -43,8 +43,9 @@ type CreateIAMOutput struct {
 
 func NewCreateIAMCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "aws",
-		Short: "Creates AWS instance profile for workers",
+		Use:          "aws",
+		Short:        "Creates AWS instance profile for workers",
+		SilenceUsage: true,
 	}
 
 	opts := CreateIAMOptions{

diff --git a/cmd/infra/aws/destroy.go b/cmd/infra/aws/destroy.go
@@ -30,8 +30,9 @@ type DestroyInfraOptions struct {
 
 func NewDestroyCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "aws",
-		Short: "Destroys AWS infrastructure resources for a cluster",
+		Use:          "aws",
+		Short:        "Destroys AWS infrastructure resources for a cluster",
+		SilenceUsage: true,
 	}
 
 	opts := DestroyInfraOptions{

diff --git a/cmd/infra/aws/destroy_iam.go b/cmd/infra/aws/destroy_iam.go
@@ -27,8 +27,9 @@ type DestroyIAMOptions struct {
 
 func NewDestroyIAMCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "aws",
-		Short: "Destroys AWS instance profile for workers",
+		Use:          "aws",
+		Short:        "Destroys AWS instance profile for workers",
+		SilenceUsage: true,
 	}
 
 	opts := DestroyIAMOptions{

diff --git a/cmd/infra/create.go b/cmd/infra/create.go
@@ -8,8 +8,9 @@ import (
 
 func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "infra",
-		Short: "Commands for creating HyperShift infra resources",
+		Use:          "infra",
+		Short:        "Commands for creating HyperShift infra resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(aws.NewCreateCommand())

diff --git a/cmd/infra/create_iam.go b/cmd/infra/create_iam.go
@@ -8,8 +8,9 @@ import (
 
 func NewCreateIAMCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "iam",
-		Short: "Commands for creating HyperShift IAM resources",
+		Use:          "iam",
+		Short:        "Commands for creating HyperShift IAM resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(aws.NewCreateIAMCommand())

diff --git a/cmd/infra/destroy.go b/cmd/infra/destroy.go
@@ -8,8 +8,9 @@ import (
 
 func NewDestroyCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "infra",
-		Short: "Commands for destroying HyperShift infra resources",
+		Use:          "infra",
+		Short:        "Commands for destroying HyperShift infra resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(aws.NewDestroyCommand())

diff --git a/cmd/infra/destroy_iam.go b/cmd/infra/destroy_iam.go
@@ -8,8 +8,9 @@ import (
 
 func NewDestroyIAMCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "iam",
-		Short: "Commands for destroying HyperShift IAM resources",
+		Use:          "iam",
+		Short:        "Commands for destroying HyperShift IAM resources",
+		SilenceUsage: true,
 	}
 
 	cmd.AddCommand(aws.NewDestroyIAMCommand())

diff --git a/cmd/install/install.go b/cmd/install/install.go
@@ -41,8 +41,9 @@ type Options struct {
 
 func NewCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "install",
-		Short: "Installs the HyperShift operator",
+		Use:          "install",
+		Short:        "Installs the HyperShift operator",
+		SilenceUsage: true,
 	}
 
 	var opts Options

diff --git a/cmd/kubeconfig/create.go b/cmd/kubeconfig/create.go
@@ -37,9 +37,10 @@ of the HostedCluster itself.
 // from HostedCluster resources.
 func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "kubeconfig",
-		Short: "Creates a combined kubeconfig from hostedcluster resources",
-		Long:  description,
+		Use:          "kubeconfig",
+		Short:        "Creates a combined kubeconfig from hostedcluster resources",
+		Long:         description,
+		SilenceUsage: true,
 	}
 
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {

diff --git a/cmd/nodepool/create.go b/cmd/nodepool/create.go
@@ -29,8 +29,9 @@ type CreateNodePoolOptions struct {
 
 func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "nodepool",
-		Short: "Create a HyperShift NodePool",
+		Use:          "nodepool",
+		Short:        "Create a HyperShift NodePool",
+		SilenceUsage: true,
 	}
 
 	opts := CreateNodePoolOptions{

diff --git a/main.go b/main.go
@@ -30,7 +30,8 @@ import (
 
 func main() {
 	cmd := &cobra.Command{
-		Use: "hypershift",
+		Use:          "hypershift",
+		SilenceUsage: true,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmd.Help()
 			os.Exit(1)