Merge pull request #872 from rsteube/gh-updates-from-2.5.0

rsteube · web-flow · commit 4ae32fc42dd2 · 2022-02-01T12:57:34.000+01:00
gh: updates from 2.5.0
diff --git a/completers/gh_completer/cmd/action/key.go b/completers/gh_completer/cmd/action/key.go
@@ -0,0 +1,48 @@
+package action
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+type deployKey struct {
+	Id    int
+	Title string
+	Key   string
+}
+
+func ActionDeployKeys(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		repo, err := repoOverride(cmd)
+		if err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		var queryResult []deployKey
+		return ApiV3Action(cmd, fmt.Sprintf(`repos/%v/%v/keys`, repo.RepoOwner(), repo.RepoName()), &queryResult, func() carapace.Action {
+			vals := make([]string, 0)
+			for _, key := range queryResult {
+				vals = append(vals, strconv.Itoa(key.Id), fmt.Sprintf("%v %v", key.Title, truncateMiddle(26, key.Key)))
+			}
+			return carapace.ActionValuesDescribed(vals...)
+		})
+	})
+}
+
+func truncateMiddle(maxWidth int, t string) string {
+	if len(t) <= maxWidth {
+		return t
+	}
+
+	ellipsis := "..."
+	if maxWidth < len(ellipsis)+2 {
+		return t[0:maxWidth]
+	}
+
+	halfWidth := (maxWidth - len(ellipsis)) / 2
+	remainder := (maxWidth - len(ellipsis)) % 2
+	return t[0:halfWidth+remainder] + ellipsis + t[len(t)-halfWidth:]
+}
diff --git a/completers/gh_completer/cmd/api.go b/completers/gh_completer/cmd/api.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/rsteube/carapace"
 	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/net/http"
 	"github.com/spf13/cobra"
 )
 
@@ -15,21 +16,22 @@ var apiCmd = &cobra.Command{
 func init() {
 	carapace.Gen(apiCmd).Standalone()
 	apiCmd.Flags().Duration("cache", 0, "Cache the response, e.g. \"3600s\", \"60m\", \"1h\"")
-	apiCmd.Flags().StringArrayP("field", "F", nil, "Add a typed parameter in `key=value` format")
-	apiCmd.Flags().StringArrayP("header", "H", nil, "Add a HTTP request header in `key:value` format")
+	apiCmd.Flags().StringArrayP("field", "F", []string{}, "Add a typed parameter in `key=value` format")
+	apiCmd.Flags().StringArrayP("header", "H", []string{}, "Add a HTTP request header in `key:value` format")
 	apiCmd.Flags().String("hostname", "", "The GitHub hostname for the request (default \"github.com\")")
 	apiCmd.Flags().BoolP("include", "i", false, "Include HTTP response headers in the output")
-	apiCmd.Flags().String("input", "", "The `file` to use as body for the HTTP request")
+	apiCmd.Flags().String("input", "", "The `file` to use as body for the HTTP request (use \"-\" to read from standard input)")
 	apiCmd.Flags().StringP("jq", "q", "", "Query to select values from the response using jq syntax")
 	apiCmd.Flags().StringP("method", "X", "GET", "The HTTP method for the request")
 	apiCmd.Flags().Bool("paginate", false, "Make additional HTTP requests to fetch all pages of results")
-	apiCmd.Flags().StringSliceP("preview", "p", nil, "Opt into GitHub API previews")
-	apiCmd.Flags().StringArrayP("raw-field", "f", nil, "Add a string parameter in `key=value` format")
+	apiCmd.Flags().StringSliceP("preview", "p", []string{}, "Opt into GitHub API previews")
+	apiCmd.Flags().StringArrayP("raw-field", "f", []string{}, "Add a string parameter in `key=value` format")
 	apiCmd.Flags().Bool("silent", false, "Do not print the response body")
 	apiCmd.Flags().StringP("template", "t", "", "Format the response using a Go template")
 	rootCmd.AddCommand(apiCmd)
 
 	carapace.Gen(apiCmd).FlagCompletion(carapace.ActionMap{
+		"header":   http.ActionHttpRequestHeaders(),
 		"hostname": action.ActionConfigHosts(),
 		"input":    carapace.ActionFiles(),
 		"method":   action.ActionHttpMethods(),
diff --git a/completers/gh_completer/cmd/auth_login.go b/completers/gh_completer/cmd/auth_login.go
@@ -15,7 +15,7 @@ var auth_loginCmd = &cobra.Command{
 func init() {
 	carapace.Gen(auth_loginCmd).Standalone()
 	auth_loginCmd.Flags().StringP("hostname", "h", "", "The hostname of the GitHub instance to authenticate with")
-	auth_loginCmd.Flags().StringSliceP("scopes", "s", nil, "Additional authentication scopes for gh to have")
+	auth_loginCmd.Flags().StringSliceP("scopes", "s", []string{}, "Additional authentication scopes for gh to have")
 	auth_loginCmd.Flags().BoolP("web", "w", false, "Open a browser to authenticate")
 	auth_loginCmd.Flags().Bool("with-token", false, "Read token from standard input")
 	authCmd.AddCommand(auth_loginCmd)
diff --git a/completers/gh_completer/cmd/auth_refresh.go b/completers/gh_completer/cmd/auth_refresh.go
@@ -15,7 +15,7 @@ var auth_refreshCmd = &cobra.Command{
 func init() {
 	carapace.Gen(auth_refreshCmd).Standalone()
 	auth_refreshCmd.Flags().StringP("hostname", "h", "", "The GitHub host to use for authentication")
-	auth_refreshCmd.Flags().StringSliceP("scopes", "s", nil, "Additional authentication scopes for gh to have")
+	auth_refreshCmd.Flags().StringSliceP("scopes", "s", []string{}, "Additional authentication scopes for gh to have")
 	authCmd.AddCommand(auth_refreshCmd)
 
 	carapace.Gen(auth_refreshCmd).FlagCompletion(carapace.ActionMap{
diff --git a/completers/gh_completer/cmd/browse.go b/completers/gh_completer/cmd/browse.go
@@ -26,9 +26,9 @@ func init() {
 	browseCmd.Flags().BoolP("commit", "c", false, "Open the last commit")
 	browseCmd.Flags().BoolP("no-browser", "n", false, "Print destination URL instead of opening the browser")
 	browseCmd.Flags().BoolP("projects", "p", false, "Open repository projects")
+	browseCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `[HOST/]OWNER/REPO` format")
 	browseCmd.Flags().BoolP("settings", "s", false, "Open repository settings")
 	browseCmd.Flags().BoolP("wiki", "w", false, "Open repository wiki")
-	browseCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `[HOST/]OWNER/REPO` format")
 	rootCmd.AddCommand(browseCmd)
 
 	carapace.Gen(browseCmd).FlagCompletion(carapace.ActionMap{
diff --git a/completers/gh_completer/cmd/codespace_ssh.go b/completers/gh_completer/cmd/codespace_ssh.go
@@ -15,10 +15,12 @@ var codespace_sshCmd = &cobra.Command{
 func init() {
 	carapace.Gen(codespace_sshCmd).Standalone()
 	codespace_sshCmd.Flags().StringP("codespace", "c", "", "Name of the codespace")
+	codespace_sshCmd.Flags().Bool("config", false, "Write OpenSSH configuration to stdout")
 	codespace_sshCmd.Flags().BoolP("debug", "d", false, "Log debug data to a file")
 	codespace_sshCmd.Flags().String("debug-file", "", "Path of the file log to")
 	codespace_sshCmd.Flags().String("profile", "", "Name of the SSH profile to use")
 	codespace_sshCmd.Flags().Int("server-port", 0, "SSH server port number (0 => pick unused)")
+	codespace_sshCmd.Flags().Bool("stdio", false, "Proxy sshd connection to stdio")
 	codespaceCmd.AddCommand(codespace_sshCmd)
 
 	carapace.Gen(codespace_sshCmd).FlagCompletion(carapace.ActionMap{
diff --git a/completers/gh_completer/cmd/gist_edit.go b/completers/gh_completer/cmd/gist_edit.go
@@ -15,6 +15,7 @@ var gist_editCmd = &cobra.Command{
 func init() {
 	carapace.Gen(gist_editCmd).Standalone()
 	gist_editCmd.Flags().StringP("add", "a", "", "Add a new file to the gist")
+	gist_editCmd.Flags().StringP("desc", "d", "", "New description for the gist")
 	gist_editCmd.Flags().StringP("filename", "f", "", "Select a file to edit")
 	gistCmd.AddCommand(gist_editCmd)
 
diff --git a/completers/gh_completer/cmd/gist_view.go b/completers/gh_completer/cmd/gist_view.go
@@ -13,8 +13,9 @@ var gist_viewCmd = &cobra.Command{
 }
 
 func init() {
+	carapace.Gen(gist_viewCmd).Standalone()
 	gist_viewCmd.Flags().StringP("filename", "f", "", "Display a single file from the gist")
-	gist_viewCmd.Flags().BoolP("files", "", false, "List file names from the gist")
+	gist_viewCmd.Flags().Bool("files", false, "List file names from the gist")
 	gist_viewCmd.Flags().BoolP("raw", "r", false, "Print raw instead of rendered gist contents")
 	gist_viewCmd.Flags().BoolP("web", "w", false, "Open gist in the browser")
 	gistCmd.AddCommand(gist_viewCmd)
diff --git a/completers/gh_completer/cmd/release_deleteAsset.go b/completers/gh_completer/cmd/release_deleteAsset.go
@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/spf13/cobra"
+)
+
+var release_deleteAssetCmd = &cobra.Command{
+	Use:   "delete-asset",
+	Short: "Delete an asset from a release",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(release_deleteAssetCmd).Standalone()
+	release_deleteAssetCmd.Flags().BoolP("yes", "y", false, "Skip the confirmation prompt")
+	releaseCmd.AddCommand(release_deleteAssetCmd)
+
+	carapace.Gen(release_deleteAssetCmd).PositionalCompletion(
+		action.ActionReleases(release_deleteAssetCmd),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return action.ActionReleaseAssets(release_deleteAssetCmd, c.Args[0])
+		}),
+	)
+}
diff --git a/completers/gh_completer/cmd/repo_deployKey.go b/completers/gh_completer/cmd/repo_deployKey.go
@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/spf13/cobra"
+)
+
+var repo_deployKeyCmd = &cobra.Command{
+	Use:   "deploy-key",
+	Short: "Manage deploy keys in a repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(repo_deployKeyCmd).Standalone()
+	repo_deployKeyCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `[HOST/]OWNER/REPO` format")
+	repoCmd.AddCommand(repo_deployKeyCmd)
+
+	carapace.Gen(repo_deployKeyCmd).FlagCompletion(carapace.ActionMap{
+		"repo": action.ActionRepoOverride(repo_deployKeyCmd),
+	})
+}
diff --git a/completers/gh_completer/cmd/repo_deployKey_add.go b/completers/gh_completer/cmd/repo_deployKey_add.go
@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var repo_deployKey_addCmd = &cobra.Command{
+	Use:   "add",
+	Short: "Add a deploy key to a GitHub repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(repo_deployKey_addCmd).Standalone()
+	repo_deployKey_addCmd.Flags().BoolP("allow-write", "w", false, "Allow write access for the key")
+	repo_deployKey_addCmd.Flags().StringP("title", "t", "", "Title of the new key")
+	repo_deployKeyCmd.AddCommand(repo_deployKey_addCmd)
+
+	carapace.Gen(repo_deployKey_addCmd).PositionalCompletion(
+		carapace.ActionFiles(),
+	)
+}
diff --git a/completers/gh_completer/cmd/repo_deployKey_delete.go b/completers/gh_completer/cmd/repo_deployKey_delete.go
@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/completers/gh_completer/cmd/action"
+	"github.com/spf13/cobra"
+)
+
+var repo_deployKey_deleteCmd = &cobra.Command{
+	Use:   "delete",
+	Short: "Delete a deploy key from a GitHub repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(repo_deployKey_deleteCmd).Standalone()
+	repo_deployKeyCmd.AddCommand(repo_deployKey_deleteCmd)
+
+	carapace.Gen(repo_deployKey_deleteCmd).PositionalCompletion(
+		action.ActionDeployKeys(repo_deployKey_deleteCmd),
+	)
+}
diff --git a/completers/gh_completer/cmd/repo_deployKey_list.go b/completers/gh_completer/cmd/repo_deployKey_list.go
@@ -0,0 +1,17 @@
+package cmd
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+)
+
+var repo_deployKey_listCmd = &cobra.Command{
+	Use:   "list",
+	Short: "List deploy keys in a GitHub repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(repo_deployKey_listCmd).Standalone()
+	repo_deployKeyCmd.AddCommand(repo_deployKey_listCmd)
+}
diff --git a/completers/gh_completer/cmd/repo_fork.go b/completers/gh_completer/cmd/repo_fork.go
@@ -15,6 +15,7 @@ var repo_forkCmd = &cobra.Command{
 func init() {
 	carapace.Gen(repo_forkCmd).Standalone()
 	repo_forkCmd.Flags().Bool("clone", false, "Clone the fork {true|false}")
+	repo_forkCmd.Flags().String("fork-name", "", "Specify a name for the forked repo")
 	repo_forkCmd.Flags().String("org", "", "Create the fork in an organization")
 	repo_forkCmd.Flags().Bool("remote", false, "Add remote for fork {true|false}")
 	repo_forkCmd.Flags().String("remote-name", "origin", "Specify a name for a fork's new remote.")
diff --git a/completers/gh_completer/cmd/run_list.go b/completers/gh_completer/cmd/run_list.go
@@ -14,15 +14,19 @@ var run_listCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(run_listCmd).Standalone()
+	run_listCmd.Flags().StringP("branch", "b", "", "Filter runs by branch")
 	run_listCmd.Flags().StringP("jq", "q", "", "Filter JSON output using a jq `expression`")
 	run_listCmd.Flags().StringSlice("json", []string{}, "Output JSON with the specified `fields`")
 	run_listCmd.Flags().IntP("limit", "L", 20, "Maximum number of runs to fetch")
 	run_listCmd.Flags().StringP("template", "t", "", "Format JSON output using a Go template")
+	run_listCmd.Flags().StringP("user", "u", "", "Filter runs by user who triggered the run")
 	run_listCmd.Flags().StringP("workflow", "w", "", "Filter runs by workflow")
 	runCmd.AddCommand(run_listCmd)
 
 	carapace.Gen(run_listCmd).FlagCompletion(carapace.ActionMap{
+		"branch":   action.ActionBranches(run_listCmd),
 		"json":     action.ActionRunFields(),
+		"user":     action.ActionUsers(run_listCmd, action.UserOpts{Users: true, Organizations: true}),
 		"workflow": action.ActionWorkflows(run_listCmd, action.WorkflowOpts{Enabled: true, Id: true, Name: true}),
 	})
 }
diff --git a/completers/gh_completer/cmd/workflow_list.go b/completers/gh_completer/cmd/workflow_list.go
@@ -16,7 +16,4 @@ func init() {
 	workflow_listCmd.Flags().BoolP("all", "a", false, "Show all workflows, including disabled workflows")
 	workflow_listCmd.Flags().IntP("limit", "L", 50, "Maximum number of workflows to fetch")
 	workflowCmd.AddCommand(workflow_listCmd)
-
-	workflowCmd.Flags().IntP("limit", "L", 50, "Maximum number of workflows to fetch")
-	workflowCmd.Flags().BoolP("all", "a", false, "Show all workflows, including disabled workflows")
 }
diff --git a/pkg/actions/net/http/http.go b/pkg/actions/net/http/http.go
@@ -6,7 +6,23 @@ import (
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
 )
 
-// ActionHttpRequestHeaderNames completes http reqest header names
+// ActionHttpRequestHeaders ocmpletes http request headers
+//   Accept:application/json
+//   Accept-Encoding:exi,br
+func ActionHttpRequestHeaders() carapace.Action {
+	return carapace.ActionMultiParts(":", func(c carapace.Context) carapace.Action {
+		switch len(c.Parts) {
+		case 0:
+			return ActionHttpRequestHeaderNames().Invoke(c).Suffix(":").ToA()
+		case 1:
+			return ActionHttpRequestHeaderValues(c.Parts[0])
+		default:
+			return carapace.ActionValues()
+		}
+	})
+}
+
+// ActionHttpRequestHeaderNames completes http request header names
 //   Accept-Charset (Character sets that are acceptable.)
 //   Accept-Datetime (Acceptable version in time.)
 func ActionHttpRequestHeaderNames() carapace.Action {
