Merge pull request cli#4409 from cli/jg/delete-codespace-public

josebalius · web-flow · commit 50d8f1e09ab6 · 2021-10-05T08:20:53.000-04:00
codespace delete: update DeleteCodespaces to new API endpoint
diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go
@@ -520,20 +520,14 @@ func (a *API) startCreate(ctx context.Context, repoID int, machine, branch, loca
 	return &response, nil
 }
 
-func (a *API) DeleteCodespace(ctx context.Context, user string, codespaceName string) error {
-	token, err := a.GetCodespaceToken(ctx, user, codespaceName)
-	if err != nil {
-		return fmt.Errorf("error getting codespace token: %w", err)
-	}
-
-	req, err := http.NewRequest(http.MethodDelete, a.githubAPI+"/vscs_internal/user/"+user+"/codespaces/"+codespaceName, nil)
+func (a *API) DeleteCodespace(ctx context.Context, codespaceName string) error {
+	req, err := http.NewRequest(http.MethodDelete, a.githubAPI+"/user/codespaces/"+codespaceName, nil)
 	if err != nil {
 		return fmt.Errorf("error creating request: %w", err)
 	}
 
-	// TODO: use a.setHeaders()
-	req.Header.Set("Authorization", "Bearer "+token)
-	resp, err := a.do(ctx, req, "/vscs_internal/user/*/codespaces/*")
+	a.setHeaders(req)
+	resp, err := a.do(ctx, req, "/user/codespaces/*")
 	if err != nil {
 		return fmt.Errorf("error making request: %w", err)
 	}
diff --git a/pkg/cmd/codespace/common.go b/pkg/cmd/codespace/common.go
@@ -36,7 +36,7 @@ type apiClient interface {
 	GetCodespaceToken(ctx context.Context, user, name string) (string, error)
 	GetCodespace(ctx context.Context, token, user, name string) (*api.Codespace, error)
 	ListCodespaces(ctx context.Context) ([]*api.Codespace, error)
-	DeleteCodespace(ctx context.Context, user, name string) error
+	DeleteCodespace(ctx context.Context, name string) error
 	StartCodespace(ctx context.Context, token string, codespace *api.Codespace) error
 	CreateCodespace(ctx context.Context, params *api.CreateCodespaceParams) (*api.Codespace, error)
 	GetRepository(ctx context.Context, nwo string) (*api.Repository, error)
diff --git a/pkg/cmd/codespace/delete.go b/pkg/cmd/codespace/delete.go
@@ -80,7 +80,6 @@ func (a *App) Delete(ctx context.Context, opts deleteOptions) error {
 			nameFilter = c.Name
 		}
 	} else {
-		// TODO: this token is discarded and then re-requested later in DeleteCodespace
 		token, err := a.apiClient.GetCodespaceToken(ctx, user.Login, nameFilter)
 		if err != nil {
 			return fmt.Errorf("error getting codespace token: %w", err)
@@ -132,7 +131,7 @@ func (a *App) Delete(ctx context.Context, opts deleteOptions) error {
 	for _, c := range codespacesToDelete {
 		codespaceName := c.Name
 		g.Go(func() error {
-			if err := a.apiClient.DeleteCodespace(ctx, user.Login, codespaceName); err != nil {
+			if err := a.apiClient.DeleteCodespace(ctx, codespaceName); err != nil {
 				_, _ = a.logger.Errorf("error deleting codespace %q: %v\n", codespaceName, err)
 				return err
 			}
@@ -143,6 +142,13 @@ func (a *App) Delete(ctx context.Context, opts deleteOptions) error {
 	if err := g.Wait(); err != nil {
 		return errors.New("some codespaces failed to delete")
 	}
+
+	noun := "Codespace"
+	if len(codespacesToDelete) > 1 {
+		noun = noun + "s"
+	}
+	a.logger.Println(noun + " deleted.")
+
 	return nil
 }
 
diff --git a/pkg/cmd/codespace/delete_test.go b/pkg/cmd/codespace/delete_test.go
@@ -156,10 +156,7 @@ func TestDelete(t *testing.T) {
 				GetUserFunc: func(_ context.Context) (*api.User, error) {
 					return user, nil
 				},
-				DeleteCodespaceFunc: func(_ context.Context, userLogin, name string) error {
-					if userLogin != user.Login {
-						return fmt.Errorf("unexpected user %q", userLogin)
-					}
+				DeleteCodespaceFunc: func(_ context.Context, name string) error {
 					if tt.deleteErr != nil {
 						return tt.deleteErr
 					}
diff --git a/pkg/cmd/codespace/mock_api.go b/pkg/cmd/codespace/mock_api.go
