remove usages of some backend-common helpers
Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
@@ -69,6 +69,7 @@
|
||||
"zod-to-json-schema": "^3.20.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@backstage/backend-defaults": "workspace:^",
|
||||
"@backstage/backend-test-utils": "workspace:^",
|
||||
"@backstage/cli": "workspace:^",
|
||||
"@types/supertest": "^2.0.8",
|
||||
|
||||
@@ -29,6 +29,8 @@ import {
|
||||
PermissionIntegrationRouterOptions,
|
||||
} from './createPermissionIntegrationRouter';
|
||||
import { createPermissionRule } from './createPermissionRule';
|
||||
import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
|
||||
import { mockServices } from '@backstage/backend-test-utils';
|
||||
|
||||
const testPermission: Permission = createPermission({
|
||||
name: 'test.permission',
|
||||
@@ -109,6 +111,11 @@ const mockedOptionResources: PermissionIntegrationRouterOptions = {
|
||||
],
|
||||
};
|
||||
|
||||
const middleware = MiddlewareFactory.create({
|
||||
logger: mockServices.logger.mock(),
|
||||
config: mockServices.rootConfig(),
|
||||
});
|
||||
|
||||
const createApp = (
|
||||
mockedGetResources:
|
||||
| typeof defaultMockedGetResources1 = defaultMockedGetResources1,
|
||||
@@ -122,7 +129,7 @@ const createApp = (
|
||||
})
|
||||
: createPermissionIntegrationRouter({ permissions: [testPermission] });
|
||||
|
||||
return express().use(router);
|
||||
return express().use(router.use(middleware.error()));
|
||||
};
|
||||
|
||||
describe('createPermissionIntegrationRouter', () => {
|
||||
@@ -453,7 +460,9 @@ describe('createPermissionIntegrationRouter', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
const app = express().use(
|
||||
createPermissionIntegrationRouter(mockedOptionResources),
|
||||
createPermissionIntegrationRouter(mockedOptionResources).use(
|
||||
middleware.error(),
|
||||
),
|
||||
);
|
||||
|
||||
response = await request(app)
|
||||
@@ -765,7 +774,7 @@ describe('createPermissionIntegrationRouter', () => {
|
||||
resourceType: 'test-resource',
|
||||
permissions: [testPermission],
|
||||
rules: [testRule1, testRule2],
|
||||
}),
|
||||
}).use(middleware.error()),
|
||||
),
|
||||
)
|
||||
.post('/.well-known/backstage/permissions/apply-conditions')
|
||||
|
||||
@@ -19,7 +19,6 @@ import Router from 'express-promise-router';
|
||||
import { z } from 'zod';
|
||||
import zodToJsonSchema from 'zod-to-json-schema';
|
||||
import { InputError } from '@backstage/errors';
|
||||
import { errorHandler } from '@backstage/backend-common';
|
||||
import {
|
||||
AuthorizeResult,
|
||||
DefinitivePolicyDecision,
|
||||
@@ -483,9 +482,6 @@ export function createPermissionIntegrationRouter<
|
||||
},
|
||||
);
|
||||
|
||||
// TODO(belugas): Remove this when dropping support to the legacy backend system because setting the error handler manually is no logger required in the new system.
|
||||
router.use(errorHandler());
|
||||
|
||||
return router;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user