Ensure flags suffix is added to useline

If a mapped command is runnable and has flags,
make sure its useline includes the ' [flags]' suffix

Signed-off-by: Vui Lam <vui.lam@broadcom.com>

plugin/usage.go

@@ -133,6 +133,20 @@ func hierarchyFromMappedCommandPath(mappedCommandPath string, cmd *cobra.Command
 }
 
 func useLineEx(cmd *cobra.Command, ic *InvocationContext) string {
+	useline := getInvocationStringForUseLine(cmd, ic)
+
+	if cmd.DisableFlagsInUseLine {
+		return useline
+	}
+
+	if cmd.HasAvailableFlags() && !strings.Contains(useline, "[flags]") {
+		useline += " [flags]"
+	}
+
+	return useline
+}
+
+func getInvocationStringForUseLine(cmd *cobra.Command, ic *InvocationContext) string {
 	// by checking sourceCommandPath we limit the use of the InvocationContext
 	// to only command-level (not plugin level) mapping
 	if ic == nil || ic.sourceCommandPath == "" {

plugin/usage_test.go

@@ -412,7 +412,7 @@ func TestGlobalTestFetchCommandHelpTextWithInvocationContext(t *testing.T) {
 	expected := `Fetch the plugin tests
 
 Usage:
-  tanzu fetch
+  tanzu fetch [flags]
 
 Examples:
   sample example usage of the fetch command
@@ -576,7 +576,7 @@ func TestCommandMappedCommandWithInvocationContext(t *testing.T) {
 	expected := `Push the plugin tests
 
 Usage:
-  tanzu pu SOMESTUFF
+  tanzu pu SOMESTUFF [flags]
 
   tanzu pu [command]
 
@@ -643,7 +643,7 @@ func TestCommandMappedCommandSubCommandWithInvocationContext(t *testing.T) {
 	expected := `Push more
 
 Usage:
-  tanzu pu more
+  tanzu pu more [flags]
 
 Aliases:
   more, mo