Skip to content

Commit 5091e42

Browse files
committed
Overlay: Remove repository owner restriction
1 parent ba454b8 commit 5091e42

File tree

3 files changed

+4
-57
lines changed

3 files changed

+4
-57
lines changed

lib/init-action.js

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/config-utils.test.ts

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,6 @@ interface OverlayDatabaseModeTestSetup {
990990
features: Feature[];
991991
isPullRequest: boolean;
992992
isDefaultBranch: boolean;
993-
repositoryOwner: string;
994993
buildMode: BuildMode | undefined;
995994
languages: Language[];
996995
codeqlVersion: string;
@@ -1003,7 +1002,6 @@ const defaultOverlayDatabaseModeTestSetup: OverlayDatabaseModeTestSetup = {
10031002
features: [],
10041003
isPullRequest: false,
10051004
isDefaultBranch: false,
1006-
repositoryOwner: "github",
10071005
buildMode: BuildMode.None,
10081006
languages: [KnownLanguage.javascript],
10091007
codeqlVersion: CODEQL_OVERLAY_MINIMUM_VERSION,
@@ -1049,12 +1047,6 @@ const getOverlayDatabaseModeMacro = test.macro({
10491047
.stub(actionsUtil, "isAnalyzingPullRequest")
10501048
.returns(setup.isPullRequest);
10511049

1052-
// Mock repository owner
1053-
const repository = {
1054-
owner: setup.repositoryOwner,
1055-
repo: "test-repo",
1056-
};
1057-
10581050
// Set up CodeQL mock
10591051
const codeql = mockCodeQLVersion(setup.codeqlVersion);
10601052

@@ -1077,7 +1069,6 @@ const getOverlayDatabaseModeMacro = test.macro({
10771069

10781070
const result = await configUtils.getOverlayDatabaseMode(
10791071
codeql,
1080-
repository,
10811072
features,
10821073
setup.languages,
10831074
tempDir, // sourceRoot
@@ -1499,23 +1490,9 @@ test(
14991490

15001491
test(
15011492
getOverlayDatabaseModeMacro,
1502-
"Overlay PR analysis by env for dsp-testing",
1503-
{
1504-
overlayDatabaseEnvVar: "overlay",
1505-
repositoryOwner: "dsp-testing",
1506-
},
1507-
{
1508-
overlayDatabaseMode: OverlayDatabaseMode.Overlay,
1509-
useOverlayDatabaseCaching: false,
1510-
},
1511-
);
1512-
1513-
test(
1514-
getOverlayDatabaseModeMacro,
1515-
"Overlay PR analysis by env for other-org",
1493+
"Overlay PR analysis by env",
15161494
{
15171495
overlayDatabaseEnvVar: "overlay",
1518-
repositoryOwner: "other-org",
15191496
},
15201497
{
15211498
overlayDatabaseMode: OverlayDatabaseMode.Overlay,
@@ -1525,34 +1502,18 @@ test(
15251502

15261503
test(
15271504
getOverlayDatabaseModeMacro,
1528-
"Overlay PR analysis by feature flag for dsp-testing",
1505+
"Overlay PR analysis by feature flag",
15291506
{
15301507
languages: [KnownLanguage.javascript],
15311508
features: [Feature.OverlayAnalysis, Feature.OverlayAnalysisJavascript],
15321509
isPullRequest: true,
1533-
repositoryOwner: "dsp-testing",
15341510
},
15351511
{
15361512
overlayDatabaseMode: OverlayDatabaseMode.Overlay,
15371513
useOverlayDatabaseCaching: true,
15381514
},
15391515
);
15401516

1541-
test(
1542-
getOverlayDatabaseModeMacro,
1543-
"No overlay PR analysis by feature flag for other-org",
1544-
{
1545-
languages: [KnownLanguage.javascript],
1546-
features: [Feature.OverlayAnalysis, Feature.OverlayAnalysisJavascript],
1547-
isPullRequest: true,
1548-
repositoryOwner: "other-org",
1549-
},
1550-
{
1551-
overlayDatabaseMode: OverlayDatabaseMode.None,
1552-
useOverlayDatabaseCaching: false,
1553-
},
1554-
);
1555-
15561517
test(
15571518
getOverlayDatabaseModeMacro,
15581519
"Fallback due to autobuild with traced language",

src/config-utils.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,11 @@ const OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES: Record<Language, Feature> = {
579579
};
580580

581581
async function isOverlayAnalysisFeatureEnabled(
582-
repository: RepositoryNwo,
583582
features: FeatureEnablement,
584583
codeql: CodeQL,
585584
languages: Language[],
586585
codeScanningConfig: UserConfig,
587586
): Promise<boolean> {
588-
// TODO: Remove the repository owner check once support for overlay analysis
589-
// stabilizes, and no more backward-incompatible changes are expected.
590-
if (!["github", "dsp-testing"].includes(repository.owner)) {
591-
return false;
592-
}
593587
if (!(await features.getValue(Feature.OverlayAnalysis, codeql))) {
594588
return false;
595589
}
@@ -647,7 +641,6 @@ async function isOverlayAnalysisFeatureEnabled(
647641
*/
648642
export async function getOverlayDatabaseMode(
649643
codeql: CodeQL,
650-
repository: RepositoryNwo,
651644
features: FeatureEnablement,
652645
languages: Language[],
653646
sourceRoot: string,
@@ -676,7 +669,6 @@ export async function getOverlayDatabaseMode(
676669
);
677670
} else if (
678671
await isOverlayAnalysisFeatureEnabled(
679-
repository,
680672
features,
681673
codeql,
682674
languages,
@@ -846,7 +838,6 @@ export async function initConfig(
846838
const { overlayDatabaseMode, useOverlayDatabaseCaching } =
847839
await getOverlayDatabaseMode(
848840
inputs.codeql,
849-
inputs.repository,
850841
inputs.features,
851842
config.languages,
852843
inputs.sourceRoot,

0 commit comments

Comments
 (0)