8000 use v4 compliant uuid, fix tests · coder/coder@e5dfd1c · GitHub
[go: up one dir, main page]
Skip to content

Commit e5dfd1c

Browse files
AbhineetJainAbhineetJain
committed
use v4 compliant uuid, fix tests
1 parent 345d116 commit e5dfd1c

File tree

7 files changed

+30
-16
lines changed

7 files changed

+30
-16
lines changed

‎coderd/database/databasefake/databasefake.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func New() database.Store {
2323
HashedPassword: make([]byte, 0),
2424
CreatedAt: database.Now(),
2525
UpdatedAt: database.Now(),
26+
Status: database.UserStatusActive,
2627
RBACRoles: make([]string, 0),
2728
}
2829
return &fakeQuerier{

‎coderd/database/db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"golang.org/x/xerrors"
1818
)
1919

20-
var SystemUserID uuid.UUID = uuid.MustParse("11111111-1111-1111-1111-111111111111")
20+
var SystemUserID uuid.UUID = uuid.MustParse("c0de2b07-0000-4000-A000-000000000000")
2121

2222
// Store contains all queryable database functions.
2323
// It extends the generated interface to add transaction support.

‎coderd/database/migrations/000024_add_system_user.down.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
33
DELETE FROM
44
users
55
WHERE
6-
id = '11111111-1111-1111-1111-111111111111';
6+
id = 'c0de2b07-0000-4000-A000-000000000000';

‎coderd/database/migrations/000024_add_system_user.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ INSERT INTO
99
rbac_roles
1010
)
1111
VALUES
12-
('11111111-1111-1111-1111-111111111111', 'system@coder.com', 'system', '{}', NOW(), NOW(), '{}');
12+
('c0de2b07-0000-4000-A000-000000000000', 'system@coder.com', 'system', '', NOW(), NOW(), '{}');

‎coderd/database/queries.sql.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/users.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SELECT
2929
FROM
3030
users
3131
WHERE
32-
id != '11111111-1111-1111-1111-111111111111';
32+
id != 'c0de2b07-0000-4000-A000-000000000000';
3333

3434
-- name: InsertUser :one
3535
INSERT INTO
@@ -111,7 +111,7 @@ WHERE
111111
AND CASE
112112
WHEN @include_system_user :: boolean THEN true
113113
ELSE (
114-
id != '11111111-1111-1111-1111-111111111111'
114+
id != 'c0de2b07-0000-4000-A000-000000000000'
115115
)
116116
END
117117
-- Filter by status

‎coderd/users_test.go

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,31 @@ import (
2222
)
2323

2424
func TestSystemUser(t *testing.T) {
25-
if !coderdtest.UseSQL() {
26-
t.Skip("This test asserts that the system user is equivalent in SQL and the fake database.")
27-
}
28-
2925
t.Parallel()
26+
t.Run("SQLMatchesFake", func(t *testing.T) {
27+
if !coderdtest.UseSQL() {
28+
t.Skip("This test asserts that the system user is equivalent in SQL and the fake database.")
29+
}
30+
31+
t.Parallel()
3032

31-
_, opts := coderdtest.NewWithAPI(t, nil)
32-
fake := databasefake.New()
33+
_, opts := coderdtest.NewWithAPI(t, nil)
34+
fake := databasefake.New()
3335

34-
fakeUser, _ := fake.GetUserByID(context.Background(), database.SystemUserID)
35-
sqlUser, _ := opts.Database.GetUserByID(context.Background(), database.SystemUserID)
36-
require.Equal(t, fakeUser, sqlUser)
36+
fakeUser, _ := fake.GetUserByID(context.Background(), database.SystemUserID)
37+
sqlUser, _ := opts.Database.GetUserByID(context.Background(), database.SystemUserID)
38+
39+
// These fields are different as they use the actual timestamps at creation
40+
fakeUser.CreatedAt, fakeUser.UpdatedAt = time.Time{}, time.Time{}
41+
sqlUser.CreatedAt, sqlUser.UpdatedAt = time.Time{}, time.Time{}
42+
43+
require.Equal(t, fakeUser, sqlUser)
44+
})
45+
t.Run("ValidUUID", func(t *testing.T) {
46+
t.Parallel()
47+
require.Equal(t, uuid.Version(4), database.SystemUserID.Version())
48+
require.Equal(t, uuid.RFC4122, database.SystemUserID.Variant())
49+
})
3750
}
3851

3952
func TestFirstUser(t *testing.T) {

0 commit comments

Comments
 (0)
0