particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

internal/worker: use TenantChannelMiddleware

Browse source
This commit is contained in:
Sanne Raymaekers 2023-06-23 00:37:01 +02:00
parent 06038b2af6
commit 9594156baf
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/cloudapi/v2/v2_multi_tenancy_test.go
View file

@ -176,6 +176,7 @@ func runNextJob(t *testing.T, jobs []uuid.UUID, workerHandler http.Handler, orgI
Method: http.MethodPatch, Method: http.MethodPatch,
Path: job.Location, Path: job.Location,
RequestBody: test.JSONRequestBody(`{"result": {"job_result":{}}}`), RequestBody: test.JSONRequestBody(`{"result": {"job_result":{}}}`),
Context: reqContext(orgID),
ExpectedStatus: http.StatusOK, ExpectedStatus: http.StatusOK,
}.Do(t) }.Do(t)
} }

9
internal/worker/server.go
View file

@ -100,8 +100,13 @@ func (s *Server) Handler() http.Handler {
server: s, server: s,
} }
statusMW := prometheus.StatusMiddleware(prometheus.WorkerSubsystem) mws := []echo.MiddlewareFunc{
api.RegisterHandlers(e.Group(api.BasePath, statusMW), &handler) prometheus.StatusMiddleware(prometheus.WorkerSubsystem),
}
if s.config.JWTEnabled {
mws = append(mws, auth.TenantChannelMiddleware(s.config.TenantProviderFields, api.HTTPError(api.ErrorTenantNotFound)))
}
api.RegisterHandlers(e.Group(api.BasePath, mws...), &handler)
return e return e
} }