Skip to content

refactor: use specific error for agpl and prebuilds #17591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 28, 2025
Merged

refactor: use specific error for agpl and prebuilds #17591

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0a025e
refactor: use specific error for agpl and prebuilds
evgeniy-scherbina Apr 28, 2025
71d66af
refactor: add minor comment
evgeniy-scherbina Apr 28, 2025
bec0fdc
refactor: fix linter
evgeniy-scherbina Apr 28, 2025
522a28a
CR's fixes
evgeniy-scherbina Apr 28, 2025
a4954e4
CR's fixes
evgeniy-scherbina Apr 28, 2025
ffac933
CR's fixes
evgeniy-scherbina Apr 28, 2025
2812eec
Merge remote-tracking branch 'origin/main' into yevhenii/512-claim-pr…
evgeniy-scherbina Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: add minor comment
  • Loading branch information
@evgeniy-scherbina
evgeniy-scherbina committed Apr 28, 2025
commit 71d66af44ee50226562344dd17c3e4775d104bfa
2 changes: 2 additions & 0 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,11 @@
if req.TemplateVersionPresetID != uuid.Nil {
// Try and claim an eligible prebuild, if available.
claimedWorkspace, err = claimPrebuild(ctx, prebuildsClaimer, db, api.Logger, req, owner)
// If claiming fails with an expected error (no claimable prebuilds or AGPL does not support prebuilds),
// we fall back to creating a new workspace. Otherwise, propagate the unexpected error.
if err != nil &&
!errors.Is(err, prebuilds.ErrNoClaimablePrebuiltWorkspaces) &&
!errors.Is(err, prebuilds.ErrAGPLDoesNotSupportPrebuilds) {

Check failure on line 657 in coderd/workspaces.go

View workflow job for this annotation

GitHub Actions / lint 

empty-lines: extra empty line at the start of a block (revive)

return xerrors.Errorf("failed to claim prebuilt workspace: %w", err)
}
Expand Down
Loading