add support for prebuilds user to dbmem

SasSwart · SasSwart · commit f9e9d11145d6 · 2025-03-19T09:46:35.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -23,6 +23,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/coderd/notifications/types"
+	"github.com/coder/coder/v2/coderd/prebuilds"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -153,6 +154,21 @@ func New() database.Store {
 		panic(xerrors.Errorf("failed to create psk provisioner key: %w", err))
 	}
 
+	q.mutex.Lock()
+	q.data.users = append(q.data.users, database.User{
+		ID:             prebuilds.SystemUserID,
+		Email:          "prebuilds@coder.com",
+		Username:       "prebuilds",
+		CreatedAt:      dbtime.Now(),
+		UpdatedAt:      dbtime.Now(),
+		Status:         "active",
+		LoginType:      "none",
+		HashedPassword: []byte{},
+		IsSystem:       true,
+		Deleted:        false,
+	})
+	q.mutex.Unlock()
+
 	return q
 }
 
@@ -439,6 +455,7 @@ func convertUsers(users []database.User, count int64) []database.GetUsersRow {
 			Deleted:        u.Deleted,
 			LastSeenAt:     u.LastSeenAt,
 			Count:          count,
+			IsSystem:       u.IsSystem,
 		}
 	}
 
@@ -6608,6 +6625,12 @@ func (q *FakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
 		users = users[:params.LimitOpt]
 	}
 
+	if !params.IncludeSystem {
+		users = slices.DeleteFunc(users, func(u database.User) bool {
+			return u.IsSystem
+		})
+	}
+
 	return convertUsers(users, int64(beforePageCount)), nil
 }
 
@@ -8888,6 +8911,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 		Status:         status,
 		RBACRoles:      arg.RBACRoles,
 		LoginType:      arg.LoginType,
+		IsSystem:       false,
 	}
 	q.users = append(q.users, user)
 	sort.Slice(q.users, func(i, j int) bool {
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -1367,9 +1367,6 @@ func TestUserLastSeenFilter(t *testing.T) {
 
 func TestGetUsers_IncludeSystem(t *testing.T) {
 	t.Parallel()
-	if !dbtestutil.WillUsePostgres() {
-		t.Skip("test only supports postgres")
-	}
 
 	tests := []struct {
 		name           string
@@ -1395,12 +1392,10 @@ func TestGetUsers_IncludeSystem(t *testing.T) {
 
 			ctx := testutil.Context(t, testutil.WaitLong)
 
-			sqlDB := testSQLDB(t)
-			// Given: a system user introduced by migration coderd/database/migrations/00030*_system_user.up.sql
-			err := migrations.Up(sqlDB)
-			require.NoError(t, err, "migrations")
-
-			db := database.New(sqlDB)
+			// Given: a system user
+			// postgres: introduced by migration coderd/database/migrations/00030*_system_user.up.sql
+			// dbmem: created in dbmem/dbmem.go
+			db, _ := dbtestutil.NewDB(t)
 			other := dbgen.User(t, db, database.User{})
 			users, err := db.GetUsers(ctx, database.GetUsersParams{
 				IncludeSystem: tt.includeSystem,
@@ -1417,7 +1412,7 @@ func TestGetUsers_IncludeSystem(t *testing.T) {
 					require.Equal(t, prebuilds.SystemUserID, u.ID)
 				} else {
 					foundRegularUser = true
-					require.Equal(t, other.ID, u.ID)
+					require.Equalf(t, other.ID.String(), u.ID.String(), "found unexpected regular user")
 				}
 			}
 
