remove nested transaction

AbhineetJain · AbhineetJain · commit 778b819c42ba · 2022-06-17T16:08:31.000Z
diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -220,43 +220,37 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
 		return xerrors.Errorf("Unsupported transition: %q", trans)
 	}
 
-	err = store.InTx(func(db database.Store) error {
-		newProvisionerJob, err := db.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
-			ID:             provisionerJobID,
-			CreatedAt:      now,
-			UpdatedAt:      now,
-			InitiatorID:    workspace.OwnerID,
-			OrganizationID: template.OrganizationID,
-			Provisioner:    template.Provisioner,
-			Type:           database.ProvisionerJobTypeWorkspaceBuild,
-			StorageMethod:  priorJob.StorageMethod,
-			StorageSource:  priorJob.StorageSource,
-			Input:          input,
-		})
-		if err != nil {
-			return xerrors.Errorf("insert provisioner job: %w", err)
-		}
-		_, err = db.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
-			ID:                workspaceBuildID,
-			CreatedAt:         now,
-			UpdatedAt:         now,
-			WorkspaceID:       workspace.ID,
-			TemplateVersionID: priorHistory.TemplateVersionID,
-			BuildNumber:       priorBuildNumber + 1,
-			Name:              namesgenerator.GetRandomName(1),
-			ProvisionerState:  priorHistory.ProvisionerState,
-			InitiatorID:       workspace.OwnerID,
-			Transition:        trans,
-			JobID:             newProvisionerJob.ID,
-			Reason:            buildReason,
-		})
-		if err != nil {
-			return xerrors.Errorf("insert workspace build: %w", err)
-		}
-		return nil
+	newProvisionerJob, err := store.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
+		ID:             provisionerJobID,
+		CreatedAt:      now,
+		UpdatedAt:      now,
+		InitiatorID:    workspace.OwnerID,
+		OrganizationID: template.OrganizationID,
+		Provisioner:    template.Provisioner,
+		Type:           database.ProvisionerJobTypeWorkspaceBuild,
+		StorageMethod:  priorJob.StorageMethod,
+		StorageSource:  priorJob.StorageSource,
+		Input:          input,
+	})
+	if err != nil {
+		return xerrors.Errorf("insert provisioner job: %w", err)
+	}
+	_, err = store.InsertWorkspaceBuild(ctx, database.InsertWorkspaceBuildParams{
+		ID:                workspaceBuildID,
+		CreatedAt:         now,
+		UpdatedAt:         now,
+		WorkspaceID:       workspace.ID,
+		TemplateVersionID: priorHistory.TemplateVersionID,
+		BuildNumber:       priorBuildNumber + 1,
+		Name:              namesgenerator.GetRandomName(1),
+		ProvisionerState:  priorHistory.ProvisionerState,
+		InitiatorID:       workspace.OwnerID,
+		Transition:        trans,
+		JobID:             newProvisionerJob.ID,
+		Reason:            buildReason,
 	})
 	if err != nil {
-		return err
+		return xerrors.Errorf("insert workspace build: %w", err)
 	}
 	return nil
 }
diff --git a/coderd/autobuild/executor/lifecycle_executor_test.go b/coderd/autobuild/executor/lifecycle_executor_test.go
@@ -52,8 +52,7 @@ func TestExecutorAutostartOK(t *testing.T) {
 	assert.Contains(t, stats.Transitions, workspace.ID)
 	assert.Equal(t, database.WorkspaceTransitionStart, stats.Transitions[workspace.ID])
 
-	workspace, err := client.Workspace(context.Background(), workspace.ID)
-	assert.NoError(t, err)
+	workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
 	assert.Equal(t, codersdk.BuildReasonAutostart, workspace.LatestBuild.Reason)
 }
 
@@ -205,8 +204,7 @@ func TestExecutorAutostopOK(t *testing.T) {
 	assert.Contains(t, stats.Transitions, workspace.ID)
 	assert.Equal(t, database.WorkspaceTransitionStop, stats.Transitions[workspace.ID])
 
-	workspace, err := client.Workspace(context.Background(), workspace.ID)
-	assert.NoError(t, err)
+	workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
 	assert.Equal(t, codersdk.BuildReasonAutostop, workspace.LatestBuild.Reason)
 }
 
