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

Commit5a31c59

Browse files
fix(coderd/provisionerdserver): pipe through task id and prompt (#20408)
Pipes through the Task's ID and prompt into the provisioner. This isrequired to support the new `coder_ai_task.prompt` field and modified`coder_ai_task.id` field.
1 parente13a34c commit5a31c59

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

‎coderd/provisionerdserver/provisionerdserver.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -597,13 +597,10 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
597597
returnnil,failJob(fmt.Sprintf("get workspace build parameters: %s",err))
598598
}
599599

600-
// TODO(DanielleMaywood):
601-
// Plumb a task prompt into this when we have the new data-model ready
602-
vartaskPromptstring
603-
604-
// TODO(DanielleMaywood):
605-
// Plumb a task ID into this when we have the new data-model ready
606-
vartaskIDstring
600+
task,err:=s.Database.GetTaskByWorkspaceID(ctx,workspaceBuild.WorkspaceID)
601+
iferr!=nil&&!errors.Is(err,sql.ErrNoRows) {
602+
returnnil,xerrors.Errorf("get task by workspace id: %w",err)
603+
}
607604

608605
dbExternalAuthProviders:= []database.ExternalAuthProvider{}
609606
err=json.Unmarshal(templateVersion.ExternalAuthProviders,&dbExternalAuthProviders)
@@ -729,8 +726,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
729726
WorkspaceOwnerRbacRoles:ownerRbacRoles,
730727
RunningAgentAuthTokens:runningAgentAuthTokens,
731728
PrebuiltWorkspaceBuildStage:input.PrebuiltWorkspaceBuildStage,
732-
TaskId:taskID,
733-
TaskPrompt:taskPrompt,
729+
TaskId:task.ID.String(),
730+
TaskPrompt:task.Prompt,
734731
},
735732
LogLevel:input.LogLevel,
736733
},

‎coderd/provisionerdserver/provisionerdserver_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,16 @@ func TestAcquireJob(t *testing.T) {
334334
Transition:database.WorkspaceTransitionStart,
335335
Reason:database.BuildReasonInitiator,
336336
})
337+
task:=dbgen.Task(t,db, database.TaskTable{
338+
OrganizationID:pd.OrganizationID,
339+
OwnerID:user.ID,
340+
WorkspaceID: uuid.NullUUID{Valid:true,UUID:workspace.ID},
341+
TemplateVersionID:version.ID,
342+
TemplateParameters:json.RawMessage("{}"),
343+
Prompt:"Build me a REST API",
344+
CreatedAt:dbtime.Now(),
345+
DeletedAt: sql.NullTime{},
346+
})
337347

338348
varagent database.WorkspaceAgent
339349
ifprebuiltWorkspaceBuildStage==sdkproto.PrebuiltWorkspaceBuildStage_CLAIM {
@@ -446,6 +456,8 @@ func TestAcquireJob(t *testing.T) {
446456
WorkspaceBuildId:build.ID.String(),
447457
WorkspaceOwnerLoginType:string(user.LoginType),
448458
WorkspaceOwnerRbacRoles: []*sdkproto.Role{{Name:rbac.RoleOrgMember(),OrgId:pd.OrganizationID.String()}, {Name:"member",OrgId:""}, {Name:rbac.RoleOrgAuditor(),OrgId:pd.OrganizationID.String()}},
459+
TaskId:task.ID.String(),
460+
TaskPrompt:task.Prompt,
449461
}
450462
ifprebuiltWorkspaceBuildStage==sdkproto.PrebuiltWorkspaceBuildStage_CLAIM {
451463
// For claimed prebuilds, we expect the prebuild state to be set to CLAIM

0 commit comments

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