actions: tools.gh.ActionUsers macro signature

carapace-sh · May 6, 2022 · 60f5609 · 60f5609
1 parent 86282ef
commit 60f5609
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/completers/circleci_completer/cmd/context_list.go b/completers/circleci_completer/cmd/context_list.go
@@ -22,7 +22,7 @@ func init() {
 		action.ActionVcsTypes(),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			if c.Args[0] == "github" {
-				return gh.ActionUsers(false, true)
+				return gh.ActionUsers(gh.UserOpts{Organizations: true})
 			}
 			return carapace.ActionValues()
 		}),

diff --git a/pkg/actions/tools/gh/repository.go b/pkg/actions/tools/gh/repository.go
@@ -15,8 +15,14 @@ func ActionOwnerRepositories() carapace.Action {
 	})
 }
 
-func ActionUsers(users bool, orgs bool) carapace.Action {
+type UserOpts action.UserOpts
+
+func ActionUsers(opts UserOpts) carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		return action.ActionUsers(&cobra.Command{}, action.UserOpts{Users: users, Organizations: orgs})
+		if !opts.Users && !opts.Organizations {
+			opts.Users = true
+			opts.Organizations = true
+		}
+		return action.ActionUsers(&cobra.Command{}, action.UserOpts(opts))
 	})
 }