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

Commit028d057

Browse files
chore(provisioner): begin support for updated coder_ai_task resource
1 parent815e58e commit028d057

File tree

8 files changed

+424
-342
lines changed

8 files changed

+424
-342
lines changed

‎coderd/provisionerdserver/provisionerdserver.go‎

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

600+
vartaskPromptstring
601+
for_,buildParameter:=rangeworkspaceBuildParameters {
602+
ifbuildParameter.Name!=codersdk.AITaskPromptParameterName {
603+
continue
604+
}
605+
606+
taskPrompt=buildParameter.Value
607+
break
608+
}
609+
600610
dbExternalAuthProviders:= []database.ExternalAuthProvider{}
601611
err=json.Unmarshal(templateVersion.ExternalAuthProviders,&dbExternalAuthProviders)
602612
iferr!=nil {
@@ -721,6 +731,9 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
721731
WorkspaceOwnerRbacRoles:ownerRbacRoles,
722732
RunningAgentAuthTokens:runningAgentAuthTokens,
723733
PrebuiltWorkspaceBuildStage:input.PrebuiltWorkspaceBuildStage,
734+
// TODO(DanielleMaywood): Fill out Task ID
735+
TaskId:"",
736+
TaskPrompt:taskPrompt,
724737
},
725738
LogLevel:input.LogLevel,
726739
},
@@ -1982,16 +1995,23 @@ func (s *server) completeWorkspaceBuildJob(ctx context.Context, job database.Pro
19821995
iftasks:=jobType.WorkspaceBuild.GetAiTasks();len(tasks)>0 {
19831996
hasAITask=true
19841997
task:=tasks[0]
1985-
iftask==nil||task.GetSidebarApp()==nil||len(task.GetSidebarApp().GetId())==0{
1986-
returnxerrors.Errorf("update ai task:sidebar appis nil or empty")
1998+
iftask==nil {
1999+
returnxerrors.Errorf("update ai task:taskis nil")
19872000
}
19882001

1989-
sidebarTaskID:=task.GetSidebarApp().GetId()
1990-
if!slices.Contains(appIDs,sidebarTaskID) {
2002+
appID:=task.GetAppId()
2003+
ifappID==""&&task.GetSidebarApp()!=nil {
2004+
appID=task.GetSidebarApp().GetId()
2005+
}
2006+
ifappID=="" {
2007+
returnxerrors.Errorf("update ai task: app id is empty")
2008+
}
2009+
2010+
if!slices.Contains(appIDs,appID) {
19912011
warnUnknownSidebarAppID=true
19922012
}
19932013

1994-
id,err:=uuid.Parse(task.GetSidebarApp().GetId())
2014+
id,err:=uuid.Parse(appID)
19952015
iferr!=nil {
19962016
returnxerrors.Errorf("parse sidebar app id: %w",err)
19972017
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ require (
101101
github.com/coder/quartzv0.2.1
102102
github.com/coder/retryv1.5.1
103103
github.com/coder/serpentv0.10.0
104-
github.com/coder/terraform-provider-coder/v2v2.11.0
104+
github.com/coder/terraform-provider-coder/v2v2.11.1-0.20251002113742-eb191d3b7b60
105105
github.com/coder/websocketv1.8.13
106106
github.com/coder/wgtunnelv0.1.13-0.20240522110300-ade90dfb2da0
107107
github.com/coreos/go-oidc/v3v3.15.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,8 +948,8 @@ github.com/coder/tailscale v1.1.1-0.20250829055706-6eafe0f9199e h1:9RKGKzGLHtTvV
948948
github.com/coder/tailscalev1.1.1-0.20250829055706-6eafe0f9199e/go.mod h1:jU9T1vEs+DOs8NtGp1F2PT0/TOGVwtg/JCCKYRgvMOs=
949949
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
950950
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
951-
github.com/coder/terraform-provider-coder/v2v2.11.0 h1:E9mjwCDHoKTp9agCmNQ5viky4dKrt0Gx0vDxsLEPRf0=
952-
github.com/coder/terraform-provider-coder/v2v2.11.0/go.mod h1:q0cAdlM1cafFGQ8Vug5kwU+34S+wtJsqylxTjVXX+rw=
951+
github.com/coder/terraform-provider-coder/v2v2.11.1-0.20251002113742-eb191d3b7b60 h1:kR/sLRvbmXiOjAwy7tWjxS2SOzoSYkO/xSPEWHJZMwg=
952+
github.com/coder/terraform-provider-coder/v2v2.11.1-0.20251002113742-eb191d3b7b60/go.mod h1:q0cAdlM1cafFGQ8Vug5kwU+34S+wtJsqylxTjVXX+rw=
953953
github.com/coder/trivyv0.0.0-20250807211036-0bb0acd620a8 h1:VYB/6cIIKsVkwXOAWbqpj4Ux+WwF/XTnRyvHcwfHZ7A=
954954
github.com/coder/trivyv0.0.0-20250807211036-0bb0acd620a8/go.mod h1:O73tP+UvJlI2GQZD060Jt0sf+6alKcGAgORh6sgB0+M=
955955
github.com/coder/websocketv1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=

‎provisioner/terraform/provision.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ func provisionEnv(
266266
"CODER_WORKSPACE_TEMPLATE_NAME="+metadata.GetTemplateName(),
267267
"CODER_WORKSPACE_TEMPLATE_VERSION="+metadata.GetTemplateVersion(),
268268
"CODER_WORKSPACE_BUILD_ID="+metadata.GetWorkspaceBuildId(),
269+
"CODER_TASK_ID="+metadata.GetTaskId(),
270+
"CODER_TASK_PROMPT="+metadata.GetTaskPrompt(),
269271
)
270272
ifmetadata.GetPrebuiltWorkspaceBuildStage().IsPrebuild() {
271273
env=append(env,provider.IsPrebuildEnvironmentVariable()+"=true")

‎provisioner/terraform/resources.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,15 +1023,14 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
10231023
returnnil,xerrors.Errorf("decode coder_ai_task attributes: %w",err)
10241024
}
10251025

1026-
iflen(task.SidebarApp)<1 {
1027-
returnnil,xerrors.Errorf("coder_ai_task has nosidebar_app defined")
1026+
iftask.AppID=="" {
1027+
returnnil,xerrors.Errorf("coder_ai_task has noapp_id defined")
10281028
}
10291029

10301030
aiTasks=append(aiTasks,&proto.AITask{
1031-
Id:task.ID,
1032-
SidebarApp:&proto.AITaskSidebarApp{
1033-
Id:task.SidebarApp[0].ID,
1034-
},
1031+
Id:task.ID,
1032+
AppId:task.AppID,
1033+
Prompt:task.Prompt,
10351034
})
10361035
}
10371036

0 commit comments

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