Use object for pack generation details (#3260)

This commit is contained in:
Charis Kyriakou
2024-01-22 13:59:41 +00:00
committed by GitHub
parent 83148f6d57
commit 28aadb183b
2 changed files with 16 additions and 2 deletions

View File

@@ -0,0 +1,7 @@
/**
* Details about the original QL pack that is used for triggering
* a variant analysis.
*/
export interface QlPackDetails {
queryFile: string;
}

View File

@@ -39,6 +39,7 @@ import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
import { askForLanguage, findLanguage } from "../codeql-cli/query-language";
import type { QlPackFile } from "../packaging/qlpack-file";
import { expandShortPaths } from "../common/short-paths";
import type { QlPackDetails } from "./ql-pack-details";
/**
* Well-known names for the query pack used by the server.
@@ -59,9 +60,11 @@ interface GeneratedQueryPack {
*/
async function generateQueryPack(
cliServer: CodeQLCliServer,
queryFile: string,
qlPackDetails: QlPackDetails,
tmpDir: RemoteQueryTempDir,
): Promise<GeneratedQueryPack> {
const queryFile = qlPackDetails.queryFile;
const originalPackRoot = await findPackRoot(queryFile);
const packRelativePath = relative(originalPackRoot, queryFile);
const workspaceFolders = getOnDiskWorkspaceFolders();
@@ -381,8 +384,12 @@ export async function prepareRemoteQueryRun(
let pack: GeneratedQueryPack;
const qlPackDetails: QlPackDetails = {
queryFile,
};
try {
pack = await generateQueryPack(cliServer, queryFile, tempDir);
pack = await generateQueryPack(cliServer, qlPackDetails, tempDir);
} finally {
await tempDir.remoteQueryDir.cleanup();
}