Merge pull request #14 from dsp-testing/rneatherway/use-repo-id

Use repository id for filenames

Author: rneatherway

lib/codeql.js

@@ -11,7 +11,7 @@ export { downloadDatabase, runQuery };
 // Will operate on the current working directory and create the following
 // directories:
 // * query/    (query.ql and any other supporting files)
-// * results/  (results.{bqrs,csv,json,md})
+// * results/  (results.{bqrs,csv,json,md} and nwo.txt)
 async function runQuery(
   codeql: string,
   language: string,
@@ -22,6 +22,7 @@ async function runQuery(
   const bqrs = path.join("results", "results.bqrs");
   const json = path.join("results", "results.json");
   fs.mkdirSync("results");
+  fs.writeFileSync(path.join("results", "nwo.txt"), nwo);
 
   const queryDir = "query";
   fs.mkdirSync("query");

lib/codeql.js.map

@@ -52,7 +52,10 @@ async function run(): Promise<void> {
         await mv(csv, csvDest);
         csvs.push(csvDest);
 
-        const repoName = response.artifactName.replace("#", "/");
+        const repoName = fs.readFileSync(
+          path.join(response.downloadPath, "nwo.txt"),
+          "utf-8"
+        );
         const output = await getExecOutput("wc", ["-l", csvDest]); // TODO: preferably we would do this during results interpretation
         const results = parseInt(output.stdout.trim()) - 2;
 

lib/combine-results.js

@@ -35,8 +35,7 @@ async function run(): Promise<void> {
     // 1. Use the GitHub API to download the database using token
     const curDir = cwd();
     for (const repo of repos) {
-      const safeNwo = repo.nwo.replace("/", "#");
-      const workDir = mkdtempSync(path.join(curDir, safeNwo));
+      const workDir = mkdtempSync(path.join(curDir, repo.id.toString()));
       chdir(workDir);
 
       // 1. Use the GitHub API to download the database using token
@@ -53,8 +52,13 @@ async function run(): Promise<void> {
       // 3. Upload the results as an artifact
       const artifactClient = createArtifactClient();
       await artifactClient.uploadArtifact(
-        safeNwo, // name
-        ["results/results.bqrs", "results/results.csv", "results/results.md"], // files
+        repo.id.toString(), // name
+        [
+          "results/results.bqrs",
+          "results/results.csv",
+          "results/results.md",
+          "results/nwo.txt",
+        ], // files
         "results", // rootdirectory
         { continueOnError: false, retentionDays: 1 }
       );