Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc4c7558

Browse files
committed
feat(coderd): use new data model for task delete
Updatescoder/internal#976
1 parent52acb32 commitc4c7558

File tree

11 files changed

+317
-60
lines changed

11 files changed

+317
-60
lines changed

‎coderd/aitasks.go‎

Lines changed: 44 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -713,78 +713,66 @@ func (api *API) taskGet(rw http.ResponseWriter, r *http.Request) {
713713
// @Router /api/experimental/tasks/{user}/{id} [delete]
714714
//
715715
// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
716-
// taskDelete is an experimental endpoint to delete a task by ID (workspace ID).
716+
// taskDelete is an experimental endpoint to delete a task by ID.
717717
// It creates a delete workspace build and returns 202 Accepted if the build was
718718
// created.
719719
func (api*API)taskDelete(rw http.ResponseWriter,r*http.Request) {
720720
ctx:=r.Context()
721721
apiKey:=httpmw.APIKey(r)
722+
task:=httpmw.TaskParam(r)
722723

723-
idStr:=chi.URLParam(r,"id")
724-
taskID,err:=uuid.Parse(idStr)
725-
iferr!=nil {
726-
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
727-
Message:fmt.Sprintf("Invalid UUID %q for task ID.",idStr),
728-
})
729-
return
730-
}
724+
now:=api.Clock.Now()
731725

732-
// For now, taskID = workspaceID, once we have a task data model in
733-
// the DB, we can change this lookup.
734-
workspaceID:=taskID
735-
workspace,err:=api.Database.GetWorkspaceByID(ctx,workspaceID)
736-
ifhttpapi.Is404Error(err) {
737-
httpapi.ResourceNotFound(rw)
738-
return
739-
}
740-
iferr!=nil {
741-
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
742-
Message:"Internal error fetching workspace.",
743-
Detail:err.Error(),
744-
})
745-
return
726+
iftask.WorkspaceID.Valid {
727+
workspace,err:=api.Database.GetWorkspaceByID(ctx,task.WorkspaceID.UUID)
728+
iferr!=nil {
729+
ifhttpapi.Is404Error(err) {
730+
httpapi.ResourceNotFound(rw)
731+
return
732+
}
733+
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
734+
Message:"Internal error fetching workspace.",
735+
Detail:err.Error(),
736+
})
737+
return
738+
}
739+
740+
// Construct a request to the workspace build creation handler to
741+
// initiate deletion.
742+
buildReq:= codersdk.CreateWorkspaceBuildRequest{
743+
Transition:codersdk.WorkspaceTransitionDelete,
744+
Reason:"Deleted via tasks API",
745+
}
746+
747+
_,err=api.postWorkspaceBuildsInternal(
748+
ctx,
749+
apiKey,
750+
workspace,
751+
buildReq,
752+
func(action policy.Action,object rbac.Objecter)bool {
753+
returnapi.Authorize(r,action,object)
754+
},
755+
audit.WorkspaceBuildBaggageFromRequest(r),
756+
)
757+
iferr!=nil {
758+
httperror.WriteWorkspaceBuildError(ctx,rw,err)
759+
return
760+
}
746761
}
747762

748-
data,err:=api.workspaceData(ctx, []database.Workspace{workspace})
763+
_,err:=api.Database.DeleteTask(ctx, database.DeleteTaskParams{
764+
ID:task.ID,
765+
DeletedAt:dbtime.Time(now),
766+
})
749767
iferr!=nil {
750768
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
751-
Message:"Internal error fetching workspace resources.",
769+
Message:"Failed to delete task",
752770
Detail:err.Error(),
753771
})
754772
return
755773
}
756-
iflen(data.builds)==0||len(data.templates)==0 {
757-
httpapi.ResourceNotFound(rw)
758-
return
759-
}
760-
ifdata.builds[0].HasAITask==nil||!*data.builds[0].HasAITask {
761-
httpapi.ResourceNotFound(rw)
762-
return
763-
}
764-
765-
// Construct a request to the workspace build creation handler to
766-
// initiate deletion.
767-
buildReq:= codersdk.CreateWorkspaceBuildRequest{
768-
Transition:codersdk.WorkspaceTransitionDelete,
769-
Reason:"Deleted via tasks API",
770-
}
771-
772-
_,err=api.postWorkspaceBuildsInternal(
773-
ctx,
774-
apiKey,
775-
workspace,
776-
buildReq,
777-
func(action policy.Action,object rbac.Objecter)bool {
778-
returnapi.Authorize(r,action,object)
779-
},
780-
audit.WorkspaceBuildBaggageFromRequest(r),
781-
)
782-
iferr!=nil {
783-
httperror.WriteWorkspaceBuildError(ctx,rw,err)
784-
return
785-
}
786774

787-
//Delete build created successfully.
775+
//Task deleted and delete build created successfully.
788776
rw.WriteHeader(http.StatusAccepted)
789777
}
790778

‎coderd/coderd.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,11 +1020,15 @@ func New(options *Options) *API {
10201020

10211021
r.Route("/{user}",func(r chi.Router) {
10221022
r.Use(httpmw.ExtractOrganizationMembersParam(options.Database,api.HTTPAuth.Authorize))
1023-
r.Get("/{id}",api.taskGet)
1024-
r.Delete("/{id}",api.taskDelete)
1025-
r.Post("/{id}/send",api.taskSend)
1026-
r.Get("/{id}/logs",api.taskLogs)
10271023
r.Post("/",api.tasksCreate)
1024+
1025+
r.Route("/{id}",func(r chi.Router) {
1026+
r.Use(httpmw.ExtractTaskParam(options.Database))
1027+
r.Get("/",api.taskGet)
1028+
r.Delete("/",api.taskDelete)
1029+
r.Post("/send",api.taskSend)
1030+
r.Get("/logs",api.taskLogs)
1031+
})
10281032
})
10291033
})
10301034
r.Route("/mcp",func(r chi.Router) {

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,6 +1756,19 @@ func (q *querier) DeleteTailnetTunnel(ctx context.Context, arg database.DeleteTa
17561756
returnq.db.DeleteTailnetTunnel(ctx,arg)
17571757
}
17581758

1759+
func (q*querier)DeleteTask(ctx context.Context,arg database.DeleteTaskParams) (database.TaskTable,error) {
1760+
task,err:=q.db.GetTaskByID(ctx,arg.ID)
1761+
iferr!=nil {
1762+
return database.TaskTable{},err
1763+
}
1764+
1765+
iferr:=q.authorizeContext(ctx,policy.ActionDelete,task.RBACObject());err!=nil {
1766+
return database.TaskTable{},err
1767+
}
1768+
1769+
returnq.db.DeleteTask(ctx,arg)
1770+
}
1771+
17591772
func (q*querier)DeleteUserSecret(ctx context.Context,id uuid.UUID)error {
17601773
// First get the secret to check ownership
17611774
secret,err:=q.GetUserSecret(ctx,id)

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2353,6 +2353,16 @@ func (s *MethodTestSuite) TestTasks() {
23532353
dbm.EXPECT().GetTaskByID(gomock.Any(),task.ID).Return(task,nil).AnyTimes()
23542354
check.Args(task.ID).Asserts(task,policy.ActionRead).Returns(task)
23552355
}))
2356+
s.Run("DeleteTask",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
2357+
task:=testutil.Fake(s.T(),faker, database.Task{})
2358+
arg:= database.DeleteTaskParams{
2359+
ID:task.ID,
2360+
DeletedAt: sql.NullTime{Time:dbtime.Now(),Valid:true},
2361+
}
2362+
dbm.EXPECT().GetTaskByID(gomock.Any(),task.ID).Return(task,nil).AnyTimes()
2363+
dbm.EXPECT().DeleteTask(gomock.Any(),arg).Return(database.TaskTable{},nil).AnyTimes()
2364+
check.Args(arg).Asserts(task,policy.ActionDelete).Returns(database.TaskTable{})
2365+
}))
23562366
s.Run("InsertTask",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
23572367
tpl:=testutil.Fake(s.T(),faker, database.Template{})
23582368
tv:=testutil.Fake(s.T(),faker, database.TemplateVersion{

‎coderd/database/dbmetrics/querymetrics.go‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go‎

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/tasks.sql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,12 @@ WHERE tws.deleted_at IS NULL
4747
AND CASE WHEN @owner_id::UUID!='00000000-0000-0000-0000-000000000000' THENtws.owner_id= @owner_id::UUID ELSE TRUE END
4848
AND CASE WHEN @organization_id::UUID!='00000000-0000-0000-0000-000000000000' THENtws.organization_id= @organization_id::UUID ELSE TRUE END
4949
ORDER BYtws.created_atDESC;
50+
51+
-- name: DeleteTask :one
52+
UPDATE tasks
53+
SET
54+
deleted_at= @deleted_at::timestamptz
55+
WHERE
56+
id= @id::uuid
57+
AND deleted_at ISNULL
58+
RETURNING*;

‎coderd/httpmw/taskparam.go‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package httpmw
2+
3+
import (
4+
"context"
5+
"net/http"
6+
7+
"cdr.dev/slog"
8+
9+
"github.com/coder/coder/v2/coderd/database"
10+
"github.com/coder/coder/v2/coderd/httpapi"
11+
"github.com/coder/coder/v2/coderd/httpmw/loggermw"
12+
"github.com/coder/coder/v2/codersdk"
13+
)
14+
15+
typetaskParamContextKeystruct{}
16+
17+
// TaskParam returns the task from the ExtractTaskParam handler.
18+
funcTaskParam(r*http.Request) database.Task {
19+
task,ok:=r.Context().Value(taskParamContextKey{}).(database.Task)
20+
if!ok {
21+
panic("developer error: task param middleware not provided")
22+
}
23+
returntask
24+
}
25+
26+
// ExtractTaskParam grabs a task from the "id" URL parameter by UUID.
27+
funcExtractTaskParam(db database.Store)func(http.Handler) http.Handler {
28+
returnfunc(next http.Handler) http.Handler {
29+
returnhttp.HandlerFunc(func(rw http.ResponseWriter,r*http.Request) {
30+
ctx:=r.Context()
31+
taskID,parsed:=ParseUUIDParam(rw,r,"id")
32+
if!parsed {
33+
return
34+
}
35+
task,err:=db.GetTaskByID(ctx,taskID)
36+
iferr!=nil {
37+
ifhttpapi.Is404Error(err) {
38+
httpapi.ResourceNotFound(rw)
39+
return
40+
}
41+
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
42+
Message:"Internal error fetching task.",
43+
Detail:err.Error(),
44+
})
45+
return
46+
}
47+
48+
ctx=context.WithValue(ctx,taskParamContextKey{},task)
49+
50+
ifrlogger:=loggermw.RequestLoggerFromContext(ctx);rlogger!=nil {
51+
rlogger.WithFields(slog.F("task_id",task.ID),slog.F("task_name",task.Name))
52+
}
53+
54+
next.ServeHTTP(rw,r.WithContext(ctx))
55+
})
56+
}
57+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp