Add AugmentationProperties.overlayDatabaseMode

This commit adds overlayDatabaseMode to AugmentationProperties and
creates a placeholder getOverlayDatabaseMode() function, with the
necessary inputs, to populate it.

Author: cklin

src/config-utils.test.ts

@@ -62,6 +62,7 @@ function createTestInitConfigInputs(
       tempDir: "",
       codeql: {} as CodeQL,
       workspacePath: "",
+      sourceRoot: "",
       githubVersion,
       apiDetails: {
         auth: "token",
@@ -819,6 +820,8 @@ const calculateAugmentationMacro = test.macro({
         rawQueriesInput,
         rawQualityQueriesInput,
         languages,
+        "", // sourceRoot
+        undefined, // buildMode
         mockLogger,
       );
     t.deepEqual(actualAugmentationProperties, expectedAugmentationProperties);
@@ -948,6 +951,8 @@ const calculateAugmentationErrorMacro = test.macro({
           rawQueriesInput,
           rawQualityQueriesInput,
           languages,
+          "", // sourceRoot
+          undefined, // buildMode
           mockLogger,
         ),
       { message: expectedError },

src/config-utils.ts

@@ -12,6 +12,7 @@ import { shouldPerformDiffInformedAnalysis } from "./diff-informed-analysis-util
 import { Feature, FeatureEnablement } from "./feature-flags";
 import { Language, parseLanguage } from "./languages";
 import { Logger } from "./logging";
+import { OverlayDatabaseMode } from "./overlay-database-utils";
 import { RepositoryNwo } from "./repository";
 import { downloadTrapCaches } from "./trap-caching";
 import {
@@ -189,6 +190,11 @@ export interface AugmentationProperties {
    * Extra query exclusions to append to the config.
    */
   extraQueryExclusions?: ExcludeQueryFilter[];
+
+  /**
+   * The overlay database mode to use.
+   */
+  overlayDatabaseMode: OverlayDatabaseMode;
 }
 
 /**
@@ -202,6 +208,7 @@ export const defaultAugmentationProperties: AugmentationProperties = {
   queriesInput: undefined,
   qualityQueriesInput: undefined,
   extraQueryExclusions: [],
+  overlayDatabaseMode: OverlayDatabaseMode.None,
 };
 export type Packs = Partial<Record<Language, string[]>>;
 
@@ -426,6 +433,7 @@ export interface InitConfigInputs {
   tempDir: string;
   codeql: CodeQL;
   workspacePath: string;
+  sourceRoot: string;
   githubVersion: GitHubVersion;
   apiDetails: api.GitHubApiCombinedDetails;
   features: FeatureEnablement;
@@ -459,6 +467,7 @@ export async function getDefaultConfig({
   repository,
   tempDir,
   codeql,
+  sourceRoot,
   githubVersion,
   features,
   logger,
@@ -484,6 +493,8 @@ export async function getDefaultConfig({
     queriesInput,
     qualityQueriesInput,
     languages,
+    sourceRoot,
+    buildMode,
     logger,
   );
 
@@ -551,6 +562,7 @@ async function loadConfig({
   tempDir,
   codeql,
   workspacePath,
+  sourceRoot,
   githubVersion,
   apiDetails,
   features,
@@ -595,6 +607,8 @@ async function loadConfig({
     queriesInput,
     qualityQueriesInput,
     languages,
+    sourceRoot,
+    buildMode,
     logger,
   );
 
@@ -637,6 +651,8 @@ async function loadConfig({
  * @param languages The languages that the config file is for. If the packs input
  *    is non-empty, then there must be exactly one language. Otherwise, an
  *    error is thrown.
+ * @param sourceRoot The source root of the repository.
+ * @param buildMode The build mode to use.
  * @param logger The logger to use for logging.
  *
  * @returns The properties that need to be augmented in the config file.
@@ -652,6 +668,8 @@ export async function calculateAugmentation(
   rawQueriesInput: string | undefined,
   rawQualityQueriesInput: string | undefined,
   languages: Language[],
+  sourceRoot: string,
+  buildMode: BuildMode | undefined,
   logger: Logger,
 ): Promise<AugmentationProperties> {
   const packsInputCombines = shouldCombine(rawPacksInput);
@@ -665,6 +683,13 @@ export async function calculateAugmentation(
     rawQueriesInput,
     queriesInputCombines,
   );
+  const overlayDatabaseMode = await getOverlayDatabaseMode(
+    codeql,
+    features,
+    sourceRoot,
+    buildMode,
+    logger,
+  );
 
   const qualityQueriesInput = parseQueriesFromInput(
     rawQualityQueriesInput,
@@ -685,6 +710,7 @@ export async function calculateAugmentation(
     queriesInputCombines,
     qualityQueriesInput,
     extraQueryExclusions,
+    overlayDatabaseMode,
   };
 }
 
@@ -711,6 +737,16 @@ function parseQueriesFromInput(
   return trimmedInput.split(",").map((query) => ({ uses: query.trim() }));
 }
 
+async function getOverlayDatabaseMode(
+  codeql: CodeQL,
+  features: FeatureEnablement,
+  sourceRoot: string,
+  buildMode: BuildMode | undefined,
+  logger: Logger,
+): Promise<OverlayDatabaseMode> {
+  return OverlayDatabaseMode.None;
+}
+
 /**
  * Pack names must be in the form of `scope/name`, with only alpha-numeric characters,
  * and `-` allowed as long as not the first or last char.

src/init-action.ts

@@ -297,6 +297,14 @@ async function run() {
 
   const configFile = getOptionalInput("config-file");
 
+  // path.resolve() respects the intended semantics of source-root. If
+  // source-root is relative, it is relative to the GITHUB_WORKSPACE. If
+  // source-root is absolute, it is used as given.
+  const sourceRoot = path.resolve(
+    getRequiredEnvParam("GITHUB_WORKSPACE"),
+    getOptionalInput("source-root") || "",
+  );
+
   try {
     const statusReportBase = await createStatusReportBase(
       ActionName.Init,
@@ -363,6 +371,7 @@ async function run() {
       tempDir: getTemporaryDirectory(),
       codeql,
       workspacePath: getRequiredEnvParam("GITHUB_WORKSPACE"),
+      sourceRoot,
       githubVersion: gitHubVersion,
       apiDetails,
       features,
@@ -390,11 +399,6 @@ async function run() {
   }
 
   try {
-    const sourceRoot = path.resolve(
-      getRequiredEnvParam("GITHUB_WORKSPACE"),
-      getOptionalInput("source-root") || "",
-    );
-
     const overlayDatabaseMode = await getOverlayDatabaseMode(
       (await codeql.getVersion()).version,
       config,