Remove unhelpful error wrapper

cwndrws · cwndrws · commit 64eecef17636 · 2022-03-16T09:36:14.000-04:00
diff --git a/pkg/cmd/codespace/code.go b/pkg/cmd/codespace/code.go
@@ -33,7 +33,7 @@ func newCodeCmd(app *App) *cobra.Command {
 func (a *App) VSCode(ctx context.Context, codespaceName string, useInsiders bool) error {
 	codespace, err := getOrChooseCodespace(ctx, a.apiClient, codespaceName)
 	if err != nil {
-		return fmt.Errorf("get or choose codespace: %w", err)
+		return err
 	}
 
 	url := vscodeProtocolURL(codespace.Name, useInsiders)
diff --git a/pkg/cmd/codespace/code_test.go b/pkg/cmd/codespace/code_test.go
@@ -58,7 +58,7 @@ func TestPendingOperationDisallowsCode(t *testing.T) {
 	app := testingCodeApp()
 
 	if err := app.VSCode(context.Background(), "disabledCodespace", false); err != nil {
-		if err.Error() != "get or choose codespace: codespace is disabled while it has a pending operation: Some pending operation" {
+		if err.Error() != "codespace is disabled while it has a pending operation: Some pending operation" {
 			t.Errorf("expected pending operation error, but got: %v", err)
 		}
 	} else {
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
@@ -38,7 +38,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err
 
 	codespace, err := getOrChooseCodespace(ctx, a.apiClient, codespaceName)
 	if err != nil {
-		return fmt.Errorf("get or choose codespace: %w", err)
+		return err
 	}
 
 	authkeys := make(chan error, 1)
diff --git a/pkg/cmd/codespace/logs_test.go b/pkg/cmd/codespace/logs_test.go
@@ -12,7 +12,7 @@ func TestPendingOperationDisallowsLogs(t *testing.T) {
 	app := testingLogsApp()
 
 	if err := app.Logs(context.Background(), "disabledCodespace", false); err != nil {
-		if err.Error() != "get or choose codespace: codespace is disabled while it has a pending operation: Some pending operation" {
+		if err.Error() != "codespace is disabled while it has a pending operation: Some pending operation" {
 			t.Errorf("expected pending operation error, but got: %v", err)
 		}
 	} else {
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -125,7 +125,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 
 	codespace, err := getOrChooseCodespace(ctx, a.apiClient, opts.codespace)
 	if err != nil {
-		return fmt.Errorf("get or choose codespace: %w", err)
+		return err
 	}
 
 	liveshareLogger := noopLogger()
diff --git a/pkg/cmd/codespace/ssh_test.go b/pkg/cmd/codespace/ssh_test.go
@@ -12,7 +12,7 @@ func TestPendingOperationDisallowsSSH(t *testing.T) {
 	app := testingSSHApp()
 
 	if err := app.SSH(context.Background(), []string{}, sshOptions{codespace: "disabledCodespace"}); err != nil {
-		if err.Error() != "get or choose codespace: codespace is disabled while it has a pending operation: Some pending operation" {
+		if err.Error() != "codespace is disabled while it has a pending operation: Some pending operation" {
 			t.Errorf("expected pending operation error, but got: %v", err)
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func newCodeCmd(app App) cobra.Command {`
`33`	`33`	`func (a *App) VSCode(ctx context.Context, codespaceName string, useInsiders bool) error {`
`34`	`34`	`codespace, err := getOrChooseCodespace(ctx, a.apiClient, codespaceName)`
`35`	`35`	`if err != nil {`
`36`		`- return fmt.Errorf("get or choose codespace: %w", err)`
	`36`	`+ return err`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`url := vscodeProtocolURL(codespace.Name, useInsiders)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func TestPendingOperationDisallowsCode(t *testing.T) {`
`58`	`58`	`app := testingCodeApp()`
`59`	`59`
`60`	`60`	`if err := app.VSCode(context.Background(), "disabledCodespace", false); err != nil {`
`61`		`- if err.Error() != "get or choose codespace: codespace is disabled while it has a pending operation: Some pending operation" {`
	`61`	`+ if err.Error() != "codespace is disabled while it has a pending operation: Some pending operation" {`
`62`	`62`	`t.Errorf("expected pending operation error, but got: %v", err)`
`63`	`63`	`}`
`64`	`64`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err`
`38`	`38`
`39`	`39`	`codespace, err := getOrChooseCodespace(ctx, a.apiClient, codespaceName)`
`40`	`40`	`if err != nil {`
`41`		`- return fmt.Errorf("get or choose codespace: %w", err)`
	`41`	`+ return err`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`authkeys := make(chan error, 1)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ func TestPendingOperationDisallowsLogs(t *testing.T) {`
`12`	`12`	`app := testingLogsApp()`
`13`	`13`
`14`	`14`	`if err := app.Logs(context.Background(), "disabledCodespace", false); err != nil {`
`15`		`- if err.Error() != "get or choose codespace: codespace is disabled while it has a pending operation: Some pending operation" {`
	`15`	`+ if err.Error() != "codespace is disabled while it has a pending operation: Some pending operation" {`
`16`	`16`	`t.Errorf("expected pending operation error, but got: %v", err)`
`17`	`17`	`}`
`18`	`18`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e`
`125`	`125`
`126`	`126`	`codespace, err := getOrChooseCodespace(ctx, a.apiClient, opts.codespace)`
`127`	`127`	`if err != nil {`
`128`		`- return fmt.Errorf("get or choose codespace: %w", err)`
	`128`	`+ return err`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`liveshareLogger := noopLogger()`