DXCDT-286: Hide global flags from commands when not applicable (#536)

auth0 · Dec 1, 2022 · 027ca62 · 027ca62
1 parent 4c15e2f
commit 027ca62
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 0 deletions.
diff --git a/internal/cli/actions.go b/internal/cli/actions.go
@@ -405,6 +405,11 @@ auth0 actions delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -481,6 +486,11 @@ func openActionCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/apis.go b/internal/cli/apis.go
@@ -401,6 +401,11 @@ auth0 apis delete <id|audience>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -452,6 +457,11 @@ auth0 apis open <id|audience>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/apps.go b/internal/cli/apps.go
@@ -188,7 +188,13 @@ func useAppCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	appNone.RegisterBool(cmd, &inputs.None, false)
+
 	return cmd
 }
 
@@ -324,6 +330,11 @@ auth0 apps delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -705,6 +716,11 @@ func openAppCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/custom_domains.go b/internal/cli/custom_domains.go
@@ -338,6 +338,11 @@ auth0 branding domains delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd

diff --git a/internal/cli/log_streams.go b/internal/cli/log_streams.go
@@ -733,6 +733,11 @@ auth0 logs streams delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -764,6 +769,11 @@ func openLogStreamsCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/login.go b/internal/cli/login.go
@@ -33,6 +33,7 @@ func loginCmd(cli *cli) *cobra.Command {
 
 	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
 		_ = cmd.Flags().MarkHidden("tenant")
+		_ = cmd.Flags().MarkHidden("json")
 		cmd.Parent().HelpFunc()(cmd, args)
 	})
 

diff --git a/internal/cli/logout.go b/internal/cli/logout.go
@@ -57,5 +57,11 @@ func logoutCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("tenant")
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
diff --git a/internal/cli/organizations.go b/internal/cli/organizations.go
@@ -429,6 +429,11 @@ auth0 orgs delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -460,6 +465,11 @@ func openOrganizationCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/roles.go b/internal/cli/roles.go
@@ -302,6 +302,11 @@ auth0 roles delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd

diff --git a/internal/cli/rules.go b/internal/cli/rules.go
@@ -268,6 +268,11 @@ auth0 rules delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd

diff --git a/internal/cli/tenants.go b/internal/cli/tenants.go
@@ -115,6 +115,11 @@ func useTenantCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 
@@ -148,6 +153,11 @@ func openTenantCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 

diff --git a/internal/cli/users.go b/internal/cli/users.go
@@ -346,6 +346,11 @@ auth0 users delete <id>`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	cmd.Flags().BoolVar(&cli.force, "force", false, "Skip confirmation.")
 
 	return cmd
@@ -483,6 +488,11 @@ auth0 users open "auth0|xxxxxxxxxx"`,
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }
 
@@ -570,6 +580,11 @@ func deleteUserBlocksCmd(cli *cli) *cobra.Command {
 		},
 	}
 
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = cmd.Flags().MarkHidden("json")
+		cmd.Parent().HelpFunc()(cmd, args)
+	})
+
 	return cmd
 }