Commiteb191d3

authored

fix: makeai_task.id change backwards compatible (#447)

Updates the create logic to warn instead of error when no CODER_TASK_ID is set so that we are backwards compatible.

1 parent7ecb65d commiteb191d3Copy full SHA for eb191d3

File tree

+85

-2

lines changed

+85

-2

lines changed

Lines changed: 63 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,63 @@`
	`1`	`+terraform {`
	`2`	`+required_providers {`
	`3`	`+coder={`
	`4`	`+ source="coder/coder"`
	`5`	`+ }`
	`6`	`+local={`
	`7`	`+ source="hashicorp/local"`
	`8`	`+ }`
	`9`	`+ }`
	`10`	`+}`
	`11`	`+`
	`12`	`+data"coder_workspace""me" {}`
	`13`	`+`
	`14`	`+resource"coder_agent""dev" {`
	`15`	`+os="linux"`
	`16`	`+arch="amd64"`
	`17`	`+dir="/workspace"`
	`18`	`+}`
	`19`	`+`
	`20`	`+resource"coder_app""ai_interface" {`
	`21`	`+agent_id=coder_agent.dev.id`
	`22`	`+slug="ai-chat"`
	`23`	`+share="owner"`
	`24`	`+url="http://localhost:8080"`
	`25`	`+}`
	`26`	`+`
	`27`	`+data"coder_parameter""ai_prompt" {`
	`28`	`+type="string"`
	`29`	`+name="AI Prompt"`
	`30`	`+default=""`
	`31`	`+description="Write a prompt for Claude Code"`
	`32`	`+mutable=true`
	`33`	`+}`
	`34`	`+`
	`35`	`+resource"coder_ai_task""task" {`
	`36`	`+sidebar_app {`
	`37`	`+id=coder_app.ai_interface.id`
	`38`	`+ }`
	`39`	`+}`
	`40`	`+`
	`41`	`+locals {`
	`42`	`+# NOTE: these must all be strings in the output`
	`43`	`+output={`
	`44`	`+"ai_task.id"= coder_ai_task.task.id`
	`45`	`+"ai_task.app_id"= coder_ai_task.task.app_id`
	`46`	`+"ai_task.prompt"= coder_ai_task.task.prompt`
	`47`	`+"app.id"= coder_app.ai_interface.id`
	`48`	`+ }`
	`49`	`+}`
	`50`	`+`
	`51`	`+variable"output_path" {`
	`52`	`+type=string`
	`53`	`+}`
	`54`	`+`
	`55`	`+resource"local_file""output" {`
	`56`	`+filename=var.output_path`
	`57`	`+content=jsonencode(local.output)`
	`58`	`+}`
	`59`	`+`
	`60`	`+output"output" {`
	`61`	`+value=local.output`
	`62`	`+sensitive=true`
	`63`	`+}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+AI Prompt:"some prompt"`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,24 @@ func TestIntegration(t *testing.T) {`
`211`	`211`	`"coder_app.defaulted.hidden":"false",`
`212`	`212`	`},`
`213`	`213`	`},`
	`214`	`+{`
	`215`	`+name:"coder-ai-task",`
	`216`	`+minVersion:"v2.26.0",`
	`217`	`+expectedOutput:map[string]string{`
	`218`	+"ai_task.id":`^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`,
	`219`	`+"ai_task.prompt":"default",`
	`220`	+"ai_task.app_id":`^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`,
	`221`	+"app.id":`^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`,
	`222`	`+},`
	`223`	`+},`
`214`	`224`	`} {`
`215`	`225`	`tt:=tt`
`216`	`226`	`t.Run(tt.name,func(t*testing.T) {`
`217`	`227`	`t.Parallel()`
`218`	`228`	`ifcoderVersion!="latest"&&semver.Compare(coderVersion,tt.minVersion)<0 {`
`219`	`229`	`t.Skipf("skipping due to CODER_VERSION %q < minVersion %q",coderVersion,tt.minVersion)`
`220`	`230`	`}`
	`231`	`+`
`221`	`232`	`// Given: we have an existing Coder deployment running locally`
`222`	`233`	`// Import named template`
`223`	`234`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"os"`
`6`	`6`
	`7`	`+"github.com/google/uuid"`
`7`	`8`	`"github.com/hashicorp/terraform-plugin-sdk/v2/diag"`
`8`	`9`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`9`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"`
`@@ -29,10 +30,17 @@ func aiTaskResource() *schema.Resource {`
`29`	`30`
`30`	`31`	`Description:"Use this resource to define Coder tasks.",`
`31`	`32`	`CreateContext:func(c context.Context,resourceData*schema.ResourceData,iany) diag.Diagnostics {`
	`33`	`+vardiags diag.Diagnostics`
	`34`	`+`
`32`	`35`	`ifidStr:=os.Getenv("CODER_TASK_ID");idStr!="" {`
`33`	`36`	`resourceData.SetId(idStr)`
`34`	`37`	`}else {`
`35`		`-returndiag.Errorf("CODER_TASK_ID must be set")`
	`38`	`+resourceData.SetId(uuid.NewString())`
	`39`	`+`
	`40`	`+diags=append(diags, diag.Diagnostic{`
	`41`	`+Severity:diag.Warning,`
	`42`	+Summary:"`CODER_TASK_ID` should be set. If you are seeing this message, the version of the Coder Terraform provider you are using is likely too new for your current Coder version.",
	`43`	`+})`
`36`	`44`	`}`
`37`	`45`
`38`	`46`	`ifprompt:=os.Getenv("CODER_TASK_PROMPT");prompt!="" {`
`@@ -60,7 +68,7 @@ func aiTaskResource() *schema.Resource {`
`60`	`68`	`returndiag.Errorf("'app_id' must be set")`
`61`	`69`	`}`
`62`	`70`
`63`		`-returnnil`
	`71`	`+returndiags`
`64`	`72`	`},`
`65`	`73`	`ReadContext:schema.NoopContext,`
`66`	`74`	`DeleteContext:schema.NoopContext,`

Comments

(0)