Merge pull request cli#4705 from cli/jg/rename-errs

josebalius · web-flow · commit db6e1d20cb05 · 2021-11-09T07:42:14.000-05:00
codespace: Rename errors from Live Share to generic codespace
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
@@ -43,7 +43,7 @@ func PollPostCreateStates(ctx context.Context, progress progressIndicator, apiCl
 
 	session, err := ConnectToLiveshare(ctx, progress, noopLogger, apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("connect to Live Share: %w", err)
+		return fmt.Errorf("connect to codespace: %w", err)
 	}
 	defer func() {
 		if closeErr := session.Close(); err == nil {
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
@@ -53,7 +53,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("connecting to Live Share: %w", err)
+		return fmt.Errorf("connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
diff --git a/pkg/cmd/codespace/ports.go b/pkg/cmd/codespace/ports.go
@@ -59,7 +59,7 @@ func (a *App) ListPorts(ctx context.Context, codespaceName string, exporter cmdu
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
@@ -245,7 +245,7 @@ func (a *App) UpdatePortVisibility(ctx context.Context, codespaceName string, ar
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
@@ -321,7 +321,7 @@ func (a *App) ForwardPorts(ctx context.Context, codespaceName string, ports []st
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -85,7 +85,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, liveshareLogger, a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func PollPostCreateStates(ctx context.Context, progress progressIndicator, apiCl`
`43`	`43`
`44`	`44`	`session, err := ConnectToLiveshare(ctx, progress, noopLogger, apiClient, codespace)`
`45`	`45`	`if err != nil {`
`46`		`- return fmt.Errorf("connect to Live Share: %w", err)`
	`46`	`+ return fmt.Errorf("connect to codespace: %w", err)`
`47`	`47`	`}`
`48`	`48`	`defer func() {`
`49`	`49`	`if closeErr := session.Close(); err == nil {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err`
`53`	`53`
`54`	`54`	`session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)`
`55`	`55`	`if err != nil {`
`56`		`- return fmt.Errorf("connecting to Live Share: %w", err)`
	`56`	`+ return fmt.Errorf("connecting to codespace: %w", err)`
`57`	`57`	`}`
`58`	`58`	`defer safeClose(session, &err)`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (a *App) ListPorts(ctx context.Context, codespaceName string, exporter cmdu`
`59`	`59`
`60`	`60`	`session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)`
`61`	`61`	`if err != nil {`
`62`		`- return fmt.Errorf("error connecting to Live Share: %w", err)`
	`62`	`+ return fmt.Errorf("error connecting to codespace: %w", err)`
`63`	`63`	`}`
`64`	`64`	`defer safeClose(session, &err)`
`65`	`65`
`@@ -245,7 +245,7 @@ func (a *App) UpdatePortVisibility(ctx context.Context, codespaceName string, ar`
`245`	`245`
`246`	`246`	`session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)`
`247`	`247`	`if err != nil {`
`248`		`- return fmt.Errorf("error connecting to Live Share: %w", err)`
	`248`	`+ return fmt.Errorf("error connecting to codespace: %w", err)`
`249`	`249`	`}`
`250`	`250`	`defer safeClose(session, &err)`
`251`	`251`
`@@ -321,7 +321,7 @@ func (a *App) ForwardPorts(ctx context.Context, codespaceName string, ports []st`
`321`	`321`
`322`	`322`	`session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)`
`323`	`323`	`if err != nil {`
`324`		`- return fmt.Errorf("error connecting to Live Share: %w", err)`
	`324`	`+ return fmt.Errorf("error connecting to codespace: %w", err)`
`325`	`325`	`}`
`326`	`326`	`defer safeClose(session, &err)`
`327`	`327`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e`
`85`	`85`
`86`	`86`	`session, err := codespaces.ConnectToLiveshare(ctx, a, liveshareLogger, a.apiClient, codespace)`
`87`	`87`	`if err != nil {`
`88`		`- return fmt.Errorf("error connecting to Live Share: %w", err)`
	`88`	`+ return fmt.Errorf("error connecting to codespace: %w", err)`
`89`	`89`	`}`
`90`	`90`	`defer safeClose(session, &err)`
`91`	`91`