Commit893169c

authored

fix: duplicate tags map in mutation to resolve race (#14047)

* fix: duplicate tags map in mutation to resolve raceSee:https://github.com/coder/coder/actions/runs/10149619748/job/28064952716?pr=14046* Fix deployment values race

1 parent3209c86 commit893169cCopy full SHA for 893169c

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ func TestEnterpriseCreate(t *testing.T) {`
`34`	`34`	`secondTemplates []string`
`35`	`35`	`}`
`36`	`36`
`37`		`-dv:=coderdtest.DeploymentValues(t)`
`38`		`-dv.Experiments= []string{string(codersdk.ExperimentMultiOrganization)}`
`39`	`37`	`// setupMultipleOrganizations creates an extra organization, assigns a member`
`40`	`38`	`// both organizations, and optionally creates templates in each organization.`
`41`	`39`	`setupMultipleOrganizations:=func(t*testing.T,argssetupArgs)setupData {`
	`40`	`+dv:=coderdtest.DeploymentValues(t)`
	`41`	`+dv.Experiments= []string{string(codersdk.ExperimentMultiOrganization)}`
`42`	`42`	`ownerClient,first:=coderdenttest.New(t,&coderdenttest.Options{`
`43`	`43`	`Options:&coderdtest.Options{`
`44`	`44`	`DeploymentValues:dv,`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@ const (`
`18`	`18`	`// NOTE: "owner" must NEVER be nil. Otherwise it will end up being`
`19`	`19`	`// duplicated in the database, as idx_provisioner_daemons_name_owner_key`
`20`	`20`	`// is a partial unique index that includes a JSON field.`
`21`		`-funcMutateTags(userID uuid.UUID,tagsmap[string]string)map[string]string {`
`22`		`-iftags==nil {`
`23`		`-tags=map[string]string{}`
	`21`	`+funcMutateTags(userID uuid.UUID,providedmap[string]string)map[string]string {`
	`22`	`+tags:=map[string]string{}`
	`23`	`+fork,v:=rangeprovided {`
	`24`	`+tags[k]=v`
`24`	`25`	`}`
`25`	`26`	`_,ok:=tags[TagScope]`
`26`	`27`	`if!ok {`

Comments

(0)