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

Commit74d5cd9

Browse files
committed
Rename prebuild system user reference
1 parent5bed44c commit74d5cd9

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ var (
362362

363363
subjectPrebuildsOrchestrator= rbac.Subject{
364364
FriendlyName:"Prebuilds Orchestrator",
365-
ID:prebuilds.OwnerID.String(),
365+
ID:prebuilds.SystemUserID.String(),
366366
Roles:rbac.Roles([]rbac.Role{
367367
{
368368
Identifier: rbac.RoleIdentifier{Name:"prebuilds-orchestrator"},

‎coderd/prebuilds/id.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package prebuilds
22

33
import"github.com/google/uuid"
44

5-
varOwnerID=uuid.MustParse("c42fdf75-3097-471c-8c33-fb52454d81c0")
5+
varSystemUserID=uuid.MustParse("c42fdf75-3097-471c-8c33-fb52454d81c0")

‎coderd/users_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2460,7 +2460,7 @@ func TestSystemUserBehaviour(t *testing.T) {
24602460
require.NotNil(t,regularUser)
24612461

24622462
require.True(t,systemUser.IsSystem.Bool)
2463-
require.Equal(t,systemUser.ID,prebuilds.OwnerID)
2463+
require.Equal(t,systemUser.ID,prebuilds.SystemUserID)
24642464
require.False(t,regularUser.IsSystem.Bool)
24652465
require.Equal(t,regularUser.ID,other.ID)
24662466

‎enterprise/coderd/groups_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ func TestGroup(t *testing.T) {
840840
ctx:=testutil.Context(t,testutil.WaitLong)
841841

842842
// nolint:gocritic // "This client is operating as the owner user" is fine in this case.
843-
prebuildsUser,err:=client.User(ctx,prebuilds.OwnerID.String())
843+
prebuildsUser,err:=client.User(ctx,prebuilds.SystemUserID.String())
844844
require.NoError(t,err)
845845
// The 'Everyone' group always has an ID that matches the organization ID.
846846
group,err:=userAdminClient.Group(ctx,user.OrganizationID)

‎enterprise/coderd/prebuilds/claim.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (_ EnterpriseClaimer) Claim(ctx context.Context, store database.Store, user
5252
}
5353

5454
func (_EnterpriseClaimer)Initiator() uuid.UUID {
55-
returnprebuilds.OwnerID
55+
returnprebuilds.SystemUserID
5656
}
5757

5858
var_ prebuilds.Claimer=&EnterpriseClaimer{}

‎enterprise/coderd/prebuilds/metricscollector_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func TestMetricsCollector(t *testing.T) {
5151
name:"prebuild created",
5252
transitions:allTransitions,
5353
jobStatuses:allJobStatuses,
54-
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
54+
initiatorIDs: []uuid.UUID{agplprebuilds.SystemUserID},
5555
// TODO: reexamine and refactor the test cases and assertions:
5656
// * a running prebuild that is not elibible to be claimed currently seems to be eligible.
5757
// * a prebuild that was claimed should not be deemed running, not eligible.
58-
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID,uuid.New()},
58+
ownerIDs: []uuid.UUID{agplprebuilds.SystemUserID,uuid.New()},
5959
metrics: []metricCheck{
6060
{"coderd_prebuilds_created",ptr.To(1.0),true},
6161
{"coderd_prebuilds_desired",ptr.To(1.0),false},
@@ -67,8 +67,8 @@ func TestMetricsCollector(t *testing.T) {
6767
name:"prebuild running",
6868
transitions: []database.WorkspaceTransition{database.WorkspaceTransitionStart},
6969
jobStatuses: []database.ProvisionerJobStatus{database.ProvisionerJobStatusSucceeded},
70-
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
71-
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID},
70+
initiatorIDs: []uuid.UUID{agplprebuilds.SystemUserID},
71+
ownerIDs: []uuid.UUID{agplprebuilds.SystemUserID},
7272
metrics: []metricCheck{
7373
{"coderd_prebuilds_created",ptr.To(1.0),true},
7474
{"coderd_prebuilds_desired",ptr.To(1.0),false},
@@ -80,8 +80,8 @@ func TestMetricsCollector(t *testing.T) {
8080
name:"prebuild failed",
8181
transitions:allTransitions,
8282
jobStatuses: []database.ProvisionerJobStatus{database.ProvisionerJobStatusFailed},
83-
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
84-
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID,uuid.New()},
83+
initiatorIDs: []uuid.UUID{agplprebuilds.SystemUserID},
84+
ownerIDs: []uuid.UUID{agplprebuilds.SystemUserID,uuid.New()},
8585
metrics: []metricCheck{
8686
{"coderd_prebuilds_created",ptr.To(1.0),true},
8787
{"coderd_prebuilds_failed",ptr.To(1.0),true},
@@ -94,7 +94,7 @@ func TestMetricsCollector(t *testing.T) {
9494
name:"prebuild assigned",
9595
transitions:allTransitions,
9696
jobStatuses:allJobStatuses,
97-
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
97+
initiatorIDs: []uuid.UUID{agplprebuilds.SystemUserID},
9898
ownerIDs: []uuid.UUID{uuid.New()},
9999
metrics: []metricCheck{
100100
{"coderd_prebuilds_created",ptr.To(1.0),true},
@@ -145,7 +145,7 @@ func TestMetricsCollector(t *testing.T) {
145145
reconciler:=prebuilds.NewStoreReconciler(db,pubsub, codersdk.PrebuildsConfig{},logger,quartz.NewMock(t))
146146
ctx:=testutil.Context(t,testutil.WaitLong)
147147

148-
createdUsers:= []uuid.UUID{agplprebuilds.OwnerID}
148+
createdUsers:= []uuid.UUID{agplprebuilds.SystemUserID}
149149
for_,user:=rangeslices.Concat(test.ownerIDs,test.initiatorIDs) {
150150
if!slices.Contains(createdUsers,user) {
151151
dbgen.User(t,db, database.User{

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func (c *StoreReconciler) createPrebuild(ctx context.Context, prebuildID uuid.UU
371371
ID:prebuildID,
372372
CreatedAt:now,
373373
UpdatedAt:now,
374-
OwnerID:prebuilds.OwnerID,
374+
OwnerID:prebuilds.SystemUserID,
375375
OrganizationID:template.OrganizationID,
376376
TemplateID:template.ID,
377377
Name:name,
@@ -441,7 +441,7 @@ func (c *StoreReconciler) provision(ctx context.Context, db database.Store, preb
441441

442442
builder:=wsbuilder.New(workspace,transition).
443443
Reason(database.BuildReasonInitiator).
444-
Initiator(prebuilds.OwnerID).
444+
Initiator(prebuilds.SystemUserID).
445445
ActiveVersion().
446446
VersionID(template.ActiveVersionID).
447447
MarkPrebuild().

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ func setupTestDBPrebuild(
620620
templateVersionID uuid.UUID,
621621
) database.WorkspaceTable {
622622
t.Helper()
623-
returnsetupTestDBWorkspace(t,clock,db,ps,transition,prebuildStatus,orgID,preset,templateID,templateVersionID,agplprebuilds.OwnerID,agplprebuilds.OwnerID)
623+
returnsetupTestDBWorkspace(t,clock,db,ps,transition,prebuildStatus,orgID,preset,templateID,templateVersionID,agplprebuilds.SystemUserID,agplprebuilds.SystemUserID)
624624
}
625625

626626
funcsetupTestDBWorkspace(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp