Skip to content

Commit 776fd85

Browse files
committed
Address review comments
1 parent f654d61 commit 776fd85

File tree

4 files changed

+24
-14
lines changed

4 files changed

+24
-14
lines changed

lib/init-action.js

Lines changed: 8 additions & 2 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ test(
12531253
{
12541254
overlayDatabaseMode: OverlayDatabaseMode.None,
12551255
useOverlayDatabaseCaching: false,
1256-
disabledReason: OverlayDisabledReason.InsufficientDiskSpace,
1256+
disabledReason: OverlayDisabledReason.UnableToDetermineDiskUsage,
12571257
},
12581258
);
12591259

@@ -1679,7 +1679,7 @@ test(
16791679
{
16801680
overlayDatabaseMode: OverlayDatabaseMode.None,
16811681
useOverlayDatabaseCaching: false,
1682-
disabledReason: OverlayDisabledReason.InsufficientDiskSpace,
1682+
disabledReason: OverlayDisabledReason.UnableToDetermineDiskUsage,
16831683
},
16841684
);
16851685

src/config-utils.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -702,21 +702,15 @@ async function getOverlayFeatureDisabledReason(
702702

703703
/** Checks if the runner has enough disk space for overlay analysis. */
704704
function runnerHasSufficientDiskSpace(
705-
diskUsage: DiskUsage | undefined,
705+
diskUsage: DiskUsage,
706706
logger: Logger,
707707
useV2ResourceChecks: boolean,
708708
): boolean {
709709
const minimumDiskSpaceBytes = useV2ResourceChecks
710710
? OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES
711711
: OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES;
712-
if (
713-
diskUsage === undefined ||
714-
diskUsage.numAvailableBytes < minimumDiskSpaceBytes
715-
) {
716-
const diskSpaceMb =
717-
diskUsage === undefined
718-
? 0
719-
: Math.round(diskUsage.numAvailableBytes / 1_000_000);
712+
if (diskUsage.numAvailableBytes < minimumDiskSpaceBytes) {
713+
const diskSpaceMb = Math.round(diskUsage.numAvailableBytes / 1_000_000);
720714
const minimumDiskSpaceMb = Math.round(minimumDiskSpaceBytes / 1_000_000);
721715
logger.info(
722716
`Setting overlay database mode to ${OverlayDatabaseMode.None} ` +
@@ -772,6 +766,13 @@ async function getResourceDisabledReason(
772766
logger: Logger,
773767
useV2ResourceChecks: boolean,
774768
): Promise<OverlayDisabledReason | undefined> {
769+
if (diskUsage === undefined) {
770+
logger.info(
771+
`Unable to determine available disk space for overlay analysis. ` +
772+
`Setting overlay database mode to ${OverlayDatabaseMode.None}.`,
773+
);
774+
return OverlayDisabledReason.UnableToDetermineDiskUsage;
775+
}
775776
if (!runnerHasSufficientDiskSpace(diskUsage, logger, useV2ResourceChecks)) {
776777
return OverlayDisabledReason.InsufficientDiskSpace;
777778
}

src/overlay/diagnostics.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ export enum OverlayDisabledReason {
2626
LanguageNotEnabled = "language-not-enabled",
2727
/** The source root is not inside a git repository. */
2828
NoGitRoot = "no-git-root",
29-
/** Overlay analysis is restricted to code-scanning-only configs but the config uses custom queries or packs. */
29+
/**
30+
* Overlay analysis is restricted to code-scanning-only configs but the config uses custom
31+
* queries or packs, disables default queries, or specifies query filters.
32+
*/
3033
NonDefaultQueries = "non-default-queries",
3134
/** The top-level overlay analysis feature flag is not enabled. */
3235
OverallFeatureNotEnabled = "overall-feature-not-enabled",

0 commit comments

Comments
 (0)