From 19c7f96922a6269458f2cadcc23faf0ebaa1368b Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Tue, 16 Dec 2025 15:41:50 +0000 Subject: [PATCH] Rename `isOverlayBase` --- lib/analyze-action.js | 6 +++--- src/database-upload.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 27aee2543..76c26946d 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -91694,8 +91694,8 @@ async function cleanupAndUploadDatabases(repositoryNwo, codeql, config, apiDetai logger.debug("Not analyzing default branch. Skipping upload."); return []; } - const isOverlayBase = config.overlayDatabaseMode === "overlay-base" /* OverlayBase */ && await features.getValue("upload_overlay_db_to_api" /* UploadOverlayDbToApi */); - const cleanupLevel = isOverlayBase ? "overlay" /* Overlay */ : "clear" /* Clear */; + const shouldUploadOverlayBase = config.overlayDatabaseMode === "overlay-base" /* OverlayBase */ && await features.getValue("upload_overlay_db_to_api" /* UploadOverlayDbToApi */); + const cleanupLevel = shouldUploadOverlayBase ? "overlay" /* Overlay */ : "clear" /* Clear */; await withGroupAsync("Cleaning up databases", async () => { await codeql.databaseCleanupCluster(config, cleanupLevel); }); @@ -91738,7 +91738,7 @@ async function cleanupAndUploadDatabases(repositoryNwo, codeql, config, apiDetai reports.push({ language, zipped_upload_size_bytes: bundledDbSize, - is_overlay_base: isOverlayBase, + is_overlay_base: shouldUploadOverlayBase, upload_duration_ms: endTime - startTime }); logger.debug(`Successfully uploaded database for ${language}`); diff --git a/src/database-upload.ts b/src/database-upload.ts index 87b17b4ea..964104b90 100644 --- a/src/database-upload.ts +++ b/src/database-upload.ts @@ -68,10 +68,10 @@ export async function cleanupAndUploadDatabases( } // If config.overlayDatabaseMode is OverlayBase, then we have overlay base databases for all languages. - const isOverlayBase = + const shouldUploadOverlayBase = config.overlayDatabaseMode === OverlayDatabaseMode.OverlayBase && (await features.getValue(Feature.UploadOverlayDbToApi)); - const cleanupLevel = isOverlayBase + const cleanupLevel = shouldUploadOverlayBase ? CleanupLevel.Overlay : CleanupLevel.Clear; @@ -129,7 +129,7 @@ export async function cleanupAndUploadDatabases( reports.push({ language, zipped_upload_size_bytes: bundledDbSize, - is_overlay_base: isOverlayBase, + is_overlay_base: shouldUploadOverlayBase, upload_duration_ms: endTime - startTime, }); logger.debug(`Successfully uploaded database for ${language}`);