refactor: use ContextInject helper to reduce code duplication

Callum Styan · claude · Callum Styan · commit 4bc6a886624a · 2025-12-10T00:32:51.000Z
Replaced direct WithWorkspaceRBAC calls with the existing CachedWorkspaceFields.ContextInject() helper in connectionlog.go, metadata.go, and stats.go. This reduces code duplication and ensures consistent error handling when injecting workspace RBAC into context for the dbauthz fast path. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
diff --git a/coderd/agentapi/connectionlog.go b/coderd/agentapi/connectionlog.go
@@ -14,7 +14,6 @@ import (
 	"github.com/coder/coder/v2/coderd/connectionlog"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
-	"github.com/coder/coder/v2/coderd/database/dbauthz"
 )
 
 type ConnLogAPI struct {
@@ -55,16 +54,16 @@ func (a *ConnLogAPI) ReportConnection(ctx context.Context, req *agentproto.Repor
 
 	// Inject RBAC object into context for dbauthz fast path, avoid having to
 	// call GetWorkspaceByAgentID on every metadata update.
-	rbacCtx := ctx
+	rbacCtx, err := a.Workspace.ContextInject(ctx)
+	if err != nil {
+		// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
+		//nolint:gocritic
+		a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
+		rbacCtx = ctx
+	}
 	var ws database.WorkspaceIdentity
 	if dbws, ok := a.Workspace.AsWorkspaceIdentity(); ok {
 		ws = dbws
-		rbacCtx, err = dbauthz.WithWorkspaceRBAC(ctx, dbws.RBACObject())
-		if err != nil {
-			// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
-			//nolint:gocritic
-			a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
-		}
 	}
 
 	// Fetch contextual data for this connection log event.
diff --git a/coderd/agentapi/metadata.go b/coderd/agentapi/metadata.go
@@ -12,7 +12,6 @@ import (
 	"cdr.dev/slog"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
 )
@@ -49,15 +48,12 @@ func (a *MetadataAPI) BatchUpdateMetadata(ctx context.Context, req *agentproto.B
 
 	// Inject RBAC object into context for dbauthz fast path, avoid having to
 	// call GetWorkspaceByAgentID on every metadata update.
-	var err error
-	rbacCtx := ctx
-	if dbws, ok := a.Workspace.AsWorkspaceIdentity(); ok {
-		rbacCtx, err = dbauthz.WithWorkspaceRBAC(ctx, dbws.RBACObject())
-		if err != nil {
-			// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
-			//nolint:gocritic
-			a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
-		}
+	rbacCtx, err := a.Workspace.ContextInject(ctx)
+	if err != nil {
+		// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
+		//nolint:gocritic
+		a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
+		rbacCtx = ctx
 	}
 
 	workspaceAgent, err := a.AgentFn(rbacCtx)
diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go
@@ -10,7 +10,6 @@ import (
 	"cdr.dev/slog"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/workspacestats"
 	"github.com/coder/coder/v2/codersdk"
@@ -46,16 +45,12 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 
 	// Inject RBAC object into context for dbauthz fast path, avoid having to
 	// call GetWorkspaceAgentByID on every stats update.
-
-	rbacCtx := ctx
-	if dbws, ok := a.Workspace.AsWorkspaceIdentity(); ok {
-		var err error
-		rbacCtx, err = dbauthz.WithWorkspaceRBAC(ctx, dbws.RBACObject())
-		if err != nil {
-			// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
-			//nolint:gocritic
-			a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
-		}
+	rbacCtx, err := a.Workspace.ContextInject(ctx)
+	if err != nil {
+		// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
+		//nolint:gocritic
+		a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
+		rbacCtx = ctx
 	}
 
 	workspaceAgent, err := a.AgentFn(rbacCtx)
