Skip to content

Commit 6a77217

Browse files
committed
Add disabled by env var disablement reason
1 parent be20394 commit 6a77217

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

lib/init-action.js

Lines changed: 5 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ test(
11391139
{
11401140
overlayDatabaseMode: OverlayDatabaseMode.None,
11411141
useOverlayDatabaseCaching: false,
1142+
disabledReason: OverlayDisabledReason.DisabledByEnvironmentVariable,
11421143
},
11431144
);
11441145

src/config-utils.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,11 @@ export async function getOverlayDatabaseMode(
844844
`Setting overlay database mode to ${modeEnv} ` +
845845
"from the CODEQL_OVERLAY_DATABASE_MODE environment variable.",
846846
);
847+
if (modeEnv === OverlayDatabaseMode.None) {
848+
return disabledResult(
849+
OverlayDisabledReason.DisabledByEnvironmentVariable,
850+
);
851+
}
847852
return validateOverlayDatabaseMode(
848853
modeEnv,
849854
false,
@@ -959,7 +964,7 @@ export async function getOverlayDatabaseMode(
959964
* appropriate disabled reason.
960965
*/
961966
async function validateOverlayDatabaseMode(
962-
overlayDatabaseMode: OverlayDatabaseMode,
967+
overlayDatabaseMode: Exclude<OverlayDatabaseMode, OverlayDatabaseMode.None>,
963968
useOverlayDatabaseCaching: boolean,
964969
codeql: CodeQL,
965970
languages: Language[],
@@ -978,14 +983,6 @@ async function validateOverlayDatabaseMode(
978983
disabledReason: reason,
979984
});
980985

981-
if (overlayDatabaseMode === OverlayDatabaseMode.None) {
982-
return {
983-
overlayDatabaseMode: OverlayDatabaseMode.None,
984-
useOverlayDatabaseCaching: false,
985-
disabledReason: undefined,
986-
};
987-
}
988-
989986
if (
990987
buildMode !== BuildMode.None &&
991988
(

src/overlay/diagnostics.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { RepositoryPropertyName } from "../feature-flags/properties";
1010

1111
/** Reason why overlay analysis was disabled. */
1212
export enum OverlayDisabledReason {
13+
/** Overlay analysis was disabled by the CODEQL_OVERLAY_DATABASE_MODE environment variable being set to "none". */
14+
DisabledByEnvironmentVariable = "disabled-by-environment-variable",
1315
/** Overlay analysis was disabled by a repository property. */
1416
DisabledByRepositoryProperty = "disabled-by-repository-property",
1517
/** The build mode is incompatible with overlay analysis. */

0 commit comments

Comments
 (0)