Skip to content

Commit 9359efa

Browse files
dannykoppingdannykopping
committed
Moving prebuilds owner ID to OSS package to prevent AGPL-violating imports
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parent e03231e commit 9359efa

File tree

10 files changed

+30
-26
lines changed

10 files changed

+30
-26
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4694,13 +4694,13 @@ func (s *MethodTestSuite) TestPrebuilds() {
46944694
CreatedBy: user.ID,
46954695
})
46964696
preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
4697-
Name: coderdtest.RandomName(s.T()),
4697+
Name: coderdtest.RandomName(s.T()),
46984698
TemplateVersionID: templateVersion.ID,
46994699
})
47004700
check.Args(database.InsertPresetPrebuildParams{
4701-
ID: uuid.New(),
4702-
PresetID: preset.ID,
4703-
DesiredInstances: 1,
4701+
ID: uuid.New(),
4702+
PresetID: preset.ID,
4703+
DesiredInstances: 1,
47044704
}).
47054705
Asserts(rbac.ResourceSystem, policy.ActionCreate).
47064706
ErrorsWithInMemDB(dbmem.ErrUnimplemented)

‎coderd/members_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package coderd_test
33
import (
44
"testing"
55

6-
"github.com/coder/coder/v2/coderd/database/dbtestutil"
7-
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
8-
96
"github.com/google/uuid"
107
"github.com/stretchr/testify/require"
118

9+
"github.com/coder/coder/v2/coderd/database/dbtestutil"
10+
"github.com/coder/coder/v2/coderd/prebuilds"
11+
1212
"github.com/coder/coder/v2/coderd/coderdtest"
1313
"github.com/coder/coder/v2/coderd/database/db2sdk"
1414
"github.com/coder/coder/v2/coderd/rbac"

‎coderd/prebuilds/id.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package prebuilds
2+
3+
import "github.com/google/uuid"
4+
5+
var OwnerID = uuid.MustParse("c42fdf75-3097-471c-8c33-fb52454d81c0")

‎enterprise/coderd/groups_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/coder/coder/v2/coderd/database/dbtestutil"
10-
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
10+
"github.com/coder/coder/v2/coderd/prebuilds"
1111

1212
"github.com/google/uuid"
1313
"github.com/stretchr/testify/require"

‎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-
return OwnerID
55+
return prebuilds.OwnerID
5656
}
5757

5858
var _ prebuilds.Claimer = &EnterpriseClaimer{}

‎enterprise/coderd/prebuilds/id.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
package prebuilds
2-
3-
import "github.com/google/uuid"
4-
5-
var OwnerID = uuid.MustParse("c42fdf75-3097-471c-8c33-fb52454d81c0")

‎enterprise/coderd/prebuilds/metricscollector_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ import (
1313
prometheus_client "github.com/prometheus/client_model/go"
1414

1515
"cdr.dev/slog/sloggers/slogtest"
16+
"github.com/coder/quartz"
17+
1618
"github.com/coder/coder/v2/coderd/database"
1719
"github.com/coder/coder/v2/coderd/database/dbgen"
1820
"github.com/coder/coder/v2/coderd/database/dbtestutil"
21+
agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds"
1922
"github.com/coder/coder/v2/codersdk"
2023
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
2124
"github.com/coder/coder/v2/testutil"
22-
"github.com/coder/quartz"
2325
)
2426

2527
func TestMetricsCollector(t *testing.T) {
@@ -49,11 +51,11 @@ func TestMetricsCollector(t *testing.T) {
4951
name: "prebuild created",
5052
transitions: allTransitions,
5153
jobStatuses: allJobStatuses,
52-
initiatorIDs: []uuid.UUID{prebuilds.OwnerID},
54+
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
5355
// TODO: reexamine and refactor the test cases and assertions:
5456
// * a running prebuild that is not elibible to be claimed currently seems to be eligible.
5557
// * a prebuild that was claimed should not be deemed running, not eligible.
56-
ownerIDs: []uuid.UUID{prebuilds.OwnerID, uuid.New()},
58+
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID, uuid.New()},
5759
metrics: []metricCheck{
5860
{"coderd_prebuilds_created", ptr.To(1.0), true},
5961
{"coderd_prebuilds_desired", ptr.To(1.0), false},
@@ -65,8 +67,8 @@ func TestMetricsCollector(t *testing.T) {
6567
name: "prebuild running",
6668
transitions: []database.WorkspaceTransition{database.WorkspaceTransitionStart},
6769
jobStatuses: []database.ProvisionerJobStatus{database.ProvisionerJobStatusSucceeded},
68-
initiatorIDs: []uuid.UUID{prebuilds.OwnerID},
69-
ownerIDs: []uuid.UUID{prebuilds.OwnerID},
70+
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
71+
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID},
7072
metrics: []metricCheck{
7173
{"coderd_prebuilds_created", ptr.To(1.0), true},
7274
{"coderd_prebuilds_desired", ptr.To(1.0), false},
@@ -78,8 +80,8 @@ func TestMetricsCollector(t *testing.T) {
7880
name: "prebuild failed",
7981
transitions: allTransitions,
8082
jobStatuses: []database.ProvisionerJobStatus{database.ProvisionerJobStatusFailed},
81-
initiatorIDs: []uuid.UUID{prebuilds.OwnerID},
82-
ownerIDs: []uuid.UUID{prebuilds.OwnerID, uuid.New()},
83+
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
84+
ownerIDs: []uuid.UUID{agplprebuilds.OwnerID, uuid.New()},
8385
metrics: []metricCheck{
8486
{"coderd_prebuilds_created", ptr.To(1.0), true},
8587
{"coderd_prebuilds_failed", ptr.To(1.0), true},
@@ -92,7 +94,7 @@ func TestMetricsCollector(t *testing.T) {
9294
name: "prebuild assigned",
9395
transitions: allTransitions,
9496
jobStatuses: allJobStatuses,
95-
initiatorIDs: []uuid.UUID{prebuilds.OwnerID},
97+
initiatorIDs: []uuid.UUID{agplprebuilds.OwnerID},
9698
ownerIDs: []uuid.UUID{uuid.New()},
9799
metrics: []metricCheck{
98100
{"coderd_prebuilds_created", ptr.To(1.0), true},
@@ -143,7 +145,7 @@ func TestMetricsCollector(t *testing.T) {
143145
reconciler := prebuilds.NewStoreReconciler(db, pubsub, codersdk.PrebuildsConfig{}, logger, quartz.NewMock(t))
144146
ctx := testutil.Context(t, testutil.WaitLong)
145147

146-
createdUsers := []uuid.UUID{prebuilds.OwnerID}
148+
createdUsers := []uuid.UUID{agplprebuilds.OwnerID}
147149
for _, user := range slices.Concat(test.ownerIDs, test.initiatorIDs) {
148150
if !slices.Contains(createdUsers, user) {
149151
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
@@ -378,7 +378,7 @@ func (c *StoreReconciler) createPrebuild(ctx context.Context, prebuildID uuid.UU
378378
ID: prebuildID,
379379
CreatedAt: now,
380380
UpdatedAt: now,
381-
OwnerID: OwnerID,
381+
OwnerID: prebuilds.OwnerID,
382382
OrganizationID: template.OrganizationID,
383383
TemplateID: template.ID,
384384
Name: name,
@@ -448,7 +448,7 @@ func (c *StoreReconciler) provision(ctx context.Context, db database.Store, preb
448448

449449
builder := wsbuilder.New(workspace, transition).
450450
Reason(database.BuildReasonInitiator).
451-
Initiator(OwnerID).
451+
Initiator(prebuilds.OwnerID).
452452
ActiveVersion().
453453
VersionID(template.ActiveVersionID).
454454
MarkPrebuild().

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/coder/coder/v2/coderd/database/dbgen"
2323
"github.com/coder/coder/v2/coderd/database/dbtestutil"
2424
"github.com/coder/coder/v2/coderd/database/pubsub"
25+
agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds"
2526
"github.com/coder/coder/v2/codersdk"
2627
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
2728
"github.com/coder/coder/v2/testutil"
@@ -619,7 +620,7 @@ func setupTestDBPrebuild(
619620
templateVersionID uuid.UUID,
620621
) database.WorkspaceTable {
621622
t.Helper()
622-
return setupTestDBWorkspace(t, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, prebuilds.OwnerID, prebuilds.OwnerID)
623+
return setupTestDBWorkspace(t, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, agplprebuilds.OwnerID, agplprebuilds.OwnerID)
623624
}
624625

625626
func setupTestDBWorkspace(

‎enterprise/coderd/roles_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99

1010
"github.com/coder/coder/v2/coderd/database/dbtestutil"
11-
"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
11+
"github.com/coder/coder/v2/coderd/prebuilds"
1212

1313
"github.com/google/uuid"
1414
"github.com/stretchr/testify/require"

0 commit comments

Comments
 (0)