Merge branch 'cli:trunk' into trunk

pkg/cmd/auth/status/status.go

@@ -3,6 +3,7 @@ package status
 import (
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -107,13 +108,18 @@ func statusRun(opts *StatusOptions) error {
 
 		scopesHeader, err := shared.GetScopes(httpClient, hostname, token)
 		if err != nil {
-			addMsg("%s %s: authentication failed", cs.Red("X"), hostname)
-			addMsg("- The %s token in %s is invalid.", cs.Bold(hostname), tokenSource)
-			if tokenIsWriteable {
-				addMsg("- To re-authenticate, run: %s %s",
-					cs.Bold("gh auth login -h"), cs.Bold(hostname))
-				addMsg("- To forget about this host, run: %s %s",
-					cs.Bold("gh auth logout -h"), cs.Bold(hostname))
+			var networkError net.Error
+			if errors.As(err, &networkError) && networkError.Timeout() {
+				addMsg("%s %s: timeout trying to connect to host", cs.Red("X"), hostname)
+			} else {
+				addMsg("%s %s: authentication failed", cs.Red("X"), hostname)
+				addMsg("- The %s token in %s is invalid.", cs.Bold(hostname), tokenSource)
+				if tokenIsWriteable {
+					addMsg("- To re-authenticate, run: %s %s",
+						cs.Bold("gh auth login -h"), cs.Bold(hostname))
+					addMsg("- To forget about this host, run: %s %s",
+						cs.Bold("gh auth logout -h"), cs.Bold(hostname))
+				}
 			}
 			failed = true
 			continue

pkg/cmd/auth/status/status_test.go

@@ -2,6 +2,7 @@ package status
 
 import (
 	"bytes"
+	"context"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -84,6 +85,26 @@ func Test_statusRun(t *testing.T) {
 		wantOut    string
 		wantErrOut string
 	}{
+		{
+			name: "timeout error",
+			opts: &StatusOptions{
+				Hostname: "joel.miller",
+			},
+			cfgStubs: func(c *config.ConfigMock) {
+				c.Set("joel.miller", "oauth_token", "abc123")
+			},
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(httpmock.REST("GET", "api/v3/"), func(req *http.Request) (*http.Response, error) {
+					// timeout error
+					return nil, context.DeadlineExceeded
+				})
+			},
+			wantErr: "SilentError",
+			wantErrOut: heredoc.Doc(`
+			joel.miller
+			  X joel.miller: timeout trying to connect to host
+			`),
+		},
 		{
 			name: "hostname set",
 			opts: &StatusOptions{

pkg/cmd/codespace/create.go

@@ -24,6 +24,10 @@ const (
 	permissionsPollingTimeout  = 1 * time.Minute
 )
 
+const (
+	displayNameMaxLength = 48 // 48 is the max length of the display name in the API
+)
+
 var (
 	DEFAULT_DEVCONTAINER_DEFINITIONS = []string{".devcontainer.json", ".devcontainer/devcontainer.json"}
 )
@@ -110,7 +114,7 @@ func newCreateCmd(app *App) *cobra.Command {
 	createCmd.Flags().DurationVar(&opts.idleTimeout, "idle-timeout", 0, "allowed inactivity before codespace is stopped, e.g. \"10m\", \"1h\"")
 	createCmd.Flags().Var(&opts.retentionPeriod, "retention-period", "allowed time after shutting down before the codespace is automatically deleted (maximum 30 days), e.g. \"1h\", \"72h\"")
 	createCmd.Flags().StringVar(&opts.devContainerPath, "devcontainer-path", "", "path to the devcontainer.json file to use when creating codespace")
-	createCmd.Flags().StringVarP(&opts.displayName, "display-name", "d", "", "display name for the codespace")
+	createCmd.Flags().StringVarP(&opts.displayName, "display-name", "d", "", fmt.Sprintf("display name for the codespace (%d characters or less)", displayNameMaxLength))
 
 	return createCmd
 }
@@ -282,6 +286,10 @@ func (a *App) Create(ctx context.Context, opts createOptions) error {
 		}
 	}
 
+	if len(opts.displayName) > displayNameMaxLength {
+		return fmt.Errorf("error creating codespace: display name should contain a maximum of %d characters", displayNameMaxLength)
+	}
+
 	createParams := &api.CreateCodespaceParams{
 		RepositoryID:           repository.ID,
 		Branch:                 branch,

pkg/cmd/codespace/create_test.go

@@ -184,6 +184,25 @@ func TestApp_Create(t *testing.T) {
 			wantStderr: "  ✓ Codespaces usage for this repository is paid for by monalisa\n",
 			wantErr:    fmt.Errorf("error getting machine type: there is no such machine for the repository: %s\nAvailable machines: %v", "MEGA", []string{"GIGA", "TERA"}),
 		},
+		{
+			name: "create codespace with display name more than 48 characters results in error",
+			fields: fields{
+				apiClient: apiCreateDefaults(&apiClientMock{
+					CreateCodespaceFunc: func(ctx context.Context, params *api.CreateCodespaceParams) (*api.Codespace, error) {
+						return &api.Codespace{
+							Name: "monalisa-dotfiles-abcd1234",
+						}, nil
+					},
+				}),
+			},
+			opts: createOptions{
+				repo:        "monalisa/dotfiles",
+				machine:     "GIGA",
+				displayName: "this-is-very-long-display-name-with-49-characters",
+			},
+			wantStderr: "  ✓ Codespaces usage for this repository is paid for by monalisa\n",
+			wantErr:    fmt.Errorf("error creating codespace: display name should contain a maximum of %d characters", displayNameMaxLength),
+		},
 		{
 			name: "create codespace with devcontainer path results in selecting the correct machine type",
 			fields: fields{

pkg/cmd/run/list/list.go

@@ -34,6 +34,7 @@ type ListOptions struct {
 	Status           string
 	Event            string
 	Created          string
+	Commit           string
 
 	now time.Time
 }
@@ -77,6 +78,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
 	cmd.Flags().StringVarP(&opts.Actor, "user", "u", "", "Filter runs by user who triggered the run")
 	cmd.Flags().StringVarP(&opts.Event, "event", "e", "", "Filter runs by which `event` triggered the run")
 	cmd.Flags().StringVarP(&opts.Created, "created", "", "", "Filter runs by the `date` it was created")
+	cmd.Flags().StringVarP(&opts.Commit, "commit", "c", "", "Filter runs by the `SHA` of the commit")
 	cmdutil.StringEnumFlag(cmd, &opts.Status, "status", "s", "", shared.AllStatuses, "Filter runs by status")
 	cmdutil.AddJSONFlags(cmd, &opts.Exporter, shared.RunFields)
 
@@ -103,6 +105,7 @@ func listRun(opts *ListOptions) error {
 		Status:  opts.Status,
 		Event:   opts.Event,
 		Created: opts.Created,
+		Commit:  opts.Commit,
 	}
 
 	opts.IO.StartProgressIndicator()

pkg/cmd/run/list/list_test.go

@@ -479,6 +479,24 @@ func TestListRun(t *testing.T) {
 			wantErr:    true,
 			wantErrMsg: "no runs found",
 		},
+		{
+			name: "commit filter applied",
+			opts: &ListOptions{
+				Limit:  defaultLimit,
+				Commit: "1234567890123456789012345678901234567890",
+			},
+			isTTY: true,
+			stubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.QueryMatcher("GET", "repos/OWNER/REPO/actions/runs", url.Values{
+						"head_sha": []string{"1234567890123456789012345678901234567890"},
+					}),
+					httpmock.JSONResponse(shared.RunsPayload{}),
+				)
+			},
+			wantErr:    true,
+			wantErrMsg: "no runs found",
+		},
 	}
 
 	for _, tt := range tests {

pkg/cmd/run/shared/shared.go

@@ -307,6 +307,7 @@ type FilterOptions struct {
 	Status       string
 	Event        string
 	Created      string
+	Commit       string
 }
 
 // GetRunsWithFilter fetches 50 runs from the API and filters them in-memory
@@ -358,6 +359,9 @@ func GetRuns(client *api.Client, repo ghrepo.Interface, opts *FilterOptions, lim
 		if opts.Created != "" {
 			path += fmt.Sprintf("&created=%s", url.QueryEscape(opts.Created))
 		}
+		if opts.Commit != "" {
+			path += fmt.Sprintf("&head_sha=%s", url.QueryEscape(opts.Commit))
+		}
 	}
 
 	var result *RunsPayload