CR's fixes

coder · evgeniy-scherbina · Apr 24, 2025 · Apr 17, 2025 · Apr 22, 2025 · Apr 21, 2025
commit 50d23e4780a863f90a2c36192285febb2dd97302
diff --git a/enterprise/coderd/prebuilds/claim.go b/enterprise/coderd/prebuilds/claim.go
@@ -5,59 +5,42 @@
 	"database/sql"
 	"errors"
 
-	"github.com/coder/coder/v2/coderd/prebuilds"
-
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 )
 
 type EnterpriseClaimer struct{}

 func (_ EnterpriseClaimer) Claim(
 	ctx context.Context,
 	store database.Store,
 	userID uuid.UUID,
 	name string,
 	presetID uuid.UUID,
 ) (*uuid.UUID, error) {
-	var prebuildID *uuid.UUID
-	err := store.InTx(func(db database.Store) error {
-		// TODO: do we need this?
-		//// Ensure no other replica can claim a prebuild for this user simultaneously.
-		// err := store.AcquireLock(ctx, database.GenLockID(fmt.Sprintf("prebuild-user-claim-%s", userID.String())))
-		// if err != nil {
-		//	return xerrors.Errorf("acquire claim lock for user %q: %w", userID.String(), err)
-		//}
-
-		result, err := db.ClaimPrebuiltWorkspace(ctx, database.ClaimPrebuiltWorkspaceParams{
-			NewUserID: userID,
-			NewName:   name,
-			PresetID:  presetID,
-		})
-		if err != nil {
-			switch {
-			// No eligible prebuilds found
-			case errors.Is(err, sql.ErrNoRows):
-				// Exit, this will result in a nil prebuildID being returned, which is fine
-				return nil
-			default:
-				return xerrors.Errorf("claim prebuild for user %q: %w", userID.String(), err)
-			}
-		}
-
-		prebuildID = &result.ID
-
-		return nil
-	}, &database.TxOptions{
-		TxIdentifier: "prebuild-claim",
+	result, err := store.ClaimPrebuiltWorkspace(ctx, database.ClaimPrebuiltWorkspaceParams{
+		NewUserID: userID,
+		NewName:   name,
+		PresetID:  presetID,
 	})
+	if err != nil {
+		switch {
+		// No eligible prebuilds found
+		case errors.Is(err, sql.ErrNoRows):
+			// Exit, this will result in a nil prebuildID being returned, which is fine
+			return nil, nil
+		default:
+			return nil, xerrors.Errorf("claim prebuild for user %q: %w", userID.String(), err)
+		}
+	}
 
-	return prebuildID, err
+	return &result.ID, nil
 }
 
 func (_ EnterpriseClaimer) Initiator() uuid.UUID {
 	return prebuilds.SystemUserID
 }