Commitc94c470

authored

fix: pass context with authorization to agentapi (#21045)

cherry pick 20959 into release branchSigned-off-by: Callum Styan <callumstyan@gmail.com>

1 parent8430dd6 commitc94c470Copy full SHA for c94c470

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ type Options struct {`
`69`	`69`	`WorkspaceID uuid.UUID`
`70`	`70`	`OrganizationID uuid.UUID`
`71`	`71`
`72`		`-Ctx context.Context`
	`72`	`+AuthenticatedCtx context.Context`
`73`	`73`	`Log slog.Logger`
`74`	`74`	`Clock quartz.Clock`
`75`	`75`	`Database database.Store`
`@@ -220,7 +220,7 @@ func New(opts Options, workspace database.Workspace) *API {`
`220`	`220`
`221`	`221`	`// Start background cache refresh loop to handle workspace changes`
`222`	`222`	`// like prebuild claims where owner_id and other fields may be modified in the DB.`
`223`		`-goapi.startCacheRefreshLoop(opts.Ctx)`
	`223`	`+goapi.startCacheRefreshLoop(opts.AuthenticatedCtx)`
`224`	`224`
`225`	`225`	`returnapi`
`226`	`226`	`}`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -671,15 +671,15 @@ func TestBatchUpdateMetadata(t *testing.T) {`
`671`	`671`
`672`	`672`	`// Create full API with cached workspace fields (initial state)`
`673`	`673`	`api:=agentapi.New(agentapi.Options{`
`674`		`-Ctx:ctxWithActor,`
`675`		`-AgentID:agentID,`
`676`		`-WorkspaceID:workspaceID,`
`677`		`-OwnerID:ownerID,`
`678`		`-OrganizationID:orgID,`
`679`		`-Database:dbauthz.New(dbM,auth,testutil.Logger(t),accessControlStore),`
`680`		`-Log:testutil.Logger(t),`
`681`		`-Clock:mClock,`
`682`		`-Pubsub:pub,`
	`674`	`+AuthenticatedCtx:ctxWithActor,`
	`675`	`+AgentID:agentID,`
	`676`	`+WorkspaceID:workspaceID,`
	`677`	`+OwnerID:ownerID,`
	`678`	`+OrganizationID:orgID,`
	`679`	`+Database:dbauthz.New(dbM,auth,testutil.Logger(t),accessControlStore),`
	`680`	`+Log:testutil.Logger(t),`
	`681`	`+Clock:mClock,`
	`682`	`+Pubsub:pub,`
`683`	`683`	`},initialWorkspace)// Cache is initialized with 9am schedule and "my-workspace" name`
`684`	`684`
`685`	`685`	`// Wait for ticker to be set up and release it so it can fire`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func (api API) workspaceAgentRPC(rw http.ResponseWriter, r http.Request) {`
`132`	`132`	`WorkspaceID:workspace.ID,`
`133`	`133`	`OrganizationID:workspace.OrganizationID,`
`134`	`134`
`135`		`-Ctx:api.ctx,`
	`135`	`+AuthenticatedCtx:ctx,`
`136`	`136`	`Log:logger,`
`137`	`137`	`Clock:api.Clock,`
`138`	`138`	`Database:api.Database,`

Comments

(0)