Commit7eff859

committed

fix(provisioner/terraform/tfparse): skip evaluation of defaults if no workspace_tags found

1 parent3f1795f commit7eff859Copy full SHA for 7eff859

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,20 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {`
`460`	`460`	`},`
`461`	`461`	`wantTags:map[string]string{"owner":templateAdminUser.ID.String(),"scope":"user"},`
`462`	`462`	`},`
	`463`	`+// Ref: https://github.com/coder/coder/issues/16021`
	`464`	`+{`
	`465`	`+name:"main.tf with no workspace_tags and a function call in a parameter default",`
	`466`	`+files:map[string]string{`
	`467`	+`main.tf`:`
	`468`	`+data "coder_parameter" "foo" {`
	`469`	`+name = "foo"`
	`470`	`+type = "list(string)"`
	`471`	`+default = jsonencode(["1", "2", "3", "4"])`
	`472`	`+mutable = true`
	`473`	+}`,
	`474`	`+},`
	`475`	`+wantTags:map[string]string{"owner":"","scope":"organization"},`
	`476`	`+},`
`463`	`477`	`} {`
`464`	`478`	`tt:=tt`
`465`	`479`	`t.Run(tt.name,func(t*testing.T) {`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func New(workdir string, opts ...Option) (*Parser, tfconfig.Diagnostics) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// WorkspaceTags looks for all coder_workspace_tags datasource in the module`
`83`		`-// and returns the raw values for the tags. Use`
	`83`	`+// and returns the raw values for the tags.`
`84`	`84`	`func (p*Parser)WorkspaceTags(ctx context.Context) (map[string]string,error) {`
`85`	`85`	`tags:=map[string]string{}`
`86`	`86`	`varskipped []string`
`@@ -166,6 +166,11 @@ func (p *Parser) WorkspaceTagDefaults(ctx context.Context) (map[string]string, e`
`166`	`166`	`returnnil,xerrors.Errorf("extract workspace tags: %w",err)`
`167`	`167`	`}`
`168`	`168`
	`169`	`+iflen(tags)==0 {`
	`170`	`+//nolint: nilnil`
	`171`	`+returnnil,nil`
	`172`	`+}`
	`173`	`+`
`169`	`174`	`// To evaluate the expressions, we need to load the default values for`
`170`	`175`	`// variables and parameters.`
`171`	`176`	`varsDefaults,err:=p.VariableDefaults(ctx)`

Comments

(0)