Merge pull request #1184 from github/edoardo/trap-telemetry-followup

Use `util.promisify` instead of manually constructing promise
github · Aug 16, 2022 · b0d61cf · b0d61cf
2 parents 8a4437a + 016a5e3
commit b0d61cf
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 32 deletions.
diff --git a/lib/trap-caching.js b/lib/trap-caching.js
diff --git a/lib/trap-caching.js.map b/lib/trap-caching.js.map
diff --git a/src/trap-caching.ts b/src/trap-caching.ts
@@ -1,5 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
+import { promisify } from "util";
 
 import * as cache from "@actions/cache";
 import getFolderSize from "get-folder-size";
@@ -188,21 +189,17 @@ export async function getTotalCacheSize(
   trapCaches: Partial<Record<Language, string>>,
   logger: Logger
 ): Promise<number> {
-  const sizes = await Promise.all(
-    Object.values(trapCaches).map(async (cacheDir) => {
-      return new Promise<number>((resolve) => {
-        getFolderSize(cacheDir, (err, size) => {
-          if (err) {
-            logger.warning(`Error getting size of ${cacheDir}: ${err}`);
-            resolve(0);
-          } else {
-            resolve(size);
-          }
-        });
-      });
-    })
-  );
-  return sizes.reduce((a, b) => a + b, 0);
+  try {
+    const sizes = await Promise.all(
+      Object.values(trapCaches).map(async (cacheDir) => {
+        return promisify<string, number>(getFolderSize)(cacheDir);
+      })
+    );
+    return sizes.reduce((a, b) => a + b, 0);
+  } catch (e) {
+    logger.warning(`Encountered an error while getting TRAP cache size: ${e}`);
+    return 0;
+  }
 }
 
 async function cacheKey(