Skip to content

Commit a750b19

Browse files
EmyrkEmyrk
authored
test: Use database.Now() for UTC in all tests (#6022)
Fixes a lot of comparison issues with timezones
1 parent 95ff29c commit a750b19

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎coderd/database/dbgen/generator.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
func AuditLog(t *testing.T, db database.Store, seed database.AuditLog) database.AuditLog {
2626
log, err := db.InsertAuditLog(context.Background(), database.InsertAuditLogParams{
2727
ID: takeFirst(seed.ID, uuid.New()),
28-
Time: takeFirst(seed.Time, time.Now()),
28+
Time: takeFirst(seed.Time, database.Now()),
2929
UserID: takeFirst(seed.UserID, uuid.New()),
3030
OrganizationID: takeFirst(seed.OrganizationID, uuid.New()),
3131
Ip: pqtype.Inet{
@@ -53,8 +53,8 @@ func AuditLog(t *testing.T, db database.Store, seed database.AuditLog) database.
5353
func Template(t *testing.T, db database.Store, seed database.Template) database.Template {
5454
template, err := db.InsertTemplate(context.Background(), database.InsertTemplateParams{
5555
ID: takeFirst(seed.ID, uuid.New()),
56-
CreatedAt: takeFirst(seed.CreatedAt, time.Now()),
57-
UpdatedAt: takeFirst(seed.UpdatedAt, time.Now()),
56+
CreatedAt: takeFirst(seed.CreatedAt, database.Now()),
57+
UpdatedAt: takeFirst(seed.UpdatedAt, database.Now()),
5858
OrganizationID: takeFirst(seed.OrganizationID, uuid.New()),
5959
Name: takeFirst(seed.Name, namesgenerator.GetRandomName(1)),
6060
Provisioner: takeFirst(seed.Provisioner, database.ProvisionerTypeEcho),
@@ -84,10 +84,10 @@ func APIKey(t *testing.T, db database.Store, seed database.APIKey) (key database
8484
HashedSecret: takeFirstSlice(seed.HashedSecret, hashed[:]),
8585
IPAddress: pqtype.Inet{},
8686
UserID: takeFirst(seed.UserID, uuid.New()),
87-
LastUsed: takeFirst(seed.LastUsed, time.Now()),
88-
ExpiresAt: takeFirst(seed.ExpiresAt, time.Now().Add(time.Hour)),
89-
CreatedAt: takeFirst(seed.CreatedAt, time.Now()),
90-
UpdatedAt: takeFirst(seed.UpdatedAt, time.Now()),
87+
LastUsed: takeFirst(seed.LastUsed, database.Now()),
88+
ExpiresAt: takeFirst(seed.ExpiresAt, database.Now().Add(time.Hour)),
89+
CreatedAt: takeFirst(seed.CreatedAt, database.Now()),
90+
UpdatedAt: takeFirst(seed.UpdatedAt, database.Now()),
9191
LoginType: takeFirst(seed.LoginType, database.LoginTypePassword),
9292
Scope: takeFirst(seed.Scope, database.APIKeyScopeAll),
9393
})
@@ -98,8 +98,8 @@ func APIKey(t *testing.T, db database.Store, seed database.APIKey) (key database
9898
func WorkspaceAgent(t *testing.T, db database.Store, orig database.WorkspaceAgent) database.WorkspaceAgent {
9999
workspace, err := db.InsertWorkspaceAgent(context.Background(), database.InsertWorkspaceAgentParams{
100100
ID: takeFirst(orig.ID, uuid.New()),
101-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
102-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
101+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
102+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
103103
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
104104
ResourceID: takeFirst(orig.ResourceID, uuid.New()),
105105
AuthToken: takeFirst(orig.AuthToken, uuid.New()),
@@ -140,8 +140,8 @@ func Workspace(t *testing.T, db database.Store, orig database.Workspace) databas
140140
workspace, err := db.InsertWorkspace(context.Background(), database.InsertWorkspaceParams{
141141
ID: takeFirst(orig.ID, uuid.New()),
142142
OwnerID: takeFirst(orig.OwnerID, uuid.New()),
143-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
144-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
143+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
144+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
145145
OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
146146
TemplateID: takeFirst(orig.TemplateID, uuid.New()),
147147
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
@@ -155,16 +155,16 @@ func Workspace(t *testing.T, db database.Store, orig database.Workspace) databas
155155
func WorkspaceBuild(t *testing.T, db database.Store, orig database.WorkspaceBuild) database.WorkspaceBuild {
156156
build, err := db.InsertWorkspaceBuild(context.Background(), database.InsertWorkspaceBuildParams{
157157
ID: takeFirst(orig.ID, uuid.New()),
158-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
159-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
158+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
159+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
160160
WorkspaceID: takeFirst(orig.WorkspaceID, uuid.New()),
161161
TemplateVersionID: takeFirst(orig.TemplateVersionID, uuid.New()),
162162
BuildNumber: takeFirst(orig.BuildNumber, 1),
163163
Transition: takeFirst(orig.Transition, database.WorkspaceTransitionStart),
164164
InitiatorID: takeFirst(orig.InitiatorID, uuid.New()),
165165
JobID: takeFirst(orig.JobID, uuid.New()),
166166
ProvisionerState: takeFirstSlice(orig.ProvisionerState, []byte{}),
167-
Deadline: takeFirst(orig.Deadline, time.Now().Add(time.Hour)),
167+
Deadline: takeFirst(orig.Deadline, database.Now().Add(time.Hour)),
168168
Reason: takeFirst(orig.Reason, database.BuildReasonInitiator),
169169
})
170170
require.NoError(t, err, "insert workspace build")
@@ -177,8 +177,8 @@ func User(t *testing.T, db database.Store, orig database.User) database.User {
177177
Email: takeFirst(orig.Email, namesgenerator.GetRandomName(1)),
178178
Username: takeFirst(orig.Username, namesgenerator.GetRandomName(1)),
179179
HashedPassword: takeFirstSlice(orig.HashedPassword, []byte{}),
180-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
181-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
180+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
181+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
182182
RBACRoles: takeFirstSlice(orig.RBACRoles, []string{}),
183183
LoginType: takeFirst(orig.LoginType, database.LoginTypePassword),
184184
})
@@ -189,8 +189,8 @@ func User(t *testing.T, db database.Store, orig database.User) database.User {
189189
func GitSSHKey(t *testing.T, db database.Store, orig database.GitSSHKey) database.GitSSHKey {
190190
key, err := db.InsertGitSSHKey(context.Background(), database.InsertGitSSHKeyParams{
191191
UserID: takeFirst(orig.UserID, uuid.New()),
192-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
193-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
192+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
193+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
194194
PrivateKey: takeFirst(orig.PrivateKey, ""),
195195
PublicKey: takeFirst(orig.PublicKey, ""),
196196
})
@@ -203,8 +203,8 @@ func Organization(t *testing.T, db database.Store, orig database.Organization) d
203203
ID: takeFirst(orig.ID, uuid.New()),
204204
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
205205
Description: takeFirst(orig.Description, namesgenerator.GetRandomName(1)),
206-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
207-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
206+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
207+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
208208
})
209209
require.NoError(t, err, "insert organization")
210210
return org
@@ -214,8 +214,8 @@ func OrganizationMember(t *testing.T, db database.Store, orig database.Organizat
214214
mem, err := db.InsertOrganizationMember(context.Background(), database.InsertOrganizationMemberParams{
215215
OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
216216
UserID: takeFirst(orig.UserID, uuid.New()),
217-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
218-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
217+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
218+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
219219
Roles: takeFirstSlice(orig.Roles, []string{}),
220220
})
221221
require.NoError(t, err, "insert organization")
@@ -251,8 +251,8 @@ func GroupMember(t *testing.T, db database.Store, orig database.GroupMember) dat
251251
func ProvisionerJob(t *testing.T, db database.Store, orig database.ProvisionerJob) database.ProvisionerJob {
252252
job, err := db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
253253
ID: takeFirst(orig.ID, uuid.New()),
254-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
255-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
254+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
255+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
256256
OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
257257
InitiatorID: takeFirst(orig.InitiatorID, uuid.New()),
258258
Provisioner: takeFirst(orig.Provisioner, database.ProvisionerTypeEcho),
@@ -269,7 +269,7 @@ func ProvisionerJob(t *testing.T, db database.Store, orig database.ProvisionerJo
269269
func WorkspaceApp(t *testing.T, db database.Store, orig database.WorkspaceApp) database.WorkspaceApp {
270270
resource, err := db.InsertWorkspaceApp(context.Background(), database.InsertWorkspaceAppParams{
271271
ID: takeFirst(orig.ID, uuid.New()),
272-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
272+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
273273
AgentID: takeFirst(orig.AgentID, uuid.New()),
274274
Slug: takeFirst(orig.Slug, namesgenerator.GetRandomName(1)),
275275
DisplayName: takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
@@ -297,7 +297,7 @@ func WorkspaceApp(t *testing.T, db database.Store, orig database.WorkspaceApp) d
297297
func WorkspaceResource(t *testing.T, db database.Store, orig database.WorkspaceResource) database.WorkspaceResource {
298298
resource, err := db.InsertWorkspaceResource(context.Background(), database.InsertWorkspaceResourceParams{
299299
ID: takeFirst(orig.ID, uuid.New()),
300-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
300+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
301301
JobID: takeFirst(orig.JobID, uuid.New()),
302302
Transition: takeFirst(orig.Transition, database.WorkspaceTransitionStart),
303303
Type: takeFirst(orig.Type, "fake_resource"),
@@ -329,7 +329,7 @@ func File(t *testing.T, db database.Store, orig database.File) database.File {
329329
file, err := db.InsertFile(context.Background(), database.InsertFileParams{
330330
ID: takeFirst(orig.ID, uuid.New()),
331331
Hash: takeFirst(orig.Hash, hex.EncodeToString(make([]byte, 32))),
332-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
332+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
333333
CreatedBy: takeFirst(orig.CreatedBy, uuid.New()),
334334
Mimetype: takeFirst(orig.Mimetype, "application/x-tar"),
335335
Data: takeFirstSlice(orig.Data, []byte{}),
@@ -345,7 +345,7 @@ func UserLink(t *testing.T, db database.Store, orig database.UserLink) database.
345345
LinkedID: takeFirst(orig.LinkedID),
346346
OAuthAccessToken: takeFirst(orig.OAuthAccessToken, uuid.NewString()),
347347
OAuthRefreshToken: takeFirst(orig.OAuthAccessToken, uuid.NewString()),
348-
OAuthExpiry: takeFirst(orig.OAuthExpiry, time.Now().Add(time.Hour*24)),
348+
OAuthExpiry: takeFirst(orig.OAuthExpiry, database.Now().Add(time.Hour*24)),
349349
})
350350

351351
require.NoError(t, err, "insert link")
@@ -358,9 +358,9 @@ func GitAuthLink(t *testing.T, db database.Store, orig database.GitAuthLink) dat
358358
UserID: takeFirst(orig.UserID, uuid.New()),
359359
OAuthAccessToken: takeFirst(orig.OAuthAccessToken, uuid.NewString()),
360360
OAuthRefreshToken: takeFirst(orig.OAuthAccessToken, uuid.NewString()),
361-
OAuthExpiry: takeFirst(orig.OAuthExpiry, time.Now().Add(time.Hour*24)),
362-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
363-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
361+
OAuthExpiry: takeFirst(orig.OAuthExpiry, database.Now().Add(time.Hour*24)),
362+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
363+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
364364
})
365365

366366
require.NoError(t, err, "insert git auth link")
@@ -375,8 +375,8 @@ func TemplateVersion(t *testing.T, db database.Store, orig database.TemplateVers
375375
Valid: takeFirst(orig.TemplateID.Valid, true),
376376
},
377377
OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
378-
CreatedAt: takeFirst(orig.CreatedAt, time.Now()),
379-
UpdatedAt: takeFirst(orig.UpdatedAt, time.Now()),
378+
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
379+
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
380380
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
381381
Readme: takeFirst(orig.Readme, namesgenerator.GetRandomName(1)),
382382
JobID: takeFirst(orig.JobID, uuid.New()),
@@ -390,7 +390,7 @@ func ParameterSchema(t *testing.T, db database.Store, seed database.ParameterSch
390390
scheme, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
391391
ID: takeFirst(seed.ID, uuid.New()),
392392
JobID: takeFirst(seed.JobID, uuid.New()),
393-
CreatedAt: takeFirst(seed.CreatedAt, time.Now()),
393+
CreatedAt: takeFirst(seed.CreatedAt, database.Now()),
394394
Name: takeFirst(seed.Name, namesgenerator.GetRandomName(1)),
395395
Description: takeFirst(seed.Description, namesgenerator.GetRandomName(1)),
396396
DefaultSourceScheme: takeFirst(seed.DefaultSourceScheme, database.ParameterSourceSchemeNone),
@@ -414,8 +414,8 @@ func ParameterValue(t *testing.T, db database.Store, seed database.ParameterValu
414414
scheme, err := db.InsertParameterValue(context.Background(), database.InsertParameterValueParams{
415415
ID: takeFirst(seed.ID, uuid.New()),
416416
Name: takeFirst(seed.Name, namesgenerator.GetRandomName(1)),
417-
CreatedAt: takeFirst(seed.CreatedAt, time.Now()),
418-
UpdatedAt: takeFirst(seed.UpdatedAt, time.Now()),
417+
CreatedAt: takeFirst(seed.CreatedAt, database.Now()),
418+
UpdatedAt: takeFirst(seed.UpdatedAt, database.Now()),
419419
Scope: takeFirst(seed.Scope, database.ParameterScopeWorkspace),
420420
ScopeID: takeFirst(seed.ScopeID, uuid.New()),
421421
SourceScheme: takeFirst(seed.SourceScheme, database.ParameterSourceSchemeNone),

0 commit comments

Comments
 (0)