Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: github presets use util/http/github #6658

Merged
merged 1 commit into from Jul 3, 2020
Merged

refactor: github presets use util/http/github #6658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/config/presets/github/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ exports[`config/presets/github/index getPreset() should return custom.json 1`] =
Array [
Object {
"headers": Object {
"accept": "application/vnd.github.machine-man-preview+json",
"accept": "application/vnd.github.v3+json",
"accept-encoding": "gzip, deflate",
"authorization": "token abc",
"host": "api.github.com",
Expand Down Expand Up @@ -90,7 +90,7 @@ exports[`config/presets/github/index getPreset() should throws not-found 1`] = `
Array [
Object {
"headers": Object {
"accept": "application/vnd.github.machine-man-preview+json",
"accept": "application/vnd.github.v3+json",
"accept-encoding": "gzip, deflate",
"authorization": "token abc",
"host": "api.github.com",
Expand Down
34 changes: 11 additions & 23 deletions lib/config/presets/github/index.spec.ts
View file
Open in desktop
Expand Up @@ -132,17 +132,11 @@ describe(getName(__filename), () => {
.reply(200, {
content: Buffer.from('{"foo":"bar"}').toString('base64'),
});

try {
global.appMode = true;
const content = await github.getPreset({
packageName: 'some/repo',
presetName: 'custom',
});
expect(content).toEqual({ foo: 'bar' });
} finally {
delete global.appMode;
}
const content = await github.getPreset({
packageName: 'some/repo',
presetName: 'custom',
});
expect(content).toEqual({ foo: 'bar' });
expect(httpMock.getTrace()).toMatchSnapshot();
});

Expand All @@ -153,18 +147,12 @@ describe(getName(__filename), () => {
.reply(200, {
content: Buffer.from('{}').toString('base64'),
});

try {
global.appMode = true;
await expect(
github.getPreset({
packageName: 'some/repo',
presetName: 'somefile/somename/somesubname',
})
).rejects.toThrow(PRESET_NOT_FOUND);
} finally {
delete global.appMode;
}
await expect(
github.getPreset({
packageName: 'some/repo',
presetName: 'somefile/somename/somesubname',
})
).rejects.toThrow(PRESET_NOT_FOUND);
expect(httpMock.getTrace()).toMatchSnapshot();
});
});
Expand Down
14 changes: 3 additions & 11 deletions lib/config/presets/github/index.ts
View file
Open in desktop
@@ -1,30 +1,22 @@
import { PLATFORM_TYPE_GITHUB } from '../../../constants/platforms';
import { logger } from '../../../logger';
import { ExternalHostError } from '../../../types/errors/external-host-error';
import { Http, HttpOptions } from '../../../util/http';
import { GithubHttp } from '../../../util/http/github';
import { Preset, PresetConfig } from '../common';
import { PRESET_DEP_NOT_FOUND, fetchPreset } from '../util';

export const Endpoint = 'https://api.github.com/';

const http = new Http(PLATFORM_TYPE_GITHUB);
const http = new GithubHttp();

export async function fetchJSONFile(
repo: string,
fileName: string,
endpoint: string
): Promise<Preset> {
const url = `${endpoint}repos/${repo}/contents/${fileName}`;
const opts: HttpOptions = {
headers: {
accept: global.appMode
? 'application/vnd.github.machine-man-preview+json'
: 'application/vnd.github.v3+json',
},
};
let res: { body: { content: string } };
try {
res = await http.getJson(url, opts);
res = await http.getJson(url);
} catch (err) {
// istanbul ignore if: not testable with nock
if (err instanceof ExternalHostError) {
Expand Down