reviewable-enterprise-tools 1.3.5 → 1.3.8

package/extract_data.js

@@ -54,7 +54,8 @@ for (const property of ['repos', 'output']) {
 
 let uploadedFilesUrlRegex;
 if (uploadedFilesUrl) {
-  uploadedFilesUrlRegex = new RegExp(`(${_.escapeRegExp(uploadedFilesUrl)})([^)]*)`, 'g');
+  uploadedFilesUrlRegex =
+    new RegExp(`(${_.escapeRegExp(uploadedFilesUrl)})((?:[^)]|\\(\\d+\\))*)`, 'g');
 } else {
   console.warn(
     'WARNING: no REVIEWABLE_UPLOADS_PROVIDER or REVIEWABLE_UPLOADED_FILES_URL specified, ' +
@@ -219,13 +220,13 @@ async function extractReviews() {
   await forEachLimit(reviewKeys, 25, async reviewKey => {
     let review = await db.child('reviews/:reviewKey', {reviewKey}).get();
     if (review) {
-      stripReview(review);
+      await stripReview(review, reviewKey);
       await writeItem(`reviews/${reviewKey}`, review);
     } else {
       const archive = await db.child('archivedReviews/:reviewKey', {reviewKey}).get();
       if (archive) {
         review = JSON.parse(zlib.gunzipSync(Buffer.from(archive.payload, 'base64')).toString());
-        const placeholdersPresent = await stripReview(review);
+        const placeholdersPresent = await stripReview(review, reviewKey);
         if (identityUserMap) mapAllUserKeys(review);
         archive.payload =
           zlib.gzipSync(JSON.stringify(review), {level: zlib.constants.Z_BEST_COMPRESSION})
@@ -239,7 +240,7 @@ async function extractReviews() {
   });
 }
 
-async function stripReview(review) {
+async function stripReview(review, key) {
   let placeholderAdded = false;
   review.core = _.omit(review.core, 'lastSweepTimestamp');
   delete review.lastWebhook;
@@ -257,7 +258,7 @@ async function stripReview(review) {
             const dest = path.join(args.download, path.dirname(rest.slice(1)));
             downloadPromises.push(download(url, dest).catch(e => {
               if (args.logging) log(`File download failed:\n${url}\n${e}`);
-              brokenFiles.push(url);
+              brokenFiles.push(`${url} (${reversePullRequests[key]})`);
             }));
           }
           return PLACEHOLDER_URL + rest;

package/load_data.js

@@ -53,7 +53,9 @@ if (!process.env.REVIEWABLE_ENCRYPTION_AES_KEY) {
 let placeholderUrlRegex, gh;
 if (uploadedFilesUrl) {
   if (!process.env.REVIEWABLE_GITHUB_URL) {
-    console.log('ERROR: no REVIEWABLE_GITHUB_URL specified, unable to upload images');
+    console.log(
+      'ERROR: no REVIEWABLE_GITHUB_URL specified, unable to rewrite uploaded image URLs in comments'
+    );
     process.exit(1);
   }
   placeholderUrlRegex = new RegExp(_.escapeRegExp(PLACEHOLDER_URL), 'g');
@@ -65,11 +67,9 @@ if (uploadedFilesUrl) {
 
 async function load() {
   await import('./lib/loadFirebase.js');
-  if (uploadedFilesUrl) gh = new Hubkit({
-    host: process.env.REVIEWABLE_GITHUB_URL ?
-      process.env.REVIEWABLE_GITHUB_URL + '/api/v3' : 'https://api.github.com',
-    token: await fetchToken(args.admin)
-  });
+  const host = process.env.REVIEWABLE_GITHUB_URL === 'https://github.com' ?
+    'https://api.github.com' : process.env.REVIEWABLE_GITHUB_URL + '/api/v3';
+  gh = new Hubkit({host, token: await fetchToken(args.admin)});
 
   let sizeRead = 0;
   let fatalError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reviewable-enterprise-tools",
-  "version": "1.3.5",
+  "version": "1.3.8",
   "type": "module",
   "description": "Admin tools for Reviewable Enterprise",
   "bin": {