Merge pull request #2335 from carapace-sh/gh-repo-override

gh: add ActionHostOwnerRepositories

completers/gh_completer/cmd/attestation_download.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
 	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
@@ -25,7 +24,7 @@ func init() {
 	carapace.Gen(attestation_downloadCmd).FlagCompletion(carapace.ActionMap{
 		"digest-alg": carapace.ActionValues("sha256", "sha512"),
 		"owner":      gh.ActionOrganizations(gh.HostOpts{}),
-		"repo":       action.ActionRepoOverride(attestation_downloadCmd),
+		"repo":       gh.ActionHostOwnerRepositories(),
 	})
 
 	carapace.Gen(attestation_downloadCmd).PositionalCompletion(

completers/gh_completer/cmd/attestation_verify.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers_release/gh_completer/cmd/action"
 	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
@@ -38,7 +37,7 @@ func init() {
 		"digest-alg":          carapace.ActionValues("sha256", "sha512"),
 		"format":              carapace.ActionValues("json"),
 		"owner":               gh.ActionOrganizations(gh.HostOpts{}),
-		"repo":                action.ActionRepoOverride(attestation_verifyCmd),
+		"repo":                gh.ActionHostOwnerRepositories(),
 	})
 
 	carapace.Gen(attestation_verifyCmd).PositionalCompletion(

completers/gh_completer/cmd/browse.go

@@ -9,6 +9,7 @@ import (
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
 	_git "github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action/git"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/carapace-sh/carapace/pkg/util"
 	"github.com/spf13/cobra"
 )
@@ -36,7 +37,7 @@ func init() {
 
 	carapace.Gen(browseCmd).FlagCompletion(carapace.ActionMap{
 		"branch": action.ActionBranches(browseCmd), // TODO merge with tags
-		"repo":   action.ActionRepoOverride(browseCmd),
+		"repo":   gh.ActionHostOwnerRepositories(),
 	})
 
 	carapace.Gen(browseCmd).PositionalCompletion(

completers/gh_completer/cmd/cache.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	rootCmd.AddCommand(cacheCmd)
 
 	carapace.Gen(cacheCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(cacheCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/issue.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -24,6 +24,6 @@ func init() {
 	rootCmd.AddCommand(issueCmd)
 
 	carapace.Gen(issueCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(issueCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/label.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(labelCmd)
 
 	carapace.Gen(labelCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(labelCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/pr.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -24,6 +24,6 @@ func init() {
 	rootCmd.AddCommand(prCmd)
 
 	carapace.Gen(prCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(prCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/project_link.go

@@ -23,7 +23,7 @@ func init() {
 
 	carapace.Gen(project_linkCmd).FlagCompletion(carapace.ActionMap{
 		"owner": gh.ActionOwners(gh.HostOpts{}),
-		"repo":  action.ActionRepoOverride(project_linkCmd),
+		"repo":  gh.ActionHostOwnerRepositories(),
 		"team":  action.ActionTeams(project_linkCmd),
 	})
 

completers/gh_completer/cmd/project_unlink.go

@@ -23,7 +23,7 @@ func init() {
 
 	carapace.Gen(project_unlinkCmd).FlagCompletion(carapace.ActionMap{
 		"owner": gh.ActionOwners(gh.HostOpts{}),
-		"repo":  action.ActionRepoOverride(project_linkCmd),
+		"repo":  gh.ActionHostOwnerRepositories(),
 		"team":  action.ActionTeams(project_linkCmd),
 	})
 

completers/gh_completer/cmd/release.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -24,6 +24,6 @@ func init() {
 	rootCmd.AddCommand(releaseCmd)
 
 	carapace.Gen(releaseCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(issueCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/repo_deployKey.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	repoCmd.AddCommand(repo_deployKeyCmd)
 
 	carapace.Gen(repo_deployKeyCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(repo_deployKeyCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/repo_rename.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -23,6 +23,6 @@ func init() {
 	repoCmd.AddCommand(repo_renameCmd)
 
 	carapace.Gen(repo_renameCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(repo_renameCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/ruleset.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	rootCmd.AddCommand(rulesetCmd)
 
 	carapace.Gen(rulesetCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(rulesetCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/run.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	rootCmd.AddCommand(runCmd)
 
 	carapace.Gen(runCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(runCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/secret.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(secretCmd)
 
 	carapace.Gen(secretCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(secretCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/variable.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(variableCmd)
 
 	carapace.Gen(variableCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(variableCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

completers/gh_completer/cmd/workflow.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/gh"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	rootCmd.AddCommand(workflowCmd)
 
 	carapace.Gen(workflowCmd).FlagCompletion(carapace.ActionMap{
-		"repo": action.ActionRepoOverride(workflowCmd),
+		"repo": gh.ActionHostOwnerRepositories(),
 	})
 }

pkg/actions/tools/gh/repository.go

@@ -2,6 +2,7 @@ package gh
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bin/pkg/styles"
@@ -77,3 +78,29 @@ func ActionOwnerRepositories(opts HostOpts) carapace.Action {
 		}
 	})
 }
+
+// ActionHostOwnerRepositories completes [host/]owner/repository
+//
+//	carapace-sh/carapace
+//	github.com/carapace-sh/carapace
+func ActionHostOwnerRepositories() carapace.Action {
+	return carapace.ActionMultiPartsN("/", 3, func(c carapace.Context) carapace.Action {
+		switch len(c.Parts) {
+		case 0:
+			return carapace.Batch(
+				ActionConfigHosts(),
+				ActionOwners(HostOpts{}),
+			).ToA().Suffix("/")
+		case 1:
+			if strings.Contains(c.Parts[0], ".") {
+				return ActionOwners(HostOpts{Host: c.Parts[0]}).Suffix("/")
+			}
+			return ActionRepositories(OwnerOpts{Owner: c.Parts[0]})
+		default:
+			if strings.Contains(c.Parts[0], ".") {
+				return ActionRepositories(OwnerOpts{Host: c.Parts[0], Owner: c.Parts[1]})
+			}
+			return carapace.ActionValues()
+		}
+	})
+}