Skip to content

Commit 8d7a763

Browse files
mafredrimafredri
committed
make gen for db
1 parent 336c7b8 commit 8d7a763

File tree

11 files changed

+261
-332
lines changed

11 files changed

+261
-332
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3439,13 +3439,6 @@ func (q *querier) InsertWorkspaceApp(ctx context.Context, arg database.InsertWor
34393439
return q.db.InsertWorkspaceApp(ctx, arg)
34403440
}
34413441

3442-
func (q *querier) InsertWorkspaceAppAuditSession(ctx context.Context, arg database.InsertWorkspaceAppAuditSessionParams) (uuid.UUID, error) {
3443-
if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
3444-
return uuid.Nil, err
3445-
}
3446-
return q.db.InsertWorkspaceAppAuditSession(ctx, arg)
3447-
}
3448-
34493442
func (q *querier) InsertWorkspaceAppStats(ctx context.Context, arg database.InsertWorkspaceAppStatsParams) error {
34503443
if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
34513444
return err
@@ -4276,13 +4269,6 @@ func (q *querier) UpdateWorkspaceAgentStartupByID(ctx context.Context, arg datab
42764269
return q.db.UpdateWorkspaceAgentStartupByID(ctx, arg)
42774270
}
42784271

4279-
func (q *querier) UpdateWorkspaceAppAuditSession(ctx context.Context, arg database.UpdateWorkspaceAppAuditSessionParams) ([]uuid.UUID, error) {
4280-
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
4281-
return nil, err
4282-
}
4283-
return q.db.UpdateWorkspaceAppAuditSession(ctx, arg)
4284-
}
4285-
42864272
func (q *querier) UpdateWorkspaceAppHealthByID(ctx context.Context, arg database.UpdateWorkspaceAppHealthByIDParams) error {
42874273
// TODO: This is a workspace agent operation. Should users be able to query this?
42884274
workspace, err := q.db.GetWorkspaceByWorkspaceAppID(ctx, arg.ID)
@@ -4621,6 +4607,13 @@ func (q *querier) UpsertWorkspaceAgentPortShare(ctx context.Context, arg databas
46214607
return q.db.UpsertWorkspaceAgentPortShare(ctx, arg)
46224608
}
46234609

4610+
func (q *querier) UpsertWorkspaceAppAuditSession(ctx context.Context, arg database.UpsertWorkspaceAppAuditSessionParams) (time.Time, error) {
4611+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
4612+
return time.Time{}, err
4613+
}
4614+
return q.db.UpsertWorkspaceAppAuditSession(ctx, arg)
4615+
}
4616+
46244617
func (q *querier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, _ rbac.PreparedAuthorized) ([]database.Template, error) {
46254618
// TODO Delete this function, all GetTemplates should be authorized. For now just call getTemplates on the authz querier.
46264619
return q.GetTemplatesWithFilter(ctx, arg)

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4039,13 +4039,13 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40394039
s.Run("InsertWorkspaceAppStats", s.Subtest(func(db database.Store, check *expects) {
40404040
check.Args(database.InsertWorkspaceAppStatsParams{}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
40414041
}))
4042-
s.Run("InsertWorkspaceAppAuditSession", s.Subtest(func(db database.Store, check *expects) {
4042+
s.Run("UpsertWorkspaceAppAuditSession", s.Subtest(func(db database.Store, check *expects) {
40434043
u := dbgen.User(s.T(), db, database.User{})
40444044
pj := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40454045
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: pj.ID})
40464046
agent := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
40474047
app := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: agent.ID})
4048-
check.Args(database.InsertWorkspaceAppAuditSessionParams{
4048+
check.Args(database.UpsertWorkspaceAppAuditSessionParams{
40494049
AgentID: agent.ID,
40504050
AppID: uuid.NullUUID{UUID: app.ID, Valid: true},
40514051
UserID: uuid.NullUUID{UUID: u.ID, Valid: true},

‎coderd/database/dbmem/dbmem.go

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9251,30 +9251,6 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
92519251
return workspaceApp, nil
92529252
}
92539253

9254-
func (q *FakeQuerier) InsertWorkspaceAppAuditSession(_ context.Context, arg database.InsertWorkspaceAppAuditSessionParams) (uuid.UUID, error) {
9255-
err := validateDatabaseType(arg)
9256-
if err != nil {
9257-
return uuid.Nil, err
9258-
}
9259-
9260-
q.mutex.Lock()
9261-
defer q.mutex.Unlock()
9262-
9263-
id := uuid.New()
9264-
q.workspaceAppAuditSessions = append(q.workspaceAppAuditSessions, database.WorkspaceAppAuditSession{
9265-
ID: id,
9266-
AgentID: arg.AgentID,
9267-
AppID: arg.AppID,
9268-
UserID: arg.UserID,
9269-
Ip: arg.Ip,
9270-
SlugOrPort: arg.SlugOrPort,
9271-
StartedAt: arg.StartedAt,
9272-
UpdatedAt: arg.UpdatedAt,
9273-
})
9274-
9275-
return id, nil
9276-
}
9277-
92789254
func (q *FakeQuerier) InsertWorkspaceAppStats(_ context.Context, arg database.InsertWorkspaceAppStatsParams) error {
92799255
err := validateDatabaseType(arg)
92809256
if err != nil {
@@ -11021,42 +10997,6 @@ func (q *FakeQuerier) UpdateWorkspaceAgentStartupByID(_ context.Context, arg dat
1102110997
return sql.ErrNoRows
1102210998
}
1102310999

11024-
func (q *FakeQuerier) UpdateWorkspaceAppAuditSession(_ context.Context, arg database.UpdateWorkspaceAppAuditSessionParams) ([]uuid.UUID, error) {
11025-
err := validateDatabaseType(arg)
11026-
if err != nil {
11027-
return nil, err
11028-
}
11029-
11030-
q.mutex.Lock()
11031-
defer q.mutex.Unlock()
11032-
11033-
var updated []uuid.UUID
11034-
for i, s := range q.workspaceAppAuditSessions {
11035-
if s.AgentID != arg.AgentID {
11036-
continue
11037-
}
11038-
if s.AppID != arg.AppID {
11039-
continue
11040-
}
11041-
if s.UserID != arg.UserID {
11042-
continue
11043-
}
11044-
if s.Ip.IPNet.String() != arg.Ip.IPNet.String() {
11045-
continue
11046-
}
11047-
if s.SlugOrPort != arg.SlugOrPort {
11048-
continue
11049-
}
11050-
staleTime := dbtime.Now().Add(-(time.Duration(arg.StaleIntervalMS) * time.Millisecond))
11051-
if !s.UpdatedAt.After(staleTime) {
11052-
continue
11053-
}
11054-
q.workspaceAppAuditSessions[i].UpdatedAt = arg.UpdatedAt
11055-
updated = append(updated, s.ID)
11056-
}
11057-
return updated, nil
11058-
}
11059-
1106011000
func (q *FakeQuerier) UpdateWorkspaceAppHealthByID(_ context.Context, arg database.UpdateWorkspaceAppHealthByIDParams) error {
1106111001
if err := validateDatabaseType(arg); err != nil {
1106211002
return err
@@ -12278,6 +12218,63 @@ func (q *FakeQuerier) UpsertWorkspaceAgentPortShare(_ context.Context, arg datab
1227812218
return psl, nil
1227912219
}
1228012220

12221+
func (q *FakeQuerier) UpsertWorkspaceAppAuditSession(ctx context.Context, arg database.UpsertWorkspaceAppAuditSessionParams) (time.Time, error) {
12222+
err := validateDatabaseType(arg)
12223+
if err != nil {
12224+
return time.Time{}, err
12225+
}
12226+
12227+
q.mutex.Lock()
12228+
defer q.mutex.Unlock()
12229+
12230+
for i, s := range q.workspaceAppAuditSessions {
12231+
if s.AgentID != arg.AgentID {
12232+
continue
12233+
}
12234+
if s.AppID != arg.AppID {
12235+
continue
12236+
}
12237+
if s.UserID != arg.UserID {
12238+
continue
12239+
}
12240+
if s.Ip.IPNet.String() != arg.Ip.IPNet.String() {
12241+
continue
12242+
}
12243+
if s.UserAgent != arg.UserAgent {
12244+
continue
12245+
}
12246+
if s.SlugOrPort != arg.SlugOrPort {
12247+
continue
12248+
}
12249+
if s.StatusCode != arg.StatusCode {
12250+
continue
12251+
}
12252+
12253+
staleTime := dbtime.Now().Add(-(time.Duration(arg.StaleIntervalMS) * time.Millisecond))
12254+
fresh := s.UpdatedAt.After(staleTime)
12255+
12256+
q.workspaceAppAuditSessions[i].UpdatedAt = arg.UpdatedAt
12257+
if !fresh {
12258+
q.workspaceAppAuditSessions[i].StartedAt = arg.StartedAt
12259+
return arg.StartedAt, nil
12260+
}
12261+
return s.StartedAt, nil
12262+
}
12263+
12264+
q.workspaceAppAuditSessions = append(q.workspaceAppAuditSessions, database.WorkspaceAppAuditSession{
12265+
AgentID: arg.AgentID,
12266+
AppID: arg.AppID,
12267+
UserID: arg.UserID,
12268+
Ip: arg.Ip,
12269+
UserAgent: arg.UserAgent,
12270+
SlugOrPort: arg.SlugOrPort,
12271+
StatusCode: arg.StatusCode,
12272+
StartedAt: arg.StartedAt,
12273+
UpdatedAt: arg.UpdatedAt,
12274+
})
12275+
return arg.StartedAt, nil
12276+
}
12277+
1228112278
func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.GetTemplatesWithFilterParams, prepared rbac.PreparedAuthorized) ([]database.Template, error) {
1228212279
if err := validateDatabaseType(arg); err != nil {
1228312280
return nil, err

‎coderd/database/dbmetrics/querymetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/dump.sql

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

0 commit comments

Comments
 (0)