fix

mtojek · mtojek · commit 0bf474809e05 · 2024-09-11T14:09:38.000+02:00
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1144,11 +1144,11 @@ func (q *querier) DeleteOldProvisionerDaemons(ctx context.Context) error {
 	return q.db.DeleteOldProvisionerDaemons(ctx)
 }
 
-func (q *querier) DeleteOldReportGeneratorLogs(ctx context.Context, frequencyDays database.DeleteOldReportGeneratorLogsParams) error {
+func (q *querier) DeleteOldReportGeneratorLogs(ctx context.Context, arg database.DeleteOldReportGeneratorLogsParams) error {
 	if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceSystem); err != nil {
 		return err
 	}
-	return q.db.DeleteOldReportGeneratorLogs(ctx, frequencyDays)
+	return q.db.DeleteOldReportGeneratorLogs(ctx, arg)
 }
 
 func (q *querier) DeleteOldWorkspaceAgentLogs(ctx context.Context, threshold time.Time) error {
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -2712,6 +2712,34 @@ func (s *MethodTestSuite) TestSystemFunctions() {
 			Value: "value",
 		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 	}))
+	s.Run("DeleteOldReportGeneratorLogs", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.DeleteOldReportGeneratorLogsParams{
+			FrequencyDays:          1,
+			NotificationTemplateID: uuid.New(),
+		}).Asserts(rbac.ResourceSystem, policy.ActionDelete)
+	}))
+	s.Run("GetFailedWorkspaceBuildsByTemplateID", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.GetFailedWorkspaceBuildsByTemplateIDParams{
+			TemplateID: uuid.New(),
+			Since:      dbtime.Now(),
+		}).Asserts(rbac.ResourceSystem, policy.ActionRead)
+	}))
+	s.Run("GetReportGeneratorLogByUserAndTemplate", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.GetReportGeneratorLogByUserAndTemplateParams{
+			UserID:                 uuid.New(),
+			NotificationTemplateID: uuid.New(),
+		}).Asserts(rbac.ResourceSystem, policy.ActionRead)
+	}))
+	s.Run("GetWorkspaceBuildStatsByTemplates", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(1).Asserts(rbac.ResourceSystem, policy.ActionRead)
+	}))
+	s.Run("UpsertReportGeneratorLog", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.UpsertReportGeneratorLogParams{
+			UserID:                 uuid.New(),
+			NotificationTemplateID: uuid.New(),
+			LastGeneratedAt:        dbtime.Now(),
+		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
+	}))
 }
 
 func (s *MethodTestSuite) TestNotifications() {
diff --git a/coderd/database/migrations/migrate_test.go b/coderd/database/migrations/migrate_test.go
@@ -268,6 +268,7 @@ func TestMigrateUpWithFixtures(t *testing.T) {
 		"template_version_variables",
 		"dbcrypt_keys", // having zero rows is a valid state for this table
 		"template_version_workspace_tags",
+		"report_generator_logs",
 	}
 	s := &tableStats{s: make(map[string]int)}
 

Original file line number	Diff line number	Diff line change
`@@ -1144,11 +1144,11 @@ func (q *querier) DeleteOldProvisionerDaemons(ctx context.Context) error {`
`1144`	`1144`	`return q.db.DeleteOldProvisionerDaemons(ctx)`
`1145`	`1145`	`}`
`1146`	`1146`
`1147`		`-func (q *querier) DeleteOldReportGeneratorLogs(ctx context.Context, frequencyDays database.DeleteOldReportGeneratorLogsParams) error {`
	`1147`	`+func (q *querier) DeleteOldReportGeneratorLogs(ctx context.Context, arg database.DeleteOldReportGeneratorLogsParams) error {`
`1148`	`1148`	`if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceSystem); err != nil {`
`1149`	`1149`	`return err`
`1150`	`1150`	`}`
`1151`		`- return q.db.DeleteOldReportGeneratorLogs(ctx, frequencyDays)`
	`1151`	`+ return q.db.DeleteOldReportGeneratorLogs(ctx, arg)`
`1152`	`1152`	`}`
`1153`	`1153`
`1154`	`1154`	`func (q *querier) DeleteOldWorkspaceAgentLogs(ctx context.Context, threshold time.Time) error {`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,7 @@ func TestMigrateUpWithFixtures(t *testing.T) {`
`268`	`268`	`"template_version_variables",`
`269`	`269`	`"dbcrypt_keys", // having zero rows is a valid state for this table`
`270`	`270`	`"template_version_workspace_tags",`
	`271`	`+ "report_generator_logs",`
`271`	`272`	`}`
`272`	`273`	`s := &tableStats{s: make(map[string]int)}`
`273`	`274`