CR's fixes

evgeniy-scherbina · evgeniy-scherbina · commit 522a28a13f8a · 2025-04-28T18:59:27.000Z
diff --git a/coderd/prebuilds/api.go b/coderd/prebuilds/api.go
@@ -10,8 +10,8 @@ import (
 )
 
 var (
-	ErrNoClaimablePrebuiltWorkspaces = xerrors.New("no claimable prebuilt workspaces found")
-	ErrAGPLDoesNotSupportPrebuilds   = xerrors.New("prebuild-related functionality is not supported under the AGPL license")
+	ErrNoClaimablePrebuiltWorkspaces        = xerrors.New("no claimable prebuilt workspaces found")
+	ErrAGPLDoesNotSupportPrebuiltWorkspaces = xerrors.New("prebuilt workspaces functionality is not supported under the AGPL license")
 )
 
 // ReconciliationOrchestrator manages the lifecycle of prebuild reconciliation.
diff --git a/coderd/prebuilds/noop.go b/coderd/prebuilds/noop.go
@@ -27,7 +27,7 @@ type NoopClaimer struct{}
 
 func (NoopClaimer) Claim(context.Context, uuid.UUID, string, uuid.UUID) (*uuid.UUID, error) {
 	// Not entitled to claim prebuilds in AGPL version.
-	return nil, ErrAGPLDoesNotSupportPrebuilds
+	return nil, ErrAGPLDoesNotSupportPrebuiltWorkspaces
 }
 
 func (NoopClaimer) Initiator() uuid.UUID {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -654,7 +654,7 @@ func createWorkspace(
 			// 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) {
+				!errors.Is(err, prebuilds.ErrAGPLDoesNotSupportPrebuiltWorkspaces) {
 				return xerrors.Errorf("failed to claim prebuilt workspace: %w", err)
 			}
 		}
diff --git a/enterprise/coderd/prebuilds/claim_test.go b/enterprise/coderd/prebuilds/claim_test.go
@@ -114,7 +114,7 @@ func TestClaimPrebuild(t *testing.T) {
 		"AGPL does not support prebuilds error is returned": {
 			expectPrebuildClaimed:  false,
 			markPrebuildsClaimable: true,
-			claimingErr:            agplprebuilds.ErrAGPLDoesNotSupportPrebuilds,
+			claimingErr:            agplprebuilds.ErrAGPLDoesNotSupportPrebuiltWorkspaces,
 		},
 		"unexpected claiming error is returned": {
 			expectPrebuildClaimed:  false,
@@ -230,7 +230,7 @@ func TestClaimPrebuild(t *testing.T) {
 			})
 
 			isNoPrebuiltWorkspaces := errors.Is(tc.claimingErr, agplprebuilds.ErrNoClaimablePrebuiltWorkspaces)
-			isUnsupported := errors.Is(tc.claimingErr, agplprebuilds.ErrAGPLDoesNotSupportPrebuilds)
+			isUnsupported := errors.Is(tc.claimingErr, agplprebuilds.ErrAGPLDoesNotSupportPrebuiltWorkspaces)
 
 			switch {
 			case tc.claimingErr != nil && (isNoPrebuiltWorkspaces || isUnsupported):

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var (`
`13`		`- ErrNoClaimablePrebuiltWorkspaces = xerrors.New("no claimable prebuilt workspaces found")`
`14`		`- ErrAGPLDoesNotSupportPrebuilds = xerrors.New("prebuild-related functionality is not supported under the AGPL license")`
	`13`	`+ ErrNoClaimablePrebuiltWorkspaces = xerrors.New("no claimable prebuilt workspaces found")`
	`14`	`+ ErrAGPLDoesNotSupportPrebuiltWorkspaces = xerrors.New("prebuilt workspaces functionality is not supported under the AGPL license")`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// ReconciliationOrchestrator manages the lifecycle of prebuild reconciliation.`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type NoopClaimer struct{}`
`27`	`27`
`28`	`28`	`func (NoopClaimer) Claim(context.Context, uuid.UUID, string, uuid.UUID) (*uuid.UUID, error) {`
`29`	`29`	`// Not entitled to claim prebuilds in AGPL version.`
`30`		`- return nil, ErrAGPLDoesNotSupportPrebuilds`
	`30`	`+ return nil, ErrAGPLDoesNotSupportPrebuiltWorkspaces`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func (NoopClaimer) Initiator() uuid.UUID {`
Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ func createWorkspace(`
`654`	`654`	`// we fall back to creating a new workspace. Otherwise, propagate the unexpected error.`
`655`	`655`	`if err != nil &&`
`656`	`656`	`!errors.Is(err, prebuilds.ErrNoClaimablePrebuiltWorkspaces) &&`
`657`		`- !errors.Is(err, prebuilds.ErrAGPLDoesNotSupportPrebuilds) {`
	`657`	`+ !errors.Is(err, prebuilds.ErrAGPLDoesNotSupportPrebuiltWorkspaces) {`
`658`	`658`	`return xerrors.Errorf("failed to claim prebuilt workspace: %w", err)`
`659`	`659`	`}`
`660`	`660`	`}`