chore: support arbitrary flags for fallback commands

add test
snyk · Mar 10, 2023 · c832be7 · c832be7
1 parent 39b3652
commit c832be7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cliv2/cmd/cliv2/main.go b/cliv2/cmd/cliv2/main.go
@@ -157,9 +157,10 @@ func createCommandsForWorkflows(rootCommand *cobra.Command, engine workflow.Engi
 			subCmd := commandMap[currentParts]
 			if subCmd == nil {
 				subCmd = &cobra.Command{
-					Use:    subCmdName,
-					Hidden: true,
-					RunE:   emptyCommandFunction, // ensure to trigger the fallback case
+					Use:                subCmdName,
+					Hidden:             true,
+					RunE:               emptyCommandFunction, // ensure to trigger the fallback case
+					DisableFlagParsing: true,                 // disable flag parsing to allow arbitrary flags for commands that will trigger the fallback
 				}
 				parentCommand.AddCommand(subCmd)
 				commandMap[currentParts] = subCmd
@@ -174,6 +175,7 @@ func createCommandsForWorkflows(rootCommand *cobra.Command, engine workflow.Engi
 		}
 		parentCommand.RunE = runCommand
 		parentCommand.Hidden = !workflowEntry.IsVisible()
+		parentCommand.DisableFlagParsing = false
 	}
 }
 

diff --git a/cliv2/cmd/cliv2/main_test.go b/cliv2/cmd/cliv2/main_test.go
@@ -65,6 +65,9 @@ func Test_CreateCommandsForWorkflowWithSubcommands(t *testing.T) {
 	assert.True(t, doFallback(subcmd1.RunE(subcmd1, []string{})))
 	assert.True(t, doFallback(cmd2.RunE(cmd2, []string{})))
 
+	assert.True(t, subcmd1.DisableFlagParsing)
+	assert.False(t, subcmd2.DisableFlagParsing)
+
 	assert.False(t, subcmd2.HasSubCommands())
 	assert.Equal(t, "subcmd2", subcmd2.Name())
 	assert.False(t, subcmd3.Hidden)