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

Merge remote-tracking branch 'origin/main' into koesie10/split-remote-query-flows

Browse Source
This commit is contained in:
Koen Vlaswinkel
2022-11-11 15:00:02 +01:00
parent 175f8eadc5 4eb8c55045
commit 47ee82fc03
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,11 @@ export interface QlPack {
*/
const QUERY_PACK_NAME = 'codeql-remote/query';
export interface GeneratedQueryPack {
base64Pack: string,
language: string
}
/**
* Two possibilities:
* 1. There is no qlpack.yml in this directory. Assume this is a lone query and generate a synthetic qlpack for it.
@@ -42,10 +47,7 @@ const QUERY_PACK_NAME = 'codeql-remote/query';
*
* @returns the entire qlpack as a base64 string.
*/
async function generateQueryPack(cliServer: cli.CodeQLCliServer, queryFile: string, queryPackDir: string): Promise<{
base64Pack: string,
language: string
}> {
async function generateQueryPack(cliServer: cli.CodeQLCliServer, queryFile: string, queryPackDir: string): Promise<GeneratedQueryPack> {
const originalPackRoot = await findPackRoot(queryFile);
const packRelativePath = path.relative(originalPackRoot, queryFile);
const targetQueryFileName = path.join(queryPackDir, packRelativePath);
@@ -226,7 +228,7 @@ export async function prepareRemoteQueryRun(
const { remoteQueryDir, queryPackDir } = await createRemoteQueriesTempDirectory();
let pack: Awaited<ReturnType<typeof generateQueryPack>>;
let pack: GeneratedQueryPack;
try {
pack = await generateQueryPack(cliServer, queryFile, queryPackDir);