untx

aslilac · aslilac · commit 6a8cf69c047c · 2025-05-06T19:51:19.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1437,64 +1437,57 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 		// If there is a plan, or a module files archive we need to insert a
 		// template_version_terraform_values row.
 		if len(plan) > 0 || len(moduleFiles) > 0 {
-			err := s.Database.InTx(func(tx database.Store) error {
-				// ...but the plan and the module files archive are both optional! So
-				// we need to fallback to a valid JSON object if the plan was omitted.
-				if len(plan) == 0 {
-					plan = []byte("{}")
-				}
-
-				// ...and we only want to insert a files row if an archive was provided.
-				var fileID uuid.NullUUID
-				if len(moduleFiles) > 0 {
-					hashBytes := sha256.Sum256(moduleFiles)
-					hash := hex.EncodeToString(hashBytes[:])
-
-					// nolint:gocritic // Requires reading "system" files
-					file, err := tx.GetFileByHashAndCreator(dbauthz.AsSystemRestricted(ctx), database.GetFileByHashAndCreatorParams{Hash: hash, CreatedBy: uuid.Nil})
-					switch {
-					case err == nil:
-						// This set of modules is already cached, which means we can reuse them
-						fileID = uuid.NullUUID{
-							Valid: true,
-							UUID:  file.ID,
-						}
-					case !xerrors.Is(err, sql.ErrNoRows):
-						return xerrors.Errorf("check for cached modules: %w", err)
-					default:
-						// nolint:gocritic // Requires creating a "system" file
-						file, err = tx.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
-							ID:        uuid.New(),
-							Hash:      hash,
-							CreatedBy: uuid.Nil,
-							CreatedAt: dbtime.Now(),
-							Mimetype:  tarMimeType,
-							Data:      moduleFiles,
-						})
-						if err != nil {
-							return xerrors.Errorf("insert template version terraform modules: %w", err)
-						}
-						fileID = uuid.NullUUID{
-							Valid: true,
-							UUID:  file.ID,
-						}
+			// ...but the plan and the module files archive are both optional! So
+			// we need to fallback to a valid JSON object if the plan was omitted.
+			if len(plan) == 0 {
+				plan = []byte("{}")
+			}
+
+			// ...and we only want to insert a files row if an archive was provided.
+			var fileID uuid.NullUUID
+			if len(moduleFiles) > 0 {
+				hashBytes := sha256.Sum256(moduleFiles)
+				hash := hex.EncodeToString(hashBytes[:])
+
+				// nolint:gocritic // Requires reading "system" files
+				file, err := s.Database.GetFileByHashAndCreator(dbauthz.AsSystemRestricted(ctx), database.GetFileByHashAndCreatorParams{Hash: hash, CreatedBy: uuid.Nil})
+				switch {
+				case err == nil:
+					// This set of modules is already cached, which means we can reuse them
+					fileID = uuid.NullUUID{
+						Valid: true,
+						UUID:  file.ID,
+					}
+				case !xerrors.Is(err, sql.ErrNoRows):
+					return nil, xerrors.Errorf("check for cached modules: %w", err)
+				default:
+					// nolint:gocritic // Requires creating a "system" file
+					file, err = s.Database.InsertFile(dbauthz.AsSystemRestricted(ctx), database.InsertFileParams{
+						ID:        uuid.New(),
+						Hash:      hash,
+						CreatedBy: uuid.Nil,
+						CreatedAt: dbtime.Now(),
+						Mimetype:  tarMimeType,
+						Data:      moduleFiles,
+					})
+					if err != nil {
+						return nil, xerrors.Errorf("insert template version terraform modules: %w", err)
+					}
+					fileID = uuid.NullUUID{
+						Valid: true,
+						UUID:  file.ID,
 					}
 				}
+			}
 
-				err = tx.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
-					JobID:             jobID,
-					UpdatedAt:         now,
-					CachedPlan:        plan,
-					CachedModuleFiles: fileID,
-				})
-				if err != nil {
-					return xerrors.Errorf("insert template version terraform data: %w", err)
-				}
-
-				return nil
-			}, nil)
+			err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
+				JobID:             jobID,
+				UpdatedAt:         now,
+				CachedPlan:        plan,
+				CachedModuleFiles: fileID,
+			})
 			if err != nil {
-				return nil, err
+				return nil, xerrors.Errorf("insert template version terraform data: %w", err)
 			}
 		}
 
