Ensure that tools_download_duration_ms is int (#1513)

github · Jan 27, 2023 · 4664f39 · 4664f39
1 parent b2e1676
commit 4664f39
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/lib/setup-codeql.js b/lib/setup-codeql.js
diff --git a/lib/setup-codeql.js.map b/lib/setup-codeql.js.map
diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -208,7 +208,7 @@ test("downloads and caches explicitly requested bundles that aren't in the toolc
       t.assert(toolcache.find("CodeQL", `0.0.0-${version}`));
       t.is(result.toolsVersion, `0.0.0-${version}`);
       t.is(result.toolsSource, ToolsSource.Download);
-      t.is(typeof result.toolsDownloadDurationMs, "number");
+      t.assert(Number.isInteger(result.toolsDownloadDurationMs));
     }
 
     t.is(toolcache.findAllVersions("CodeQL").length, 2);
@@ -241,7 +241,7 @@ test("downloads an explicitly requested bundle even if a different version is ca
     t.assert(toolcache.find("CodeQL", "0.0.0-20200610"));
     t.deepEqual(result.toolsVersion, "0.0.0-20200610");
     t.is(result.toolsSource, ToolsSource.Download);
-    t.not(result.toolsDownloadDurationMs, undefined);
+    t.assert(Number.isInteger(result.toolsDownloadDurationMs));
   });
 });
 
@@ -293,7 +293,7 @@ for (const {
       t.assert(toolcache.find("CodeQL", expectedToolcacheVersion));
       t.deepEqual(result.toolsVersion, cliVersion);
       t.is(result.toolsSource, ToolsSource.Download);
-      t.not(result.toolsDownloadDurationMs, undefined);
+      t.assert(Number.isInteger(result.toolsDownloadDurationMs));
     });
   });
 }
@@ -428,7 +428,7 @@ for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
       );
       t.deepEqual(result.toolsVersion, defaults.cliVersion);
       t.is(result.toolsSource, ToolsSource.Download);
-      t.is(typeof result.toolsDownloadDurationMs, "number");
+      t.assert(Number.isInteger(result.toolsDownloadDurationMs));
 
       const cachedVersions = toolcache.findAllVersions("CodeQL");
       t.is(cachedVersions.length, 2);
@@ -461,7 +461,7 @@ test('downloads bundle if "latest" tools specified but not cached', async (t) =>
     );
     t.deepEqual(result.toolsVersion, defaults.cliVersion);
     t.is(result.toolsSource, ToolsSource.Download);
-    t.is(typeof result.toolsDownloadDurationMs, "number");
+    t.assert(Number.isInteger(result.toolsDownloadDurationMs));
 
     const cachedVersions = toolcache.findAllVersions("CodeQL");
     t.is(cachedVersions.length, 2);
@@ -527,7 +527,7 @@ test("download codeql bundle from github ae endpoint", async (t) => {
     );
 
     t.is(result.toolsSource, ToolsSource.Download);
-    t.is(typeof result.toolsDownloadDurationMs, "number");
+    t.assert(Number.isInteger(result.toolsDownloadDurationMs));
 
     const cachedVersions = toolcache.findAllVersions("CodeQL");
     t.is(cachedVersions.length, 1);

diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts
@@ -568,7 +568,9 @@ export async function downloadCodeQL(
     undefined,
     finalHeaders
   );
-  const toolsDownloadDurationMs = performance.now() - toolsDownloadStart;
+  const toolsDownloadDurationMs = Math.round(
+    performance.now() - toolsDownloadStart
+  );
 
   logger.debug(`CodeQL bundle download to ${codeqlPath} complete.`);