mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

offer option to rerun on subset of valid repositories

Browse Source
This commit is contained in:
Robert
2021-09-07 11:19:02 +01:00
committed by Shati Patel
parent 64ba2cabad
commit 615dd691bf
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
extensions/ql-vscode/src/run-remote-query.ts
View File

@@ -1,7 +1,7 @@
import { QuickPickItem, Uri, window } from 'vscode';
import * as yaml from 'js-yaml';
import * as fs from 'fs-extra';
import { findLanguage, showAndLogErrorMessage, showAndLogInformationMessage } from './helpers';
import { findLanguage, showAndLogErrorMessage, showAndLogInformationMessage, showInformationMessageWithAction } from './helpers';
import { Credentials } from './authentication';
import * as cli from './cli';
import { logger } from './logging';
@@ -76,9 +76,6 @@ export async function runRemoteQuery(cliServer: cli.CodeQLCliServer, credentials
return;
}
const octokit = await credentials.getOctokit();
const token = await credentials.getToken();
const queryFile = uri.fsPath;
const query = await fs.readFile(queryFile, 'utf8');
@@ -110,6 +107,13 @@ export async function runRemoteQuery(cliServer: cli.CodeQLCliServer, credentials
return; // No error message needed, since `getRepositories` already displays one.
}
await runRemoteQueriesApiRequest(credentials, ref, language, repositories, query);
}
async function runRemoteQueriesApiRequest(credentials: Credentials, ref: string, language: string, repositories: string[], query: string) {
const octokit = await credentials.getOctokit();
const token = await credentials.getToken();
try {
await octokit.request(
'POST /repos/:owner/:repo/code-scanning/codeql/queries',
@@ -128,6 +132,29 @@ export async function runRemoteQuery(cliServer: cli.CodeQLCliServer, credentials
void showAndLogInformationMessage(`Successfully scheduled runs. [Click here to see the progress](https://github.com/${OWNER}/${REPO}/actions).`);
} catch (error) {
void showAndLogErrorMessage(error);
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 all repositories');
void logger.log('invalidRepos = ' + JSON.stringify(invalidRepos));
void logger.log('reposWithoutDbUploads = ' + JSON.stringify(reposWithoutDbUploads));
if (invalidRepos.length + reposWithoutDbUploads.length === repositories.length) {
// Every repo is invalid in some way
void showAndLogErrorMessage('Unable to run query on the specified repositories.');
return;
}
const popupMessage = 'Unable to run query on the specified repositories. See logs for more details.';
const rerunQuery = await showInformationMessageWithAction(popupMessage, 'Rerun on the valid repositories only');
if (rerunQuery) {
const validRepositories = repositories.filter(r => !invalidRepos.includes(r) && !reposWithoutDbUploads.includes(r));
void logger.log('Rerunning query on set of valid repositories: ' + JSON.stringify(validRepositories));
await runRemoteQueriesApiRequest(credentials, ref, language, validRepositories, query);
}
} else {
void showAndLogErrorMessage(error);
}
}
}