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

feat(coderd): use task data model for send/logs#20381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletioncli/exp_task_logs_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import (
funcTest_TaskLogs(t*testing.T) {
t.Parallel()

t.Skip("TODO(mafredri): Remove, fixeddown-stack!")
t.Skip("TODO(mafredri): Remove, fixedup-stack!")

testMessages:= []agentapisdk.Message{
{
Expand Down
2 changes: 1 addition & 1 deletioncli/exp_task_send_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import (
funcTest_TaskSend(t*testing.T) {
t.Parallel()

t.Skip("TODO(mafredri): Remove, fixeddown-stack!")
t.Skip("TODO(mafredri): Remove, fixedup-stack!")

t.Run("ByWorkspaceName_WithArgument",func(t*testing.T) {
t.Parallel()
Expand Down
106 changes: 35 additions & 71 deletionscoderd/aitasks.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import (
"strings"
"time"

"github.com/go-chi/chi/v5"
"github.com/google/uuid"

"cdr.dev/slog"
Expand DownExpand Up@@ -755,15 +754,7 @@ func (api *API) taskDelete(rw http.ResponseWriter, r *http.Request) {
// workspace and validate the sidebar app health.
func (api*API)taskSend(rw http.ResponseWriter,r*http.Request) {
ctx:=r.Context()

idStr:=chi.URLParam(r,"task")
taskID,err:=uuid.Parse(idStr)
iferr!=nil {
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
Message:fmt.Sprintf("Invalid UUID %q for task ID.",idStr),
})
return
}
task:=httpmw.TaskParam(r)

varreq codersdk.TaskSendRequest
if!httpapi.Read(ctx,rw,r,&req) {
Expand All@@ -776,7 +767,7 @@ func (api *API) taskSend(rw http.ResponseWriter, r *http.Request) {
return
}

iferr=api.authAndDoWithTaskSidebarAppClient(r,taskID,func(ctx context.Context,client*http.Client,appURL*url.URL)error {
iferr:=api.authAndDoWithTaskAppClient(r,task,func(ctx context.Context,client*http.Client,appURL*url.URL)error {
agentAPIClient,err:=aiagentapi.NewClient(appURL.String(),aiagentapi.WithHTTPClient(client))
iferr!=nil {
returnhttperror.NewResponseError(http.StatusBadGateway, codersdk.Response{
Expand DownExpand Up@@ -835,18 +826,10 @@ func (api *API) taskSend(rw http.ResponseWriter, r *http.Request) {
// We enforce ApplicationConnect RBAC on the workspace and validate the sidebar app health.
func (api*API)taskLogs(rw http.ResponseWriter,r*http.Request) {
ctx:=r.Context()

idStr:=chi.URLParam(r,"task")
taskID,err:=uuid.Parse(idStr)
iferr!=nil {
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
Message:fmt.Sprintf("Invalid UUID %q for task ID.",idStr),
})
return
}
task:=httpmw.TaskParam(r)

varout codersdk.TaskLogsResponse
iferr:=api.authAndDoWithTaskSidebarAppClient(r,taskID,func(ctx context.Context,client*http.Client,appURL*url.URL)error {
iferr:=api.authAndDoWithTaskAppClient(r,task,func(ctx context.Context,client*http.Client,appURL*url.URL)error {
agentAPIClient,err:=aiagentapi.NewClient(appURL.String(),aiagentapi.WithHTTPClient(client))
iferr!=nil {
returnhttperror.NewResponseError(http.StatusBadGateway, codersdk.Response{
Expand DownExpand Up@@ -894,7 +877,7 @@ func (api *API) taskLogs(rw http.ResponseWriter, r *http.Request) {
httpapi.Write(ctx,rw,http.StatusOK,out)
}

//authAndDoWithTaskSidebarAppClient centralizes the shared logic to:
//authAndDoWithTaskAppClient centralizes the shared logic to:
//
// - Fetch the task workspace
// - Authorize ApplicationConnect on the workspace
Expand All@@ -903,15 +886,31 @@ func (api *API) taskLogs(rw http.ResponseWriter, r *http.Request) {
//
// The provided callback receives the context, an HTTP client that dials via the
// agent, and the base app URL (as a value URL) to perform any request.
func (api*API)authAndDoWithTaskSidebarAppClient(
func (api*API)authAndDoWithTaskAppClient(
r*http.Request,
taskID uuid.UUID,
task database.Task,
dofunc(ctx context.Context,client*http.Client,appURL*url.URL)error,
)error {
ctx:=r.Context()

workspaceID:=taskID
workspace,err:=api.Database.GetWorkspaceByID(ctx,workspaceID)
iftask.Status!=database.TaskStatusActive {
returnhttperror.NewResponseError(http.StatusBadRequest, codersdk.Response{
Message:"Task status must be active.",
Detail:fmt.Sprintf("Task status is %q, it must be %q to interact with the task.",task.Status,codersdk.TaskStatusActive),
})
}
if!task.WorkspaceID.Valid {
returnhttperror.NewResponseError(http.StatusBadRequest, codersdk.Response{
Message:"Task does not have a workspace.",
})
}
if!task.WorkspaceAppID.Valid {
returnhttperror.NewResponseError(http.StatusBadRequest, codersdk.Response{
Message:"Task does not have a workspace app.",
})
}

workspace,err:=api.Database.GetWorkspaceByID(ctx,task.WorkspaceID.UUID)
iferr!=nil {
ifhttpapi.Is404Error(err) {
returnhttperror.ErrResourceNotFound
Expand All@@ -927,65 +926,30 @@ func (api *API) authAndDoWithTaskSidebarAppClient(
returnhttperror.ErrResourceNotFound
}

data,err:=api.workspaceData(ctx,[]database.Workspace{workspace})
apps,err:=api.Database.GetWorkspaceAppsByAgentID(ctx,task.WorkspaceAgentID.UUID)
iferr!=nil {
returnhttperror.NewResponseError(http.StatusInternalServerError, codersdk.Response{
Message:"Internal error fetching workspace resources.",
Detail:err.Error(),
})
}
iflen(data.builds)==0||len(data.templates)==0 {
returnhttperror.ErrResourceNotFound
}
build:=data.builds[0]
ifbuild.HasAITask==nil||!*build.HasAITask||build.AITaskSidebarAppID==nil||*build.AITaskSidebarAppID==uuid.Nil {
returnhttperror.NewResponseError(http.StatusBadRequest, codersdk.Response{
Message:"Task is not configured with a sidebar app.",
})
}

// Find the sidebar app details to get the URL and validate app health.
sidebarAppID:=*build.AITaskSidebarAppID
agentID,sidebarApp,ok:=func() (uuid.UUID, codersdk.WorkspaceApp,bool) {
for_,res:=rangebuild.Resources {
for_,agent:=rangeres.Agents {
for_,app:=rangeagent.Apps {
ifapp.ID==sidebarAppID {
returnagent.ID,app,true
}
}
}
varapp*database.WorkspaceApp
for_,a:=rangeapps {
ifa.ID==task.WorkspaceAppID.UUID {
app=&a
break
}
returnuuid.Nil, codersdk.WorkspaceApp{},false
}()
if!ok {
returnhttperror.NewResponseError(http.StatusBadRequest, codersdk.Response{
Message:"Task sidebar app not found in latest build.",
})
}

// Return an informative error if the app isn't healthy rather than trying
// and failing.
switchsidebarApp.Health {
casecodersdk.WorkspaceAppHealthDisabled:
// No health check, pass through.
casecodersdk.WorkspaceAppHealthInitializing:
returnhttperror.NewResponseError(http.StatusServiceUnavailable, codersdk.Response{
Message:"Task sidebar app is initializing. Try again shortly.",
})
casecodersdk.WorkspaceAppHealthUnhealthy:
returnhttperror.NewResponseError(http.StatusServiceUnavailable, codersdk.Response{
Message:"Task sidebar app is unhealthy.",
})
}

// Build the direct app URL and dial the agent.
ifsidebarApp.URL=="" {
appURL:=app.Url.String
ifappURL=="" {
returnhttperror.NewResponseError(http.StatusInternalServerError, codersdk.Response{
Message:"Task sidebar app URL is not configured.",
})
}
parsedURL,err:=url.Parse(sidebarApp.URL)
parsedURL,err:=url.Parse(appURL)
iferr!=nil {
returnhttperror.NewResponseError(http.StatusInternalServerError, codersdk.Response{
Message:"Internal error parsing task app URL.",
Expand All@@ -1000,7 +964,7 @@ func (api *API) authAndDoWithTaskSidebarAppClient(

dialCtx,dialCancel:=context.WithTimeout(ctx,time.Second*30)
deferdialCancel()
agentConn,release,err:=api.agentProvider.AgentConn(dialCtx,agentID)
agentConn,release,err:=api.agentProvider.AgentConn(dialCtx,task.WorkspaceAgentID.UUID)
iferr!=nil {
returnhttperror.NewResponseError(http.StatusBadGateway, codersdk.Response{
Message:"Failed to reach task app endpoint.",
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp