Include diagnostics in bundle

lib/analyze-action-post.js

@@ -162177,14 +162177,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/analyze-action.js

@@ -106084,7 +106084,7 @@ async function codeQlVersionAtLeast(codeql, requiredVersion) {
 function getBaseDatabaseOidsFilePath(config) {
   return path.join(config.dbLocation, BASE_DATABASE_OIDS_FILE_NAME);
 }
-async function bundleDb(config, language, codeql, dbName) {
+async function bundleDb(config, language, codeql, dbName, { includeDiagnostics }) {
   const databasePath = getCodeQLDatabasePath(config, language);
   const databaseBundlePath = path.resolve(config.dbLocation, `${dbName}.zip`);
   if (fs.existsSync(databaseBundlePath)) {
@@ -106103,6 +106103,7 @@ async function bundleDb(config, language, codeql, dbName) {
     databasePath,
     databaseBundlePath,
     dbName,
+    includeDiagnostics,
     additionalFiles
   );
   return databaseBundlePath;
@@ -109870,14 +109871,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(
@@ -110786,7 +110791,9 @@ async function cleanupAndUploadDatabases(repositoryNwo, codeql, config, apiDetai
   for (const language of config.languages) {
     let bundledDbSize = void 0;
     try {
-      const bundledDb = await bundleDb(config, language, codeql, language);
+      const bundledDb = await bundleDb(config, language, codeql, language, {
+        includeDiagnostics: false
+      });
       bundledDbSize = fs13.statSync(bundledDb).size;
       const bundledDbReadStream = fs13.createReadStream(bundledDb);
       const commitOid = await getCommitOid(

lib/autobuild-action.js

@@ -104898,14 +104898,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/init-action-post.js

@@ -163662,7 +163662,7 @@ async function codeQlVersionAtLeast(codeql, requiredVersion) {
 function getBaseDatabaseOidsFilePath(config) {
   return path.join(config.dbLocation, BASE_DATABASE_OIDS_FILE_NAME);
 }
-async function bundleDb(config, language, codeql, dbName) {
+async function bundleDb(config, language, codeql, dbName, { includeDiagnostics }) {
   const databasePath = getCodeQLDatabasePath(config, language);
   const databaseBundlePath = path.resolve(config.dbLocation, `${dbName}.zip`);
   if (fs.existsSync(databaseBundlePath)) {
@@ -163681,6 +163681,7 @@ async function bundleDb(config, language, codeql, dbName) {
     databasePath,
     databaseBundlePath,
     dbName,
+    includeDiagnostics,
     additionalFiles
   );
   return databaseBundlePath;
@@ -166993,14 +166994,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(
@@ -167758,7 +167763,8 @@ async function createDatabaseBundleCli(codeql, config, language) {
     config,
     language,
     codeql,
-    `${config.debugDatabaseName}-${language}`
+    `${config.debugDatabaseName}-${language}`,
+    { includeDiagnostics: true }
   );
   return databaseBundlePath;
 }

lib/init-action.js

@@ -105715,8 +105715,8 @@ async function shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger) {
     return false;
   }
   if (status.attemptedToBuildOverlayBaseDatabase && !status.builtOverlayBaseDatabase) {
-    logger.info(
-      "Cached overlay status indicates that building an overlay base database was unsuccessful, so will skip overlay analysis."
+    logger.debug(
+      "Cached overlay status indicates that building an overlay base database was unsuccessful."
     );
     return true;
   }
@@ -106178,7 +106178,7 @@ async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, b
     );
     if (diskUsage && await features.getValue("overlay_analysis_status_check" /* OverlayAnalysisStatusCheck */) && await shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger)) {
       logger.info(
-        `Setting overlay database mode to ${"none" /* None */} because overlay analysis previously failed with this combination of languages, disk space, and CodeQL version. Consider running CodeQL analysis on a larger runner.`
+        `Setting overlay database mode to ${"none" /* None */} because overlay analysis previously failed with this combination of languages, disk space, and CodeQL version.`
       );
       overlayDatabaseMode = "none" /* None */;
       skippedDueToCachedStatus = true;
@@ -108334,14 +108334,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/resolve-environment-action.js

@@ -104575,14 +104575,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/setup-codeql-action.js

@@ -105985,14 +105985,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/upload-lib.js

@@ -108733,14 +108733,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

lib/upload-sarif-action.js

@@ -109284,14 +109284,18 @@ ${output}`
         await runCli(cmd, codeqlArgs);
       }
     },
-    async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) {
+    async databaseBundle(databasePath, outputFilePath, databaseName, includeDiagnostics, alsoIncludeRelativePaths) {
+      const includeDiagnosticsArgs = includeDiagnostics ? ["--include-diagnostics"] : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"])
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs
+        })
       ];
       if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) {
         args.push(

src/codeql.ts

@@ -160,6 +160,7 @@ export interface CodeQL {
     databasePath: string,
     outputFilePath: string,
     dbName: string,
+    includeDiagnostics: boolean,
     alsoIncludeRelativePaths: string[],
   ): Promise<void>;
   /**
@@ -912,15 +913,22 @@ async function getCodeQLForCmd(
       databasePath: string,
       outputFilePath: string,
       databaseName: string,
+      includeDiagnostics: boolean,
       alsoIncludeRelativePaths: string[],
     ): Promise<void> {
+      const includeDiagnosticsArgs = includeDiagnostics
+        ? ["--include-diagnostics"]
+        : [];
       const args = [
         "database",
         "bundle",
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
-        ...getExtraOptionsFromEnv(["database", "bundle"]),
+        ...includeDiagnosticsArgs,
+        ...getExtraOptionsFromEnv(["database", "bundle"], {
+          ignoringOptions: includeDiagnosticsArgs,
+        }),
       ];
       if (
         await this.supportsFeature(ToolsFeature.BundleSupportsIncludeOption)

src/database-upload.ts

@@ -101,7 +101,9 @@ export async function cleanupAndUploadDatabases(
       // Although we are uploading arbitrary file contents to the API, it's worth
       // noting that it's the API's job to validate that the contents is acceptable.
       // This API method is available to anyone with write access to the repo.
-      const bundledDb = await bundleDb(config, language, codeql, language);
+      const bundledDb = await bundleDb(config, language, codeql, language, {
+        includeDiagnostics: false,
+      });
       bundledDbSize = fs.statSync(bundledDb).size;
       const bundledDbReadStream = fs.createReadStream(bundledDb);
       const commitOid = await gitUtils.getCommitOid(

src/debug-artifacts.ts

@@ -429,6 +429,7 @@ async function createDatabaseBundleCli(
     language,
     codeql,
     `${config.debugDatabaseName}-${language}`,
+    { includeDiagnostics: true },
   );
   return databaseBundlePath;
 }

src/util.ts

@@ -744,6 +744,7 @@ export async function bundleDb(
   language: Language,
   codeql: CodeQL,
   dbName: string,
+  { includeDiagnostics }: { includeDiagnostics: boolean },
 ) {
   const databasePath = getCodeQLDatabasePath(config, language);
   const databaseBundlePath = path.resolve(config.dbLocation, `${dbName}.zip`);
@@ -774,6 +775,7 @@ export async function bundleDb(
     databasePath,
     databaseBundlePath,
     dbName,
+    includeDiagnostics,
     additionalFiles,
   );
   return databaseBundlePath;