Commitb757058

committed

chore: pass through template id to import when available

1 parentf91e13b commitb757058Copy full SHA for b757058

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`payload,err:=json.Marshal(provisionerdserver.TemplateVersionImportJob{`
	`626`	`+TemplateID:t.seed.TemplateID.UUID,`
`626`	`627`	`TemplateVersionID:t.seed.ID,`
`627`	`628`	`})`
`628`	`629`	`require.NoError(t.t,err)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -781,6 +781,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`781`	`781`	`// There is no owner for a template import, but we can assume`
`782`	`782`	`// the "Everyone" group as a placeholder.`
`783`	`783`	`WorkspaceOwnerGroups: []string{database.EveryoneGroup},`
	`784`	`+TemplateId:input.TemplateID.String(),`
	`785`	`+TemplateVersionId:input.TemplateVersionID.String(),`
`784`	`786`	`},`
`785`	`787`	`},`
`786`	`788`	`}`
`@@ -3249,6 +3251,10 @@ func auditActionFromTransition(transition database.WorkspaceTransition) database`
`3249`	`3251`	`}`
`3250`	`3252`
`3251`	`3253`	`typeTemplateVersionImportJobstruct {`
	`3254`	`+// TemplateID is not guaranteed to be set. Template versions can be created`
	`3255`	`+// without being associated with a template. Resulting in a template id of`
	`3256`	+// `uuid.Nil`
	`3257`	+TemplateID uuid.UUID`json:"template_id"`
`3252`	`3258`	TemplateVersionID uuid.UUID`json:"template_version_id"`
`3253`	`3259`	UserVariableValues []codersdk.VariableValue`json:"user_variable_values"`
`3254`	`3260`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1609,9 +1609,10 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht`
`1609`	`1609`	`varmatchedProvisioners codersdk.MatchedProvisioners`
`1610`	`1610`	`err=api.Database.InTx(func(tx database.Store)error {`
`1611`	`1611`	`jobID:=uuid.New()`
`1612`		`-`
`1613`	`1612`	`templateVersionID:=uuid.New()`
	`1613`	`+`
`1614`	`1614`	`jobInput,err:=json.Marshal(provisionerdserver.TemplateVersionImportJob{`
	`1615`	`+TemplateID:req.TemplateID,`
`1615`	`1616`	`TemplateVersionID:templateVersionID,`
`1616`	`1617`	`UserVariableValues:req.UserVariableValues,`
`1617`	`1618`	`})`

Comments

(0)