Run the pack download command

github · Jun 6, 2021 · d87945e · d87945e
1 parent 06687e9
commit d87945e
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 7 deletions.
diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/init-action.js b/lib/init-action.js
diff --git a/lib/init-action.js.map b/lib/init-action.js.map
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -178,6 +178,16 @@ export async function runQueries(
     }
 
     try {
+      if (hasPackWithCustomQueries) {
+        const codeql = getCodeQL(config.codeQLCmd);
+        const results = await codeql.packDownload(packsWithVersion);
+        logger.info(
+          `Downloaded packs: ${results.packs
+            .map((r) => `${r.name}@${r.version || "latest"}`)
+            .join(", ")}`
+        );
+      }
+
       let analysisSummaryBuiltIn = "";
       const customAnalysisSummaries: string[] = [];
       if (queries["builtin"].length > 0) {
@@ -256,6 +266,7 @@ export async function runQueries(
       logger.endGroup();
     } catch (e) {
       logger.info(e);
+      logger.info(e.stack);
       statusReport.analyze_failure_language = language;
       throw new CodeQLAnalysisError(
         statusReport,

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -760,7 +760,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
       await new toolrunner.ToolRunner(cmd, args, {
         listeners: {
           stdout: (data: Buffer) => {
-            output += data.toString("utf8");
+            output += data.toString();
           },
         },
       }).exec();
@@ -781,7 +781,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
       const args = [
         "pack",
         "download",
-        "-v",
+        "--format=json",
         ...getExtraOptionsFromEnv(["pack", "download"]),
         ...packs.map(packWithVersionToString),
       ];

diff --git a/src/init-action.ts b/src/init-action.ts
@@ -1,4 +1,9 @@
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+
 import * as core from "@actions/core";
+import * as yaml from "js-yaml";
 
 import {
   createStatusReportBase,
@@ -177,6 +182,28 @@ async function run() {
         );
       }
     }
+
+    ////////////////////////////////
+    // TODO This should not happen in the action, we should be able to
+    // generate the default qlconfig from the CLI
+    // DO NOT COMMIT THIS
+    const defaultQlConfig = {
+      registryKind: "docker",
+      registries: [
+        {
+          url: "https://ghcr.io/v2/",
+          packages: "*",
+        },
+      ],
+    };
+
+    fs.mkdirSync(path.join(os.homedir(), ".codeql"));
+    fs.writeFileSync(
+      path.join(os.homedir(), ".codeql", "qlconfig.yml"),
+      yaml.safeDump(defaultQlConfig),
+      "utf8"
+    );
+    ////////////////////////////////
   } catch (e) {
     core.setFailed(e.message);
     console.log(e);