Remove unused code about validating DB uploads
This commit is contained in:
Родитель
ca1ef5192d
Коммит
493033edc0
|
@ -379,16 +379,12 @@ export async function attemptRerun(
|
|||
) {
|
||||
if (typeof error.message === 'string' && error.message.includes('Some repositories were invalid')) {
|
||||
const invalidRepos = error?.response?.data?.invalid_repos || [];
|
||||
const reposWithoutDbUploads = error?.response?.data?.repos_without_db_uploads || [];
|
||||
void logger.log('Unable to run query on some of the specified repositories');
|
||||
if (invalidRepos.length > 0) {
|
||||
void logger.log(`Invalid repos: ${invalidRepos.join(', ')}`);
|
||||
}
|
||||
if (reposWithoutDbUploads.length > 0) {
|
||||
void logger.log(`Repos without DB uploads: ${reposWithoutDbUploads.join(', ')}`);
|
||||
}
|
||||
|
||||
if (invalidRepos.length + reposWithoutDbUploads.length === repositories.length) {
|
||||
if (invalidRepos.length === repositories.length) {
|
||||
// Every repo is invalid in some way
|
||||
void showAndLogErrorMessage('Unable to run query on any of the specified repositories.');
|
||||
return;
|
||||
|
@ -397,7 +393,7 @@ export async function attemptRerun(
|
|||
const popupMessage = 'Unable to run query on some of the specified repositories. [See logs for more details](command:codeQL.showLogs).';
|
||||
const rerunQuery = await showInformationMessageWithAction(popupMessage, 'Rerun on the valid repositories only');
|
||||
if (rerunQuery) {
|
||||
const validRepositories = repositories.filter(r => !invalidRepos.includes(r) && !reposWithoutDbUploads.includes(r));
|
||||
const validRepositories = repositories.filter(r => !invalidRepos.includes(r));
|
||||
void logger.log(`Rerunning query on set of valid repositories: ${JSON.stringify(validRepositories)}`);
|
||||
return await runRemoteQueriesApiRequest(credentials, ref, language, validRepositories, owner, repo, queryPackBase64, dryRun);
|
||||
}
|
||||
|
|
|
@ -114,11 +114,10 @@ describe('run-remote-query', function() {
|
|||
let mod: any;
|
||||
|
||||
const error = {
|
||||
message: 'Unable to run query on the specified repositories. Some repositories were invalid or don\'t have database uploads enabled.',
|
||||
message: 'Unable to run query on the specified repositories. Some repositories were invalid.',
|
||||
response: {
|
||||
data: {
|
||||
invalid_repos: ['abc/def', 'ghi/jkl'],
|
||||
repos_without_db_uploads: ['mno/pqr', 'stu/vwx']
|
||||
invalid_repos: ['abc/def', 'ghi/jkl']
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -151,7 +150,7 @@ describe('run-remote-query', function() {
|
|||
});
|
||||
|
||||
it('should return and log error if it can\'t run on any repos', async () => {
|
||||
const repositories = ['abc/def', 'ghi/jkl', 'mno/pqr', 'stu/vwx'];
|
||||
const repositories = ['abc/def', 'ghi/jkl'];
|
||||
|
||||
// make the function call
|
||||
await mod.attemptRerun(error, credentials, ref, language, repositories, query, owner, repo);
|
||||
|
@ -159,12 +158,11 @@ describe('run-remote-query', function() {
|
|||
// check logging output
|
||||
expect(logSpy.firstCall.args[0]).to.contain('Unable to run query');
|
||||
expect(logSpy.secondCall.args[0]).to.contain('Invalid repos: abc/def, ghi/jkl');
|
||||
expect(logSpy.thirdCall.args[0]).to.contain('Repos without DB uploads: mno/pqr, stu/vwx');
|
||||
expect(showAndLogErrorMessageSpy.firstCall.args[0]).to.contain('Unable to run query on any');
|
||||
});
|
||||
|
||||
it('should list invalid repos and repos without DB uploads, and rerun on valid ones', async () => {
|
||||
const repositories = ['foo/bar', 'abc/def', 'ghi/jkl', 'mno/pqr', 'foo/baz'];
|
||||
it('should list invalid repos and rerun on valid ones', async () => {
|
||||
const repositories = ['foo/bar', 'abc/def', 'ghi/jkl', 'foo/baz'];
|
||||
|
||||
// fake return values
|
||||
showInformationMessageWithActionSpy.resolves(true);
|
||||
|
@ -175,7 +173,6 @@ describe('run-remote-query', function() {
|
|||
// check logging output
|
||||
expect(logSpy.firstCall.args[0]).to.contain('Unable to run query');
|
||||
expect(logSpy.secondCall.args[0]).to.contain('Invalid repos: abc/def, ghi/jkl');
|
||||
expect(logSpy.thirdCall.args[0]).to.contain('Repos without DB uploads: mno/pqr');
|
||||
|
||||
// check that the correct information message is displayed
|
||||
expect(showInformationMessageWithActionSpy.firstCall.args[0]).to.contain('Unable to run query on some');
|
||||
|
@ -198,8 +195,4 @@ describe('run-remote-query', function() {
|
|||
};
|
||||
}
|
||||
});
|
||||
|
||||
describe('runRemoteQuery', () => {
|
||||
// TODO
|
||||
});
|
||||
});
|
||||
|
|
Загрузка…
Ссылка в новой задаче