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: remove commitFiles from platforms #6701

Merged
merged 6 commits into from Jul 8, 2020
Merged

refactor: remove commitFiles from platforms #6701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c414e8f
refactor: remove unnecesary commitFiles from most platforms
rarkins Jul 7, 2020
4b71d91
Merge branch 'master' into refactor/platform-commit-files
rarkins Jul 8, 2020
fdb916d
refreshPr
rarkins Jul 8, 2020
3d76468
revert
rarkins Jul 8, 2020
67ea997
revert
rarkins Jul 8, 2020
1ecc441
Update lib/util/git/index.ts
rarkins Jul 8, 2020
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
2 changes: 1 addition & 1 deletion lib/manager/common.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { ReleaseType } from 'semver';
import { GlobalConfig, UpdateType, ValidationMessage } from '../config/common';
import { File } from '../platform/common';
import { RangeStrategy, SkipReason } from '../types';
import { File } from '../util/git';

export type Result<T> = T | Promise<T>;

Expand Down
132 changes: 0 additions & 132 deletions lib/platform/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -2,138 +2,6 @@

exports[`platform escapes names 1`] = `"name [what]"`;

exports[`platform has a list of supported methods for azure 1`] = `
Array [
"addAssignees",
"addReviewers",
"commitFiles",
"createPr",
"deleteBranch",
"deleteLabel",
"ensureComment",
"ensureCommentRemoval",
"ensureIssue",
"ensureIssueClosing",
"findIssue",
"findPr",
"getBranchPr",
"getBranchStatus",
"getBranchStatusCheck",
"getIssueList",
"getPr",
"getPrBody",
"getPrList",
"getRepoForceRebase",
"getRepos",
"getVulnerabilityAlerts",
"initPlatform",
"initRepo",
"mergePr",
"setBaseBranch",
"setBranchStatus",
"updatePr",
]
`;

exports[`platform has a list of supported methods for gitea 1`] = `
Array [
"addAssignees",
"addReviewers",
"commitFiles",
"createPr",
"deleteBranch",
"deleteLabel",
"ensureComment",
"ensureCommentRemoval",
"ensureIssue",
"ensureIssueClosing",
"findIssue",
"findPr",
"getBranchPr",
"getBranchStatus",
"getBranchStatusCheck",
"getIssueList",
"getPr",
"getPrBody",
"getPrList",
"getRepoForceRebase",
"getRepos",
"getVulnerabilityAlerts",
"initPlatform",
"initRepo",
"mergePr",
"setBaseBranch",
"setBranchStatus",
"updatePr",
]
`;

exports[`platform has a list of supported methods for github 1`] = `
Array [
"addAssignees",
"addReviewers",
"commitFiles",
"createPr",
"deleteBranch",
"deleteLabel",
"ensureComment",
"ensureCommentRemoval",
"ensureIssue",
"ensureIssueClosing",
"findIssue",
"findPr",
"getBranchPr",
"getBranchStatus",
"getBranchStatusCheck",
"getIssueList",
"getPr",
"getPrBody",
"getPrList",
"getRepoForceRebase",
"getRepos",
"getVulnerabilityAlerts",
"initPlatform",
"initRepo",
"mergePr",
"setBaseBranch",
"setBranchStatus",
"updatePr",
]
`;

exports[`platform has a list of supported methods for gitlab 1`] = `
Array [
"addAssignees",
"addReviewers",
"commitFiles",
"createPr",
"deleteBranch",
"deleteLabel",
"ensureComment",
"ensureCommentRemoval",
"ensureIssue",
"ensureIssueClosing",
"findIssue",
"findPr",
"getBranchPr",
"getBranchStatus",
"getBranchStatusCheck",
"getIssueList",
"getPr",
"getPrBody",
"getPrList",
"getRepoForceRebase",
"getRepos",
"getVulnerabilityAlerts",
"initPlatform",
"initRepo",
"mergePr",
"setBaseBranch",
"setBranchStatus",
"updatePr",
]
`;

exports[`platform initializes 1`] = `
Object {
"endpoint": "https://api.bitbucket.org/",
Expand Down
13 changes: 0 additions & 13 deletions lib/platform/azure/index.ts
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@ import { sanitize } from '../../util/sanitize';
import { ensureTrailingSlash } from '../../util/url';
import {
BranchStatusConfig,
CommitFilesConfig,
CreatePRConfig,
EnsureCommentConfig,
EnsureCommentRemovalConfig,
Expand Down Expand Up @@ -326,18 +325,6 @@ export /* istanbul ignore next */ async function deleteBranch(
}
}

export /* istanbul ignore next */ function commitFiles({
branchName,
files,
message,
}: CommitFilesConfig): Promise<string | null> {
return git.commitFiles({
branchName,
files,
message,
});
}

export async function getBranchStatusCheck(
branchName: string,
context: string
Expand Down
82 changes: 0 additions & 82 deletions lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -546,47 +546,6 @@ Array [
]
`;

exports[`platform/bitbucket-server endpoint with no path commitFiles() sends to gitFs 1`] = `
Array [
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/rest/api/1.0/projects/SOME/repos/repo",
},
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/rest/api/1.0/projects/SOME/repos/repo/branches/default",
},
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/rest/api/1.0/projects/SOME/repos/repo/pull-requests?state=ALL&role.1=AUTHOR&username.1=abc&limit=100",
},
]
`;

exports[`platform/bitbucket-server endpoint with no path createPr() posts PR 1`] = `
Array [
Object {
Expand Down Expand Up @@ -4449,47 +4408,6 @@ Array [
]
`;

exports[`platform/bitbucket-server endpoint with path commitFiles() sends to gitFs 1`] = `
Array [
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/vcs/rest/api/1.0/projects/SOME/repos/repo",
},
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/vcs/rest/api/1.0/projects/SOME/repos/repo/branches/default",
},
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "stash.renovatebot.com",
"user-agent": "https://github.com/renovatebot/renovate",
"x-atlassian-token": "no-check",
},
"method": "GET",
"url": "https://stash.renovatebot.com/vcs/rest/api/1.0/projects/SOME/repos/repo/pull-requests?state=ALL&role.1=AUTHOR&username.1=abc&limit=100",
},
]
`;

exports[`platform/bitbucket-server endpoint with path createPr() posts PR 1`] = `
Array [
Object {
Expand Down
21 changes: 0 additions & 21 deletions lib/platform/bitbucket-server/index.spec.ts
View file
Open in desktop
Expand Up @@ -408,27 +408,6 @@ describe('platform/bitbucket-server', () => {
});
});

describe('commitFiles()', () => {
it('sends to gitFs', async () => {
expect.assertions(1);
const scope = await initRepo();
scope
.get(
`${urlPath}/rest/api/1.0/projects/SOME/repos/repo/pull-requests?state=ALL&role.1=AUTHOR&username.1=abc&limit=100`
)
.reply(200, {
isLastPage: true,
values: [prMock(url, 'SOME', 'repo')],
});
await bitbucket.commitFiles({
branchName: 'some-branch',
files: [{ name: 'test', contents: 'dummy' }],
message: 'message',
});
expect(httpMock.getTrace()).toMatchSnapshot();
});
});

describe('addAssignees()', () => {
it('does not throw', async () => {
expect(await bitbucket.addAssignees(3, ['some'])).toMatchSnapshot();
Expand Down
18 changes: 5 additions & 13 deletions lib/platform/bitbucket-server/index.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@ import { sanitize } from '../../util/sanitize';
import { ensureTrailingSlash } from '../../util/url';
import {
BranchStatusConfig,
CommitFilesConfig,
CreatePRConfig,
EnsureCommentConfig,
EnsureCommentRemovalConfig,
Expand Down Expand Up @@ -385,28 +384,21 @@ export async function findPr({
}

// Returns the Pull Request for a branch. Null if not exists.
export async function getBranchPr(
branchName: string,
refreshCache?: boolean
): Promise<BbsPr | null> {
export async function getBranchPr(branchName: string): Promise<BbsPr | null> {
logger.debug(`getBranchPr(${branchName})`);
const existingPr = await findPr({
branchName,
state: PR_STATE_OPEN,
});
return existingPr ? getPr(existingPr.number, refreshCache) : null;
return existingPr ? getPr(existingPr.number) : null;
}

export async function commitFiles(
commitFilesConfig: CommitFilesConfig
): Promise<string | null> {
const commit = git.commitFiles(commitFilesConfig);

// istanbul ignore next
rarkins marked this conversation as resolved.
Show resolved Hide resolved
export async function refreshPr(number: number): Promise<void> {
// wait for pr change propagation
await delay(1000);
viceice marked this conversation as resolved.
Show resolved Hide resolved
// refresh cache
await getBranchPr(commitFilesConfig.branchName, true);
return commit;
await getPr(number, true);
}

export async function deleteBranch(
Expand Down
18 changes: 0 additions & 18 deletions lib/platform/bitbucket/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -64,24 +64,6 @@ Array [
]
`;

exports[`platform/bitbucket commitFiles() sends to gitFs 1`] = `undefined`;

exports[`platform/bitbucket commitFiles() sends to gitFs 2`] = `
Array [
Object {
"headers": Object {
"accept": "application/json",
"accept-encoding": "gzip, deflate",
"authorization": "Basic YWJjOjEyMw==",
"host": "api.bitbucket.org",
"user-agent": "https://github.com/renovatebot/renovate",
},
"method": "GET",
"url": "https://api.bitbucket.org/2.0/repositories/some/repo",
},
]
`;

exports[`platform/bitbucket createPr() posts PR 1`] = `
Array [
Object {
Expand Down
13 changes: 0 additions & 13 deletions lib/platform/bitbucket/index.spec.ts
View file
Open in desktop
Expand Up @@ -807,19 +807,6 @@ describe('platform/bitbucket', () => {
});
});

describe('commitFiles()', () => {
it('sends to gitFs', async () => {
await initRepoMock();
const res = await bitbucket.commitFiles({
branchName: 'test',
files: [],
message: 'message',
});
expect(res).toMatchSnapshot();
expect(httpMock.getTrace()).toMatchSnapshot();
});
});

describe('getVulnerabilityAlerts()', () => {
it('returns empty array', async () => {
expect(await bitbucket.getVulnerabilityAlerts()).toEqual([]);
Expand Down