Pass agent ctx into activityBumpWorkspace

Emyrk · Emyrk · commit f1f05cc67b6c · 2023-02-07T09:29:26.000-06:00
diff --git a/coderd/activitybump.go b/coderd/activitybump.go
@@ -10,19 +10,15 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/coderd/authzquery"
 	"github.com/coder/coder/coderd/database"
-	"github.com/coder/coder/coderd/rbac"
 )
 
 // activityBumpWorkspace automatically bumps the workspace's auto-off timer
 // if it is set to expire soon.
-func activityBumpWorkspace(log slog.Logger, db database.Store, workspaceID uuid.UUID) {
+func activityBumpWorkspace(ctx context.Context, log slog.Logger, db database.Store, workspaceID uuid.UUID) {
 	// We set a short timeout so if the app is under load, these
 	// low priority operations fail first.
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
-	// We always want to use the **system** authz context for this.
-	ctx = authzquery.WithAuthorizeSystemContext(ctx, rbac.RolesAdminSystem())
+	ctx, cancel := context.WithTimeout(ctx, time.Second*15)
 	defer cancel()
 
 	err := db.InTx(func(s database.Store) error {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -897,7 +897,7 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 		slog.F("payload", req),
 	)
 
-	activityBumpWorkspace(api.Logger.Named("activity_bump"), api.Database, workspace.ID)
+	activityBumpWorkspace(ctx, api.Logger.Named("activity_bump"), api.Database, workspace.ID)
 
 	payload, err := json.Marshal(req)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ func (api API) workspaceAgentReportStats(rw http.ResponseWriter, r http.Reques`
`897`	`897`	`slog.F("payload", req),`
`898`	`898`	`)`
`899`	`899`
`900`		`- activityBumpWorkspace(api.Logger.Named("activity_bump"), api.Database, workspace.ID)`
	`900`	`+ activityBumpWorkspace(ctx, api.Logger.Named("activity_bump"), api.Database, workspace.ID)`
`901`	`901`
`902`	`902`	`payload, err := json.Marshal(req)`
`903`	`903`	`if err != nil {`