Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: adjust workspace claims to be initiated by users#20179

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.

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

Already on GitHub?Sign in to your account

Merged
SasSwart merged 2 commits intomainfromjjs/internal-934
Oct 8, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 0 additions & 1 deletioncoderd/prebuilds/api.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,5 +66,4 @@ type Claimer interface {
nextStartAt sql.NullTime,
ttl sql.NullInt64,
) (*uuid.UUID,error)
Initiator() uuid.UUID
}
4 changes: 0 additions & 4 deletionscoderd/prebuilds/noop.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,4 @@ func (NoopClaimer) Claim(context.Context, time.Time, uuid.UUID, string, uuid.UUI
returnnil,ErrAGPLDoesNotSupportPrebuiltWorkspaces
}

func (NoopClaimer)Initiator() uuid.UUID {
returnuuid.Nil
}

varDefaultClaimerClaimer=NoopClaimer{}
1 change: 0 additions & 1 deletioncoderd/workspaces.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -719,7 +719,6 @@ func createWorkspace(
}else {
// Prebuild found!
workspaceID=claimedWorkspace.ID
initiatorID=prebuildsClaimer.Initiator()
}

// We have to refetch the workspace for the joined in fields.
Expand Down
4 changes: 0 additions & 4 deletionsenterprise/coderd/prebuilds/claim.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,8 +55,4 @@ func (c EnterpriseClaimer) Claim(
return&result.ID,nil
}

func (EnterpriseClaimer)Initiator() uuid.UUID {
returndatabase.PrebuildsSystemUserID
}

var_ prebuilds.Claimer=&EnterpriseClaimer{}
15 changes: 9 additions & 6 deletionsenterprise/coderd/prebuilds/claim_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,6 @@ func (m *storeSpy) ClaimPrebuiltWorkspace(ctx context.Context, arg database.Clai
func TestClaimPrebuild(t *testing.T) {
t.Parallel()

if !dbtestutil.WillUsePostgres() {
t.Skip("This test requires postgres")
}

const (
desiredInstances = 1
presetCount = 2
Expand DownExpand Up@@ -260,13 +256,15 @@ func TestClaimPrebuild(t *testing.T) {
switch {
case tc.claimingErr != nil && (isNoPrebuiltWorkspaces || isUnsupported):
require.NoError(t, err)
build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, userWorkspace.LatestBuild.ID)
_ = build
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, userWorkspace.LatestBuild.ID)

// Then: the number of running prebuilds hasn't changed because claiming prebuild is failed and we fallback to creating new workspace.
currentPrebuilds, err := spy.GetRunningPrebuiltWorkspaces(ctx)
require.NoError(t, err)
require.Equal(t, expectedPrebuildsCount, len(currentPrebuilds))
// If there are no prebuilt workspaces to claim, a new workspace is created from scratch
// and the initiator is set as usual.
require.Equal(t, user.ID, userWorkspace.LatestBuild.Job.InitiatorID)
return

case tc.claimingErr != nil && errors.Is(tc.claimingErr, unexpectedClaimingError):
Expand All@@ -278,13 +276,18 @@ func TestClaimPrebuild(t *testing.T) {
currentPrebuilds, err := spy.GetRunningPrebuiltWorkspaces(ctx)
require.NoError(t, err)
require.Equal(t, expectedPrebuildsCount, len(currentPrebuilds))
// If a prebuilt workspace claim fails for an unanticipated, erroneous reason,
// no workspace is created and therefore the initiator is not set.
require.Equal(t, uuid.Nil, userWorkspace.LatestBuild.Job.InitiatorID)
return

default:
// tc.claimingErr is nil scenario
require.NoError(t, err)
build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, userWorkspace.LatestBuild.ID)
require.Equal(t, build.Job.Status, codersdk.ProvisionerJobSucceeded)
// Prebuild claims are initiated by the user who requested to create a workspace.
require.Equal(t, user.ID, userWorkspace.LatestBuild.Job.InitiatorID)
}

// at this point we know that tc.claimingErr is nil
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp