From d5b3d42fd4283f36b2f23cd91092c0dd59a49978 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 21 Jan 2026 12:52:24 +0000 Subject: [PATCH] Inline `EnvVar.ANALYSIS_KEY` in `getAnalysisKey` --- lib/analyze-action.js | 5 ++--- lib/autobuild-action.js | 5 ++--- lib/init-action-post.js | 5 ++--- lib/init-action.js | 5 ++--- lib/resolve-environment-action.js | 5 ++--- lib/setup-codeql-action.js | 5 ++--- lib/start-proxy-action.js | 5 ++--- lib/upload-lib.js | 5 ++--- lib/upload-sarif-action.js | 5 ++--- src/api-client.ts | 6 ++---- 10 files changed, 20 insertions(+), 31 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index baa46b4e2..1ac83ed0a 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90240,15 +90240,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } async function getAutomationID() { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 7ca9489c1..5445cc0f9 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -86893,15 +86893,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 300e9b720..4b0e49810 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -127252,15 +127252,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } function computeAutomationID(analysis_key, environment) { diff --git a/lib/init-action.js b/lib/init-action.js index c06fe2505..162c4c5bf 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -87556,15 +87556,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } async function getAutomationID() { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 1bd9cd16b..0a1774f2a 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -86901,15 +86901,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 5451ead66..0a9b97198 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -87018,15 +87018,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } function isEnablementError(msg) { diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 42e68fdd7..f855c5a0a 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -103934,15 +103934,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } diff --git a/lib/upload-lib.js b/lib/upload-lib.js index c539f24d4..480b83cd5 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -89878,15 +89878,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } function computeAutomationID(analysis_key, environment) { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 02fe92a89..3d278c11c 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -89924,15 +89924,14 @@ async function getWorkflowRelativePath() { return workflowResponse.data.path; } async function getAnalysisKey() { - const analysisKeyEnvVar = "CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */; - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]; if (analysisKey !== void 0) { return analysisKey; } const workflowPath = await getWorkflowRelativePath(); const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core5.exportVariable(analysisKeyEnvVar, analysisKey); + core5.exportVariable("CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */, analysisKey); return analysisKey; } function computeAutomationID(analysis_key, environment) { diff --git a/src/api-client.ts b/src/api-client.ts index 2f558d458..592c113b3 100644 --- a/src/api-client.ts +++ b/src/api-client.ts @@ -190,9 +190,7 @@ export async function getWorkflowRelativePath(): Promise { * the GitHub API, but after that the result will be cached. */ export async function getAnalysisKey(): Promise { - const analysisKeyEnvVar = EnvVar.ANALYSIS_KEY; - - let analysisKey = process.env[analysisKeyEnvVar]; + let analysisKey = process.env[EnvVar.ANALYSIS_KEY]; if (analysisKey !== undefined) { return analysisKey; } @@ -201,7 +199,7 @@ export async function getAnalysisKey(): Promise { const jobName = getRequiredEnvParam("GITHUB_JOB"); analysisKey = `${workflowPath}:${jobName}`; - core.exportVariable(analysisKeyEnvVar, analysisKey); + core.exportVariable(EnvVar.ANALYSIS_KEY, analysisKey); return analysisKey; }