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.

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

feat(gitea): filter archived autodiscover repos #9153

Merged
merged 2 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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/platform/gitea/__snapshots__/gitea-helper.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ Array [
"user-agent": "https://github.com/renovatebot/renovate",
},
"method": "GET",
"url": "https://gitea.renovatebot.com/api/v1/repos/search?uid=13",
"url": "https://gitea.renovatebot.com/api/v1/repos/search?uid=13&archived=false",
},
]
`;
Expand Down
28 changes: 14 additions & 14 deletions lib/platform/gitea/__snapshots__/index.spec.ts.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`platform/gitea createPr should use base branch by default 1`] = `
exports[`platform/gitea/index createPr should use base branch by default 1`] = `
Object {
"body": "pr-body",
"canMerge": true,
Expand All @@ -18,7 +18,7 @@ Object {
}
`;

exports[`platform/gitea createPr should use default branch if requested 1`] = `
exports[`platform/gitea/index createPr should use default branch if requested 1`] = `
Object {
"body": "pr-body",
"canMerge": true,
Expand All @@ -36,7 +36,7 @@ Object {
}
`;

exports[`platform/gitea getPr should fallback to direct fetching if cache fails 1`] = `
exports[`platform/gitea/index getPr should fallback to direct fetching if cache fails 1`] = `
Object {
"body": "some random pull request",
"canMerge": true,
Expand All @@ -54,7 +54,7 @@ Object {
}
`;

exports[`platform/gitea getPr should return enriched pull request which exists if open 1`] = `
exports[`platform/gitea/index getPr should return enriched pull request which exists if open 1`] = `
Object {
"body": "some random pull request",
"canMerge": true,
Expand All @@ -72,14 +72,14 @@ Object {
}
`;

exports[`platform/gitea getPrList should filter list by creator 1`] = `
exports[`platform/gitea/index getPrList should filter list by creator 1`] = `
Object {
"endpoint": "https://gitea.com/api/v1/",
"gitAuthor": "Renovate Bot <renovate@example.com>",
}
`;

exports[`platform/gitea getPrList should filter list by creator 2`] = `
exports[`platform/gitea/index getPrList should filter list by creator 2`] = `
Array [
Object {
"body": "some random pull request",
Expand Down Expand Up @@ -114,7 +114,7 @@ Array [
]
`;

exports[`platform/gitea getPrList should return list of pull requests 1`] = `
exports[`platform/gitea/index getPrList should return list of pull requests 1`] = `
Array [
Object {
"body": "some random pull request",
Expand Down Expand Up @@ -149,49 +149,49 @@ Array [
]
`;

exports[`platform/gitea getRepos should return an array of repos 1`] = `
exports[`platform/gitea/index getRepos should return an array of repos 1`] = `
Array [
"a/b",
"c/d",
]
`;

exports[`platform/gitea initPlatform() should support custom endpoint 1`] = `
exports[`platform/gitea/index initPlatform() should support custom endpoint 1`] = `
Object {
"endpoint": "https://gitea.renovatebot.com/",
"gitAuthor": "Renovate Bot <renovate@example.com>",
}
`;

exports[`platform/gitea initPlatform() should support default endpoint 1`] = `
exports[`platform/gitea/index initPlatform() should support default endpoint 1`] = `
Object {
"endpoint": "https://gitea.com/api/v1/",
"gitAuthor": "Renovate Bot <renovate@example.com>",
}
`;

exports[`platform/gitea initPlatform() should use username as author name if full name is missing 1`] = `
exports[`platform/gitea/index initPlatform() should use username as author name if full name is missing 1`] = `
Object {
"endpoint": "https://gitea.com/api/v1/",
"gitAuthor": "renovate <renovate@example.com>",
}
`;

exports[`platform/gitea initRepo should fall back to merge method "merge" 1`] = `
exports[`platform/gitea/index initRepo should fall back to merge method "merge" 1`] = `
Object {
"defaultBranch": "master",
"isFork": false,
}
`;

exports[`platform/gitea initRepo should fall back to merge method "rebase-merge" 1`] = `
exports[`platform/gitea/index initRepo should fall back to merge method "rebase-merge" 1`] = `
Object {
"defaultBranch": "master",
"isFork": false,
}
`;

exports[`platform/gitea initRepo should fall back to merge method "squash" 1`] = `
exports[`platform/gitea/index initRepo should fall back to merge method "squash" 1`] = `
Object {
"defaultBranch": "master",
"isFork": false,
Expand Down
6 changes: 4 additions & 2 deletions lib/platform/gitea/gitea-helper.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import * as httpMock from '../../../test/http-mock';
import { getName } from '../../../test/util';
import { PrState } from '../../types';
import { setBaseUrl } from '../../util/http/gitea';
import * as ght from './gitea-helper';

describe('platform/gitea/gitea-helper', () => {
describe(getName(__filename), () => {
const baseUrl = 'https://gitea.renovatebot.com/api/v1';

const mockCommitHash = '0d9c7726c3d628b7e28af234595cfd20febdbf8e';
Expand Down Expand Up @@ -186,14 +187,15 @@ describe('platform/gitea/gitea-helper', () => {
it('should construct proper query parameters', async () => {
httpMock
.scope(baseUrl)
.get('/repos/search?uid=13')
.get('/repos/search?uid=13&archived=false')
.reply(200, {
ok: true,
data: [otherMockRepo],
});

const res = await ght.searchRepos({
uid: 13,
archived: false,
});
expect(res).toEqual([otherMockRepo]);
expect(httpMock.getTrace()).toMatchSnapshot();
Expand Down
1 change: 1 addition & 0 deletions lib/platform/gitea/gitea-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export interface CombinedCommitStatus {

export type RepoSearchParams = {
uid?: number;
archived?: boolean;
};

export type IssueCreateParams = IssueUpdateParams;
Expand Down
4 changes: 2 additions & 2 deletions lib/platform/gitea/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BranchStatusConfig, Platform, RepoParams, RepoResult } from '..';
import { partial } from '../../../test/util';
import { getName, partial } from '../../../test/util';
import {
REPOSITORY_ACCESS_FORBIDDEN,
REPOSITORY_ARCHIVED,
Expand All @@ -20,7 +20,7 @@ import * as ght from './gitea-helper';
*/
const GITEA_VERSION = '1.14.0+dev-754-g5d2b7ba63';

describe('platform/gitea', () => {
describe(getName(__filename), () => {
let gitea: Platform;
let helper: jest.Mocked<typeof import('./gitea-helper')>;
let logger: jest.Mocked<typeof _logger>;
Expand Down
5 changes: 4 additions & 1 deletion lib/platform/gitea/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,10 @@ const platform: Platform = {
async getRepos(): Promise<string[]> {
logger.debug('Auto-discovering Gitea repositories');
try {
const repos = await helper.searchRepos({ uid: botUserID });
const repos = await helper.searchRepos({
uid: botUserID,
archived: false,
});
return repos.map((r) => r.full_name);
} catch (err) {
logger.error({ err }, 'Gitea getRepos() error');
Expand Down