Moving prebuilds owner ID to OSS package to prevent AGPL-violating imports

dannykopping · dannykopping · commit d6849710f1b7 · 2025-03-12T15:50:43.000Z
...and other linter appeasements

Signed-off-by: Danny Kopping &lt;dannykopping@gmail.com&gt;
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -1181,9 +1181,10 @@ func PresetParameter(t testing.TB, db database.Store, seed database.InsertPreset
 
 func PresetPrebuild(t testing.TB, db database.Store, seed database.InsertPresetPrebuildParams) database.TemplateVersionPresetPrebuild {
 	prebuild, err := db.InsertPresetPrebuild(genCtx, database.InsertPresetPrebuildParams{
-		ID:               takeFirst(seed.ID, uuid.New()),
-		PresetID:         takeFirst(seed.PresetID, uuid.New()),
-		DesiredInstances: takeFirst(seed.DesiredInstances, 1),
+		ID:                  takeFirst(seed.ID, uuid.New()),
+		PresetID:            takeFirst(seed.PresetID, uuid.New()),
+		DesiredInstances:    takeFirst(seed.DesiredInstances, 1),
+		InvalidateAfterSecs: 0,
 	})
 	require.NoError(t, err, "insert preset prebuild")
 	return prebuild
diff --git a/coderd/members_test.go b/coderd/members_test.go
@@ -3,12 +3,12 @@ package coderd_test
 import (
 	"testing"
 
-	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
-
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/v2/coderd/database/dbtestutil"
+	"github.com/coder/coder/v2/coderd/prebuilds"
+
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/rbac"
@@ -56,12 +56,13 @@ func TestListMembers(t *testing.T) {
 	t.Parallel()
 
 	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+
 		// TODO: we should not be returning the prebuilds user in OrganizationMembers, and this is not returned in dbmem.
 		if !dbtestutil.WillUsePostgres() {
 			t.Skip("This test requires postgres")
 		}
 
-		t.Parallel()
 		owner := coderdtest.New(t, nil)
 		first := coderdtest.CreateFirstUser(t, owner)
 
diff --git a/coderd/prebuilds/id.go b/coderd/prebuilds/id.go
diff --git a/enterprise/coderd/groups_test.go b/enterprise/coderd/groups_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
@@ -840,6 +840,7 @@ func TestGroup(t *testing.T) {
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		ctx := testutil.Context(t, testutil.WaitLong)
 
+		// nolint:gocritic // "This client is operating as the owner user" is fine in this case.
 		prebuildsUser, err := client.User(ctx, prebuilds.OwnerID.String())
 		require.NoError(t, err)
 		// The 'Everyone' group always has an ID that matches the organization ID.
diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/enterprise/coderd/prebuilds"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
