Fix unit tests

github · aeisenberg · Sep 8, 2022 · Aug 29, 2022 · Aug 29, 2022 · Aug 30, 2022
commit 59744464eb119b23f70bd793d406b812dae89d93
@@ -255,7 +255,7 @@ export const CODEQL_VERSION_ML_POWERED_QUERIES = "2.7.5";
 const CODEQL_VERSION_LUA_TRACER_CONFIG = "2.10.0";
 export const CODEQL_VERSION_CONFIG_FILES = "2.10.1";
 const CODEQL_VERSION_LUA_TRACING_GO_WINDOWS_FIXED = "2.10.4";
-export const CODEQL_VERSION_GHES_PACK_DOWNLOAD = "2.10.5";
+export const CODEQL_VERSION_GHES_PACK_DOWNLOAD = "2.10.4";
 
 /**
  * This variable controls using the new style of tracing from the CodeQL

@@ -2314,6 +2314,7 @@ test("downloadPacks-with-registries", async (t) => {
 
     const codeQL = setCodeQL({
       packDownload: packDownloadStub,
+      getVersion: () => Promise.resolve("2.10.5"),
     });
 
     // packs are supplied for go, java, and python
@@ -2348,3 +2349,50 @@ test("downloadPacks-with-registries", async (t) => {
     t.deepEqual(process.env.CODEQL_REGISTRIES_AUTH, "not-a-registries-auth");
   });
 });
+
+test("downloadPacks-with-registries fails on 2.10.3", async (t) => {
+  // same thing, but this time include a registries block and
+  // associated env vars
+  return await util.withTmpDir(async (tmpDir) => {
+    process.env.GITHUB_TOKEN = "not-a-token";
+    process.env.CODEQL_REGISTRIES_AUTH = "not-a-registries-auth";
+    const logger = getRunnerLogger(true);
+
+    const registries = [
+      {
+        url: "http://ghcr.io",
+        packages: ["codeql/*", "dsp-testing/*"],
+        token: "not-a-token",
+      },
+      {
+        url: "https://containers.GHEHOSTNAME1/v2/",
+        packages: "semmle/*",
+        token: "still-not-a-token",
+      },
+    ];
+
+    const codeQL = setCodeQL({
+      getVersion: () => Promise.resolve("2.10.3"),
+    });
+    await t.throwsAsync(
+      async () =>
+        // packs are supplied for go, java, and python
+        // analyzed languages are java, javascript, and python
+        {
+          /* packs are supplied for go, java, and python*/
+          /* analyzed languages are java, javascript, and python*/
+          return await configUtils.downloadPacks(
+            codeQL,
+            [Language.javascript, Language.java, Language.python],
+            {},
+            registries,
+            sampleApiDetails,
+            tmpDir,
+            logger
+          );
+        },
+      { instanceOf: Error },
+      "'registries' input is not supported on CodeQL versions less than 2.10.5."
+    );
+  });
+});