fix patch with recent changes

Signed-off-by: Brian Fletcher <brian@roadie.io>
This commit is contained in:
Brian Fletcher
2022-07-25 10:07:15 +01:00
parent 7b4bad2e55
commit 59d673f880
@@ -56,6 +56,7 @@ import {
} from '@backstage/catalog-model';
import { createRouter, DatabaseTaskStore, TaskBroker } from '../index';
import { StorageTaskBroker } from '../scaffolder/tasks/StorageTaskBroker';
import { Logger } from 'winston';
function createDatabase(): PluginDatabaseManager {
return DatabaseManager.fromConfig(
@@ -79,6 +80,7 @@ describe('createRouter', () => {
let app: express.Express;
let loggerSpy: jest.SpyInstance;
let taskBroker: TaskBroker;
let logger: Logger;
const getIdentity = jest.fn();
const rawPayload = Buffer.from(
JSON.stringify({
@@ -138,7 +140,7 @@ describe('createRouter', () => {
beforeEach(async () => {
getIdentity.mockReset();
const logger = getVoidLogger();
logger = getVoidLogger();
const databaseTaskStore = await DatabaseTaskStore.create({
database: await createDatabase().getClient(),
});
@@ -301,7 +303,7 @@ describe('createRouter', () => {
},
);
const router = await createRouter({
logger: getVoidLogger(),
logger: logger,
config: new ConfigReader({}),
database: createDatabase(),
catalogClient,
@@ -313,6 +315,7 @@ describe('createRouter', () => {
});
app = express().use(router);
});
it('should not decorate a user when no backstage auth is passed', async () => {
const broker =
taskBroker.dispatch as jest.Mocked<TaskBroker>['dispatch'];
@@ -338,31 +341,28 @@ describe('createRouter', () => {
}),
);
});
});
it('should emit auditlog containing without user identifier when no backstage auth is passed', async () => {
await request(app)
.post('/v2/tasks')
.send({
templateRef: stringifyEntityRef({
kind: 'template',
name: 'create-react-app-template',
}),
values: {
required: 'required-value',
},
});
it('should emit auditlog containing without user identifier', async () => {
await request(app)
.post('/v2/tasks')
.send({
templateRef: stringifyEntityRef({
kind: 'template',
name: 'create-react-app-template',
}),
values: {
required: 'required-value',
},
});
expect(loggerSpy).toHaveBeenCalledTimes(1);
expect(loggerSpy).toHaveBeenCalledWith(
'Scaffolding task for template:default/create-react-app-template',
);
expect(loggerSpy).toHaveBeenCalledTimes(1);
expect(loggerSpy).toHaveBeenCalledWith(
'Scaffolding task for template:default/create-react-app-template',
);
});
});
it('should emit auditlog containing user identifier when backstage auth is passed', async () => {
const mockToken =
'blob.eyJzdWIiOiJ1c2VyOmRlZmF1bHQvZ3Vlc3QiLCJuYW1lIjoiSm9obiBEb2UifQ.blob';
await request(app)
.post('/v2/tasks')
.set('Authorization', `Bearer ${mockToken}`)