chore: run prettier to tidy up

Signed-off-by: Zee V. (Philip) <zee@vall.in>
This commit is contained in:
Zee V. (Philip)
2022-06-03 10:15:49 +02:00
parent 75f1f7bd45
commit 3bf6fa5fa8
2 changed files with 40 additions and 28 deletions
@@ -65,9 +65,9 @@ function setupFakeServer(
rest.get(url, (req, res, ctx) => {
// Send the request to the assertion to give the test an opportunity to inspect the parameters.
if (assertion !== undefined) {
assertion(req)
assertion(req);
}
if (req.headers.get('private-token') !== 'test-token') {
return res(ctx.status(401), ctx.json({}));
}
@@ -420,17 +420,24 @@ describe('GitlabDiscoveryProcessor', () => {
],
};
const processor = getProcessor();
setupFakeServer(PROJECTS_URL, request => {
switch (request.page) {
case 1:
return payload;
default:
throw new Error('Invalid request');
}
}, request => {
// We assert that the last activity timestamp is not being sent to the GitLab API as we expect the cache to be empty.
expect(request.url.searchParams.get('last_activity_after')).toBeNull()
});
setupFakeServer(
PROJECTS_URL,
request => {
switch (request.page) {
case 1:
return payload;
default:
throw new Error('Invalid request');
}
},
request => {
// We assert that the last activity timestamp is not being sent to the GitLab API as we expect the cache to be empty.
expect(
request.url.searchParams.get('last_activity_after'),
).toBeNull();
},
);
const result: any[] = [];
@@ -442,12 +449,18 @@ describe('GitlabDiscoveryProcessor', () => {
// Second scan should have used the mocked Date to set the last scanned time to 2001
// This should result in only the second repo being scanned, since that has a timestamp of 2002
setupFakeServer(PROJECTS_URL, _ => {
return payload;
}, request => {
// We assert that the last activity timestamp is being sent to the GitLab API since we expect it to be in the cache.
expect(request.url.searchParams.get('last_activity_after')).toMatch(SERVER_TIME)
});
setupFakeServer(
PROJECTS_URL,
_ => {
return payload;
},
request => {
// We assert that the last activity timestamp is being sent to the GitLab API since we expect it to be in the cache.
expect(request.url.searchParams.get('last_activity_after')).toMatch(
SERVER_TIME,
);
},
);
const result2: any[] = [];
await processor.readLocation(PROJECT_LOCATION, false, e => {
result2.push(e);
@@ -100,19 +100,18 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
const startTimestamp = Date.now();
this.logger.debug(`Reading GitLab projects from ${location.target}`);
const opts = {
group,
page: 1,
} as {
group: string
page: number
last_activity_after: string | undefined
}
const lastActivity = await this.cache.get(this.getCacheKey()) as string;
if (lastActivity !== "") {
opts.last_activity_after = lastActivity
group: string;
page: number;
last_activity_after: string | undefined;
};
const lastActivity = (await this.cache.get(this.getCacheKey())) as string;
if (lastActivity !== '') {
opts.last_activity_after = lastActivity;
}
const projects = paginated(options => client.listProjects(options), opts);