CR's fixes

evgeniy-scherbina · evgeniy-scherbina · commit 85f79268c998 · 2025-04-22T19:57:06.000Z
diff --git a/coderd/prebuilds/api.go b/coderd/prebuilds/api.go
@@ -2,12 +2,15 @@ package prebuilds
 
 import (
 	"context"
+	"errors"
 
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/v2/coderd/database"
 )
 
+var ErrNoClaimablePrebuiltWorkspaces = errors.New("no claimable prebuilt workspaces found")
+
 // ReconciliationOrchestrator manages the lifecycle of prebuild reconciliation.
 // It runs a continuous loop to check and reconcile prebuild states, and can be stopped gracefully.
 type ReconciliationOrchestrator interface {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -639,7 +639,7 @@ func createWorkspace(
 		provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow
 	)
 
-	prebuilds := *api.PrebuildsClaimer.Load()
+	prebuildsClaimer := *api.PrebuildsClaimer.Load()
 
 	err = api.Database.InTx(func(db database.Store) error {
 		var (
@@ -650,8 +650,8 @@ func createWorkspace(
 		// If a template preset was chosen, try claim a prebuilt workspace.
 		if req.TemplateVersionPresetID != uuid.Nil {
 			// Try and claim an eligible prebuild, if available.
-			claimedWorkspace, err = claimPrebuild(ctx, prebuilds, db, api.Logger, req, owner)
-			if err != nil {
+			claimedWorkspace, err = claimPrebuild(ctx, prebuildsClaimer, db, api.Logger, req, owner)
+			if err != nil && !errors.Is(err, prebuilds.ErrNoClaimablePrebuiltWorkspaces) {
 				return xerrors.Errorf("claim prebuild: %w", err)
 			}
 		}
@@ -683,7 +683,7 @@ func createWorkspace(
 		} else {
 			// Prebuild found!
 			workspaceID = claimedWorkspace.ID
-			initiatorID = prebuilds.Initiator()
+			initiatorID = prebuildsClaimer.Initiator()
 		}
 
 		// We have to refetch the workspace for the joined in fields.
@@ -886,11 +886,6 @@ func claimPrebuild(ctx context.Context, claimer prebuilds.Claimer, db database.S
 		return nil, xerrors.Errorf("claim prebuild: %w", err)
 	}
 
-	// No prebuild available.
-	if claimedID == nil {
-		return nil, nil
-	}
-
 	lookup, err := db.GetWorkspaceByID(prebuildsCtx, *claimedID)
 	if err != nil {
 		logger.Error(ctx, "unable to find claimed workspace by ID", slog.Error(err), slog.F("claimed_prebuild_id", (*claimedID).String()))
diff --git a/enterprise/coderd/prebuilds/claim.go b/enterprise/coderd/prebuilds/claim.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
@@ -30,8 +29,7 @@ func (_ EnterpriseClaimer) Claim(
 		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
+			return nil, prebuilds.ErrNoClaimablePrebuiltWorkspaces
 		default:
 			return nil, xerrors.Errorf("claim prebuild for user %q: %w", userID.String(), err)
 		}
