From 5091e42a03ad8798b48c3e7f7a52c0055dba9e34 Mon Sep 17 00:00:00 2001 From: Kasper Svendsen Date: Thu, 13 Nov 2025 10:44:19 +0100 Subject: [PATCH] Overlay: Remove repository owner restriction --- lib/init-action.js | 9 ++------- src/config-utils.test.ts | 43 ++-------------------------------------- src/config-utils.ts | 9 --------- 3 files changed, 4 insertions(+), 57 deletions(-) diff --git a/lib/init-action.js b/lib/init-action.js index 98c23c88fd..7ec583c511 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -86884,10 +86884,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { rust: "overlay_analysis_code_scanning_rust" /* OverlayAnalysisCodeScanningRust */, swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; -async function isOverlayAnalysisFeatureEnabled(repository, features, codeql, languages, codeScanningConfig) { - if (!["github", "dsp-testing"].includes(repository.owner)) { - return false; - } +async function isOverlayAnalysisFeatureEnabled(features, codeql, languages, codeScanningConfig) { if (!await features.getValue("overlay_analysis" /* OverlayAnalysis */, codeql)) { return false; } @@ -86909,7 +86906,7 @@ async function isOverlayAnalysisFeatureEnabled(repository, features, codeql, lan } return true; } -async function getOverlayDatabaseMode(codeql, repository, features, languages, sourceRoot, buildMode, codeScanningConfig, logger) { +async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, buildMode, codeScanningConfig, logger) { let overlayDatabaseMode = "none" /* None */; let useOverlayDatabaseCaching = false; const modeEnv = process.env.CODEQL_OVERLAY_DATABASE_MODE; @@ -86919,7 +86916,6 @@ async function getOverlayDatabaseMode(codeql, repository, features, languages, s `Setting overlay database mode to ${overlayDatabaseMode} from the CODEQL_OVERLAY_DATABASE_MODE environment variable.` ); } else if (await isOverlayAnalysisFeatureEnabled( - repository, features, codeql, languages, @@ -87027,7 +87023,6 @@ async function initConfig(features, inputs) { } const { overlayDatabaseMode, useOverlayDatabaseCaching } = await getOverlayDatabaseMode( inputs.codeql, - inputs.repository, inputs.features, config.languages, inputs.sourceRoot, diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts index 32c794450b..da58dd8b1b 100644 --- a/src/config-utils.test.ts +++ b/src/config-utils.test.ts @@ -990,7 +990,6 @@ interface OverlayDatabaseModeTestSetup { features: Feature[]; isPullRequest: boolean; isDefaultBranch: boolean; - repositoryOwner: string; buildMode: BuildMode | undefined; languages: Language[]; codeqlVersion: string; @@ -1003,7 +1002,6 @@ const defaultOverlayDatabaseModeTestSetup: OverlayDatabaseModeTestSetup = { features: [], isPullRequest: false, isDefaultBranch: false, - repositoryOwner: "github", buildMode: BuildMode.None, languages: [KnownLanguage.javascript], codeqlVersion: CODEQL_OVERLAY_MINIMUM_VERSION, @@ -1049,12 +1047,6 @@ const getOverlayDatabaseModeMacro = test.macro({ .stub(actionsUtil, "isAnalyzingPullRequest") .returns(setup.isPullRequest); - // Mock repository owner - const repository = { - owner: setup.repositoryOwner, - repo: "test-repo", - }; - // Set up CodeQL mock const codeql = mockCodeQLVersion(setup.codeqlVersion); @@ -1077,7 +1069,6 @@ const getOverlayDatabaseModeMacro = test.macro({ const result = await configUtils.getOverlayDatabaseMode( codeql, - repository, features, setup.languages, tempDir, // sourceRoot @@ -1499,23 +1490,9 @@ test( test( getOverlayDatabaseModeMacro, - "Overlay PR analysis by env for dsp-testing", - { - overlayDatabaseEnvVar: "overlay", - repositoryOwner: "dsp-testing", - }, - { - overlayDatabaseMode: OverlayDatabaseMode.Overlay, - useOverlayDatabaseCaching: false, - }, -); - -test( - getOverlayDatabaseModeMacro, - "Overlay PR analysis by env for other-org", + "Overlay PR analysis by env", { overlayDatabaseEnvVar: "overlay", - repositoryOwner: "other-org", }, { overlayDatabaseMode: OverlayDatabaseMode.Overlay, @@ -1525,12 +1502,11 @@ test( test( getOverlayDatabaseModeMacro, - "Overlay PR analysis by feature flag for dsp-testing", + "Overlay PR analysis by feature flag", { languages: [KnownLanguage.javascript], features: [Feature.OverlayAnalysis, Feature.OverlayAnalysisJavascript], isPullRequest: true, - repositoryOwner: "dsp-testing", }, { overlayDatabaseMode: OverlayDatabaseMode.Overlay, @@ -1538,21 +1514,6 @@ test( }, ); -test( - getOverlayDatabaseModeMacro, - "No overlay PR analysis by feature flag for other-org", - { - languages: [KnownLanguage.javascript], - features: [Feature.OverlayAnalysis, Feature.OverlayAnalysisJavascript], - isPullRequest: true, - repositoryOwner: "other-org", - }, - { - overlayDatabaseMode: OverlayDatabaseMode.None, - useOverlayDatabaseCaching: false, - }, -); - test( getOverlayDatabaseModeMacro, "Fallback due to autobuild with traced language", diff --git a/src/config-utils.ts b/src/config-utils.ts index 0f152a633d..fa88d4b4a5 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -579,17 +579,11 @@ const OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES: Record = { }; async function isOverlayAnalysisFeatureEnabled( - repository: RepositoryNwo, features: FeatureEnablement, codeql: CodeQL, languages: Language[], codeScanningConfig: UserConfig, ): Promise { - // TODO: Remove the repository owner check once support for overlay analysis - // stabilizes, and no more backward-incompatible changes are expected. - if (!["github", "dsp-testing"].includes(repository.owner)) { - return false; - } if (!(await features.getValue(Feature.OverlayAnalysis, codeql))) { return false; } @@ -647,7 +641,6 @@ async function isOverlayAnalysisFeatureEnabled( */ export async function getOverlayDatabaseMode( codeql: CodeQL, - repository: RepositoryNwo, features: FeatureEnablement, languages: Language[], sourceRoot: string, @@ -676,7 +669,6 @@ export async function getOverlayDatabaseMode( ); } else if ( await isOverlayAnalysisFeatureEnabled( - repository, features, codeql, languages, @@ -846,7 +838,6 @@ export async function initConfig( const { overlayDatabaseMode, useOverlayDatabaseCaching } = await getOverlayDatabaseMode( inputs.codeql, - inputs.repository, inputs.features, config.languages, inputs.sourceRoot,