@@ -220,43 +220,37 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
220
220
return xerrors .Errorf ("Unsupported transition: %q" , trans )
221
221
}
222
222
223
- err = store .InTx (func (db database.Store ) error {
224
- newProvisionerJob , err := db .InsertProvisionerJob (ctx , database.InsertProvisionerJobParams {
225
- ID : provisionerJobID ,
226
- CreatedAt : now ,
227
- UpdatedAt : now ,
228
- InitiatorID : workspace .OwnerID ,
229
- OrganizationID : template .OrganizationID ,
230
- Provisioner : template .Provisioner ,
231
- Type : database .ProvisionerJobTypeWorkspaceBuild ,
232
- StorageMethod : priorJob .StorageMethod ,
233
- StorageSource : priorJob .StorageSource ,
234
- Input : input ,
235
- })
236
- if err != nil {
237
- return xerrors .Errorf ("insert provisioner job: %w" , err )
238
- }
239
- _ , err = db .InsertWorkspaceBuild (ctx , database.InsertWorkspaceBuildParams {
240
- ID : workspaceBuildID ,
241
- CreatedAt : now ,
242
- UpdatedAt : now ,
243
- WorkspaceID : workspace .ID ,
244
- TemplateVersionID : priorHistory .TemplateVersionID ,
245
- BuildNumber : priorBuildNumber + 1 ,
246
- Name : namesgenerator .GetRandomName (1 ),
247
- ProvisionerState : priorHistory .ProvisionerState ,
248
- InitiatorID : workspace .OwnerID ,
249
- Transition : trans ,
250
- JobID : newProvisionerJob .ID ,
251
- Reason : buildReason ,
252
- })
253
- if err != nil {
254
- return xerrors .Errorf ("insert workspace build: %w" , err )
255
- }
256
- return nil
223
+ newProvisionerJob , err := store .InsertProvisionerJob (ctx , database.InsertProvisionerJobParams {
224
+ ID : provisionerJobID ,
225
+ CreatedAt : now ,
226
+ UpdatedAt : now ,
227
+ InitiatorID : workspace .OwnerID ,
228
+ OrganizationID : template .OrganizationID ,
229
+ Provisioner : template .Provisioner ,
230
+ Type : database .ProvisionerJobTypeWorkspaceBuild ,
231
+ StorageMethod : priorJob .StorageMethod ,
232
+ StorageSource : priorJob .StorageSource ,
233
+ Input: input ,
234
+ })
235
+ if err != nil {
236
+ return xerrors .Errorf ("insert provisioner job: %w" , err )
237
+ }
238
+ _ , err = store .InsertWorkspaceBuild (ctx , database.InsertWorkspaceBuildParams {
239
+ ID : workspaceBuildID ,
240
+ CreatedAt : now ,
241
+ UpdatedAt : now ,
242
+ WorkspaceID : workspace .ID ,
243
+ TemplateVersionID : priorHistory .TemplateVersionID ,
244
+ BuildNumber : priorBuildNumber + 1 ,
245
+ Name : namesgenerator .GetRandomName (1 ),
246
+ ProvisionerState : priorHistory .ProvisionerState ,
247
+ InitiatorID : workspace .OwnerID ,
248
+ Transition : trans ,
249
+ JobID : newProvisionerJob .ID ,
250
+ Reason : buildReason ,
257
251
})
258
252
if err != nil {
259
- return err
253
+ return xerrors . Errorf ( "insert workspace build: %w" , err )
260
254
}
261
255
return nil
262
256
}
0 commit comments