Merge branch 'main' of github.com:/coder/coder into dk/enable-prebuilds

dannykopping · dannykopping · commit 8c3e53efc700 · 2025-04-24T16:02:51.000+02:00
diff --git a/coderd/prebuilds/noop.go b/coderd/prebuilds/noop.go
@@ -29,6 +29,8 @@ func (NoopClaimer) Claim(context.Context, uuid.UUID, string, uuid.UUID) (*uuid.U
 	// Not entitled to claim prebuilds in AGPL version.
 	return nil, ErrNoClaimablePrebuiltWorkspaces
 }
-func (NoopClaimer) Initiator() uuid.UUID { return uuid.Nil }
+func (NoopClaimer) Initiator() uuid.UUID {
+	return uuid.Nil
+}
 
 var DefaultClaimer Claimer = NoopClaimer{}
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -876,15 +876,13 @@ func requestTemplate(ctx context.Context, rw http.ResponseWriter, req codersdk.C
 }
 
 func claimPrebuild(ctx context.Context, claimer prebuilds.Claimer, db database.Store, logger slog.Logger, req codersdk.CreateWorkspaceRequest, owner workspaceOwner) (*database.Workspace, error) {
-	prebuildsCtx := dbauthz.AsPrebuildsOrchestrator(ctx)
-
-	claimedID, err := claimer.Claim(prebuildsCtx, owner.ID, req.Name, req.TemplateVersionPresetID)
+	claimedID, err := claimer.Claim(ctx, owner.ID, req.Name, req.TemplateVersionPresetID)
 	if err != nil {
 		// TODO: enhance this by clarifying whether this *specific* prebuild failed or whether there are none to claim.
 		return nil, xerrors.Errorf("claim prebuild: %w", err)
 	}
 
-	lookup, err := db.GetWorkspaceByID(prebuildsCtx, *claimedID)
+	lookup, err := db.GetWorkspaceByID(ctx, *claimedID)
 	if err != nil {
 		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)
diff --git a/enterprise/coderd/prebuilds/claim_test.go b/enterprise/coderd/prebuilds/claim_test.go
@@ -3,6 +3,7 @@ package prebuilds_test
 import (
 	"context"
 	"database/sql"
+	"slices"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -125,7 +126,7 @@ func TestClaimPrebuild(t *testing.T) {
 			t.Parallel()
 
 			// Setup.
-			ctx := testutil.Context(t, testutil.WaitMedium)
+			ctx := testutil.Context(t, testutil.WaitSuperLong)
 			db, pubsub := dbtestutil.NewDB(t)
 			spy := newStoreSpy(db)
 			expectedPrebuildsCount := desiredInstances * presetCount
@@ -250,13 +251,9 @@ func TestClaimPrebuild(t *testing.T) {
 			require.Equal(t, expectedPrebuildsCount-1, len(currentPrebuilds))
 
 			// Then: the claimed prebuild is now missing from the running prebuilds set.
-			var found bool
-			for _, prebuild := range currentPrebuilds {
-				if prebuild.ID == claimed.ID {
-					found = true
-					break
-				}
-			}
+			found := slices.ContainsFunc(currentPrebuilds, func(prebuild database.GetRunningPrebuiltWorkspacesRow) bool {
+				return prebuild.ID == claimed.ID
+			})
 			require.False(t, found, "claimed prebuild should not still be considered a running prebuild")
 
 			// Then: reconciling at this point will provision a new prebuild to replace the claimed one.
@@ -407,7 +404,7 @@ func TestClaimPrebuild_CheckDifferentErrors(t *testing.T) {
 			t.Parallel()
 
 			// Setup.
-			ctx := testutil.Context(t, testutil.WaitMedium)
+			ctx := testutil.Context(t, testutil.WaitSuperLong)
 			db, pubsub := dbtestutil.NewDB(t)
 			errorStore := newErrorStore(db, tc.claimingErr)
 
diff --git a/go.mod b/go.mod
@@ -164,7 +164,7 @@ require (
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
 	github.com/pkg/sftp v1.13.7
-	github.com/prometheus-community/pro-bing v0.6.0
+	github.com/prometheus-community/pro-bing v0.7.0
 	github.com/prometheus/client_golang v1.22.0
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.63.0
diff --git a/go.sum b/go.sum
@@ -1671,8 +1671,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/prometheus-community/pro-bing v0.6.0 h1:04SZ/092gONTE1XUFzYFWqgB4mKwcdkqNChLMFedwhg=
-github.com/prometheus-community/pro-bing v0.6.0/go.mod h1:jNCOI3D7pmTCeaoF41cNS6uaxeFY/Gmc3ffwbuJVzAQ=
+github.com/prometheus-community/pro-bing v0.7.0 h1:KFYFbxC2f2Fp6c+TyxbCOEarf7rbnzr9Gw8eIb0RfZA=
+github.com/prometheus-community/pro-bing v0.7.0/go.mod h1:Moob9dvlY50Bfq6i88xIwfyw7xLFHH69LUgx9n5zqCE=
 github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
 github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ func (NoopClaimer) Claim(context.Context, uuid.UUID, string, uuid.UUID) (*uuid.U`
`29`	`29`	`// Not entitled to claim prebuilds in AGPL version.`
`30`	`30`	`return nil, ErrNoClaimablePrebuiltWorkspaces`
`31`	`31`	`}`
`32`		`-func (NoopClaimer) Initiator() uuid.UUID { return uuid.Nil }`
	`32`	`+func (NoopClaimer) Initiator() uuid.UUID {`
	`33`	`+ return uuid.Nil`
	`34`	`+}`
`33`	`35`
`34`	`36`	`var DefaultClaimer Claimer = NoopClaimer{}`