Merge pull request #13500 from Expensify/francois-fixGetMergeLogsAsJSON

Prevent commit messages that end in `\` from breaking `getMergeLogsAsJSON()`
Expensify · Dec 13, 2022 · ab80331 · ab80331
2 parents e382f07 + 012856a
commit ab80331
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -236,7 +236,11 @@ function getMergeLogsAsJSON(fromRef, toRef) {
             sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '');
 
             // Then format as JSON and convert to a proper JS object
-            const json = `[${sanitizedOutput}]`.replace('},]', '}]');
+            const json = `[${sanitizedOutput}]`.replace('},]', '}]')
+
+                // Escape backslashes in commit messages that end with a backslash
+                .replace('\\"}', '\\\\"}');
+
             return JSON.parse(json);
         });
 }

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -169,7 +169,11 @@ function getMergeLogsAsJSON(fromRef, toRef) {
             sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '');
 
             // Then format as JSON and convert to a proper JS object
-            const json = `[${sanitizedOutput}]`.replace('},]', '}]');
+            const json = `[${sanitizedOutput}]`.replace('},]', '}]')
+
+                // Escape backslashes in commit messages that end with a backslash
+                .replace('\\"}', '\\\\"}');
+
             return JSON.parse(json);
         });
 }

diff --git a/.github/libs/GitUtils.js b/.github/libs/GitUtils.js
@@ -42,7 +42,11 @@ function getMergeLogsAsJSON(fromRef, toRef) {
             sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '');
 
             // Then format as JSON and convert to a proper JS object
-            const json = `[${sanitizedOutput}]`.replace('},]', '}]');
+            const json = `[${sanitizedOutput}]`.replace('},]', '}]')
+
+                // Escape backslashes in commit messages that end with a backslash
+                .replace('\\"}', '\\\\"}');
+
             return JSON.parse(json);
         });
 }