synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(coderd/database): split Time and Now into dbtime package (#9482)

Browse Source 
Ref: #9380
This commit is contained in:
Mathias Fredriksson
2023-09-01 19:50:12 +03:00
committed by GitHub
parent 702b064cac
commit 19d7da3d24
89 changed files with 466 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coderd/prometheusmetrics/prometheusmetrics_test.go
View File

@ -13,6 +13,7 @@ import (
"github.com/coder/coder/v2/coderd/batchstats"
"github.com/coder/coder/v2/coderd/database/dbtestutil"
"github.com/coder/coder/v2/coderd/database/dbtime"
"github.com/google/uuid"
"github.com/prometheus/client_golang/prometheus"
@ -55,7 +56,7 @@ func TestActiveUsers(t *testing.T) {
Database: func(t *testing.T) database.Store {
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
LastUsed: dbtime.Now(),
})
return db
},
@ -66,13 +67,13 @@ func TestActiveUsers(t *testing.T) {
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
LastUsed: dbtime.Now(),
})
// Because this API key hasn't been used in the past hour, this shouldn't
// add to the user count.
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now().Add(-2 * time.Hour),
LastUsed: dbtime.Now().Add(-2 * time.Hour),
})
return db
},
@ -82,10 +83,10 @@ func TestActiveUsers(t *testing.T) {
Database: func(t *testing.T) database.Store {
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
LastUsed: dbtime.Now(),
})
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
LastUsed: dbtime.Now(),
})
return db
},
@ -115,8 +116,8 @@ func TestWorkspaces(t *testing.T) {
insertRunning := func(db database.Store) database.ProvisionerJob {
job, err := db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
ID: uuid.New(),
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
CreatedAt: dbtime.Now(),
UpdatedAt: dbtime.Now(),
Provisioner: database.ProvisionerTypeEcho,
StorageMethod: database.ProvisionerStorageMethodFile,
Type: database.ProvisionerJobTypeWorkspaceBuild,
@ -134,7 +135,7 @@ func TestWorkspaces(t *testing.T) {
// This marks the job as started.
_, err = db.AcquireProvisionerJob(context.Background(), database.AcquireProvisionerJobParams{
StartedAt: sql.NullTime{
Time: database.Now(),
Time: dbtime.Now(),
Valid: true,
},
Types: []database.ProvisionerType{database.ProvisionerTypeEcho},
@ -148,7 +149,7 @@ func TestWorkspaces(t *testing.T) {
err := db.UpdateProvisionerJobWithCancelByID(context.Background(), database.UpdateProvisionerJobWithCancelByIDParams{
ID: job.ID,
CanceledAt: sql.NullTime{
Time: database.Now(),
Time: dbtime.Now(),
Valid: true,
},
})
@ -156,7 +157,7 @@ func TestWorkspaces(t *testing.T) {
err = db.UpdateProvisionerJobWithCompleteByID(context.Background(), database.UpdateProvisionerJobWithCompleteByIDParams{
ID: job.ID,
CompletedAt: sql.NullTime{
Time: database.Now(),
Time: dbtime.Now(),
Valid: true,
},
})
@ -168,7 +169,7 @@ func TestWorkspaces(t *testing.T) {
err := db.UpdateProvisionerJobWithCompleteByID(context.Background(), database.UpdateProvisionerJobWithCompleteByIDParams{
ID: job.ID,
CompletedAt: sql.NullTime{
Time: database.Now(),
Time: dbtime.Now(),
Valid: true,
},
Error: sql.NullString{
@ -184,7 +185,7 @@ func TestWorkspaces(t *testing.T) {
err := db.UpdateProvisionerJobWithCompleteByID(context.Background(), database.UpdateProvisionerJobWithCompleteByIDParams{
ID: job.ID,
CompletedAt: sql.NullTime{
Time: database.Now(),
Time: dbtime.Now(),
Valid: true,
},
})