return non-zero if ssh config skips any codespaces

znull · znull · commit 206b6379c32d · 2021-12-17T10:47:22.000-07:00
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -205,10 +205,12 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error
 	// it once per repository.
 	sshUsers := map[string]string{}
 
+	var status error
 	for _, cs := range codespaces {
 
 		if cs.State != "Available" {
 			fmt.Fprintf(os.Stderr, "skipping unavailable codespace %s: %s\n", cs.Name, cs.State)
+			status = cmdutil.SilentError
 			continue
 		}
 
@@ -226,6 +228,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error
 				// Move on to the next codespace. We don't want to bail here - just because we're not
 				// able to set up connectivity to one doesn't mean we shouldn't make a best effort to
 				// generate configs for the rest of them.
+				status = cmdutil.SilentError
 				continue
 			}
 			defer session.Close()
@@ -235,6 +238,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error
 			a.StopProgressIndicator()
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "error getting ssh server details: %v", err)
+				status = cmdutil.SilentError
 				continue // see above
 			}
 			sshUsers[cs.Repository.FullName] = sshUser
@@ -251,7 +255,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error
 		}
 	}
 
-	return nil
+	return status
 }
 
 // codespaceSSHConfig contains values needed to write an OpenSSH host

Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,12 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error`
`205`	`205`	`// it once per repository.`
`206`	`206`	`sshUsers := map[string]string{}`
`207`	`207`
	`208`	`+ var status error`
`208`	`209`	`for _, cs := range codespaces {`
`209`	`210`
`210`	`211`	`if cs.State != "Available" {`
`211`	`212`	`fmt.Fprintf(os.Stderr, "skipping unavailable codespace %s: %s\n", cs.Name, cs.State)`
	`213`	`+ status = cmdutil.SilentError`
`212`	`214`	`continue`
`213`	`215`	`}`
`214`	`216`
`@@ -226,6 +228,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error`
`226`	`228`	`// Move on to the next codespace. We don't want to bail here - just because we're not`
`227`	`229`	`// able to set up connectivity to one doesn't mean we shouldn't make a best effort to`
`228`	`230`	`// generate configs for the rest of them.`
	`231`	`+ status = cmdutil.SilentError`
`229`	`232`	`continue`
`230`	`233`	`}`
`231`	`234`	`defer session.Close()`
`@@ -235,6 +238,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error`
`235`	`238`	`a.StopProgressIndicator()`
`236`	`239`	`if err != nil {`
`237`	`240`	`fmt.Fprintf(os.Stderr, "error getting ssh server details: %v", err)`
	`241`	`+ status = cmdutil.SilentError`
`238`	`242`	`continue // see above`
`239`	`243`	`}`
`240`	`244`	`sshUsers[cs.Repository.FullName] = sshUser`
`@@ -251,7 +255,7 @@ func (a *App) printOpenSSHConfig(ctx context.Context, opts configOptions) error`
`251`	`255`	`}`
`252`	`256`	`}`
`253`	`257`
`254`		`- return nil`
	`258`	`+ return status`
`255`	`259`	`}`
`256`	`260`
`257`	`261`	`// codespaceSSHConfig contains values needed to write an OpenSSH host`