Merge pull request #2095 from ulyssessouza/fix-version-plugin-delegation

Ulysses Souza · web-flow · commit 461f022b8141 · 2021-11-03T18:35:50.000Z
Fix plugin command delegation for version
diff --git a/cli/main.go b/cli/main.go
@@ -101,12 +101,16 @@ func isContextAgnosticCommand(cmd *cobra.Command) bool {
 	if cmd == nil {
 		return false
 	}
-	if _, ok := contextAgnosticCommands[cmd.Name()]; ok {
+	if _, ok := contextAgnosticCommands[cmd.Name()]; ok && isFirstLevelCommand(cmd) {
 		return true
 	}
 	return isContextAgnosticCommand(cmd.Parent())
 }
 
+func isFirstLevelCommand(cmd *cobra.Command) bool {
+	return !cmd.HasParent() || !cmd.Parent().HasParent()
+}
+
 func main() {
 	var opts cliopts.GlobalOpts
 	root := &cobra.Command{

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,16 @@ func isContextAgnosticCommand(cmd *cobra.Command) bool {`
`101`	`101`	`if cmd == nil {`
`102`	`102`	`return false`
`103`	`103`	`}`
`104`		`- if _, ok := contextAgnosticCommands[cmd.Name()]; ok {`
	`104`	`+ if _, ok := contextAgnosticCommands[cmd.Name()]; ok && isFirstLevelCommand(cmd) {`
`105`	`105`	`return true`
`106`	`106`	`}`
`107`	`107`	`return isContextAgnosticCommand(cmd.Parent())`
`108`	`108`	`}`
`109`	`109`
	`110`	`+func isFirstLevelCommand(cmd *cobra.Command) bool {`
	`111`	`+ return !cmd.HasParent() \|\| !cmd.Parent().HasParent()`
	`112`	`+}`
	`113`	`+`
`110`	`114`	`func main() {`
`111`	`115`	`var opts cliopts.GlobalOpts`
`112`	`116`	`root := &cobra.Command{`