Overlay: Add error handling for overlayBaseSpecifier check

Author: kaspersv

lib/analyze-action.js

@@ -96,7 +96,7 @@ interface DownloadOverlayBaseDatabaseTestCase {
   hasBaseDatabaseOidsFile: boolean;
   tryGetFolderBytesSucceeds: boolean;
   codeQLVersion: string;
-  resolveDatabaseOutput: ResolveDatabaseOutput;
+  resolveDatabaseOutput: ResolveDatabaseOutput | Error;
 }
 
 const defaultDownloadTestCase: DownloadOverlayBaseDatabaseTestCase = {
@@ -168,10 +168,17 @@ const testDownloadOverlayBaseDatabaseFromCache = test.macro({
 
       const codeql = mockCodeQLVersion(testCase.codeQLVersion);
 
-      const resolveDatabaseStub = sinon
-        .stub(codeql, "resolveDatabase")
-        .resolves(testCase.resolveDatabaseOutput);
-      stubs.push(resolveDatabaseStub);
+      if (testCase.resolveDatabaseOutput instanceof Error) {
+        const resolveDatabaseStub = sinon
+          .stub(codeql, "resolveDatabase")
+          .rejects(testCase.resolveDatabaseOutput);
+        stubs.push(resolveDatabaseStub);
+      } else {
+        const resolveDatabaseStub = sinon
+          .stub(codeql, "resolveDatabase")
+          .resolves(testCase.resolveDatabaseOutput);
+        stubs.push(resolveDatabaseStub);
+      }
 
       try {
         const result = await downloadOverlayBaseDatabaseFromCache(
@@ -274,6 +281,15 @@ test(
   false,
 );
 
+test(
+  testDownloadOverlayBaseDatabaseFromCache,
+  "returns undefined when resolving database metadata fails",
+  {
+    resolveDatabaseOutput: new Error("Failed to resolve database metadata"),
+  },
+  false,
+);
+
 test(
   testDownloadOverlayBaseDatabaseFromCache,
   "returns undefined when filesystem error occurs",

lib/init-action.js

@@ -194,18 +194,23 @@ async function checkOverlayBaseDatabase(
 
   for (const language of config.languages) {
     const dbPath = getCodeQLDatabasePath(config, language);
-    const resolveDatabaseOutput = await codeql.resolveDatabase(dbPath);
-    if (
-      resolveDatabaseOutput === undefined ||
-      !("overlayBaseSpecifier" in resolveDatabaseOutput)
-    ) {
-      logger.info(`${warningPrefix}: no overlayBaseSpecifier defined`);
+    try {
+      const resolveDatabaseOutput = await codeql.resolveDatabase(dbPath);
+      if (
+        resolveDatabaseOutput === undefined ||
+        !("overlayBaseSpecifier" in resolveDatabaseOutput)
+      ) {
+        logger.info(`${warningPrefix}: no overlayBaseSpecifier defined`);
+        return false;
+      } else {
+        logger.info(
+          `Overlay base specifier for ${language} overlay-base database found: ` +
+            `${resolveDatabaseOutput.overlayBaseSpecifier}`,
+        );
+      }
+    } catch (e) {
+      logger.warning(`${warningPrefix}: failed to resolve database: ${e}`);
       return false;
-    } else {
-      logger.info(
-        `Overlay base specifier for ${language} overlay-base database found: ` +
-          `${resolveDatabaseOutput.overlayBaseSpecifier}`,
-      );
     }
   }