From b311eee555ba8a17a7c6b3c205a704339379fddb Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Mon, 21 Oct 2024 10:30:56 -0700 Subject: [PATCH] Add sarifRunPropertyFlag to databaseInterpretResults() --- src/analyze.ts | 3 +++ src/codeql.test.ts | 1 + src/codeql.ts | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/src/analyze.ts b/src/analyze.ts index 1c9eba39e..1a43f5107 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -247,6 +247,8 @@ export async function runQueries( ): Promise { const statusReport: QueriesStatusReport = {}; + const sarifRunPropertyFlag = undefined; + const codeql = await getCodeQL(config.codeQLCmd); const queryFlags = [memoryFlag, threadsFlag]; @@ -336,6 +338,7 @@ export async function runQueries( addSnippetsFlag, threadsFlag, enableDebugLogging ? "-vv" : "-v", + sarifRunPropertyFlag, automationDetailsId, config, features, diff --git a/src/codeql.test.ts b/src/codeql.test.ts index 7f6d49f42..3642ef229 100644 --- a/src/codeql.test.ts +++ b/src/codeql.test.ts @@ -839,6 +839,7 @@ for (const { "", "", "-v", + undefined, "", Object.assign({}, stubConfig, { gitHubVersion: githubVersion }), createFeatures([]), diff --git a/src/codeql.ts b/src/codeql.ts index 7d1317d86..1bd812593 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -166,6 +166,7 @@ export interface CodeQL { addSnippetsFlag: string, threadsFlag: string, verbosityFlag: string | undefined, + sarifRunPropertyFlag: string | undefined, automationDetailsId: string | undefined, config: Config, features: FeatureEnablement, @@ -834,6 +835,7 @@ export async function getCodeQLForCmd( addSnippetsFlag: string, threadsFlag: string, verbosityFlag: string, + sarifRunPropertyFlag: string | undefined, automationDetailsId: string | undefined, config: Config, features: FeatureEnablement, @@ -861,6 +863,9 @@ export async function getCodeQLForCmd( ...(await getJobRunUuidSarifOptions(this)), ...getExtraOptionsFromEnv(["database", "interpret-results"]), ]; + if (sarifRunPropertyFlag !== undefined) { + codeqlArgs.push(sarifRunPropertyFlag); + } if (automationDetailsId !== undefined) { codeqlArgs.push("--sarif-category", automationDetailsId); }