CR's fixes

evgeniy-scherbina · evgeniy-scherbina · commit 4098ed713ce7 · 2025-04-22T17:10:21.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -19,8 +19,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coder/coder/v2/coderd/prebuilds"
-
 	"github.com/andybalholm/brotli"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
@@ -47,6 +45,7 @@ import (
 	"github.com/coder/coder/v2/coderd/entitlements"
 	"github.com/coder/coder/v2/coderd/files"
 	"github.com/coder/coder/v2/coderd/idpsync"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 	"github.com/coder/coder/v2/coderd/runtimeconfig"
 	"github.com/coder/coder/v2/coderd/webpush"
 
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -11,8 +11,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/coder/coder/v2/coderd/prebuilds"
-
 	"github.com/dustin/go-humanize"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
@@ -31,6 +29,7 @@ import (
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/notifications"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/rbac/policy"
 	"github.com/coder/coder/v2/coderd/schedule"
@@ -897,7 +896,7 @@ func claimPrebuild(ctx context.Context, claimer prebuilds.Claimer, db database.S
 		logger.Error(ctx, "unable to find claimed workspace by ID", slog.Error(err), slog.F("claimed_prebuild_id", (*claimedID).String()))
 		return nil, xerrors.Errorf("find claimed workspace by ID %q: %w", (*claimedID).String(), err)
 	}
-	return &lookup, err
+	return &lookup, nil
 }
 
 func (api *API) notifyWorkspaceCreated(
