Merge pull request #13644 from Expensify/chirag-deploy-fix-5

[No QA] Escaping all instances backslash
Expensify · Dec 15, 2022 · e4daa15 · e4daa15
2 parents 18983f8 + 1c9b81b
commit e4daa15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -230,17 +230,13 @@ function getMergeLogsAsJSON(fromRef, toRef) {
     })
         .then((stdout) => {
             // Remove any double-quotes from commit subjects
-            console.log(`[debug] stdOut: ${stdout}`);
             let sanitizedOutput = stdout.replace(/(?<="subject": ").*(?="})/g, subject => subject.replace(/"/g, "'"));
-            console.log(`[debug] sanitizedOutput 1: ${sanitizedOutput}`);
 
             // Also remove any newlines and escape backslashes
-            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace('\\', '\\\\');
-            console.log(`[debug] sanitizedOutput 2: ${sanitizedOutput}`);
+            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace(/\\/g, '\\\\');
 
             // Then format as JSON and convert to a proper JS object
             const json = `[${sanitizedOutput}]`.replace('},]', '}]');
-            console.log(`[debug] json: ${json}`);
 
             return JSON.parse(json);
         });

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -163,17 +163,13 @@ function getMergeLogsAsJSON(fromRef, toRef) {
     })
         .then((stdout) => {
             // Remove any double-quotes from commit subjects
-            console.log(`[debug] stdOut: ${stdout}`);
             let sanitizedOutput = stdout.replace(/(?<="subject": ").*(?="})/g, subject => subject.replace(/"/g, "'"));
-            console.log(`[debug] sanitizedOutput 1: ${sanitizedOutput}`);
 
             // Also remove any newlines and escape backslashes
-            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace('\\', '\\\\');
-            console.log(`[debug] sanitizedOutput 2: ${sanitizedOutput}`);
+            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace(/\\/g, '\\\\');
 
             // Then format as JSON and convert to a proper JS object
             const json = `[${sanitizedOutput}]`.replace('},]', '}]');
-            console.log(`[debug] json: ${json}`);
 
             return JSON.parse(json);
         });

diff --git a/.github/libs/GitUtils.js b/.github/libs/GitUtils.js
@@ -36,17 +36,13 @@ function getMergeLogsAsJSON(fromRef, toRef) {
     })
         .then((stdout) => {
             // Remove any double-quotes from commit subjects
-            console.log(`[debug] stdOut: ${stdout}`);
             let sanitizedOutput = stdout.replace(/(?<="subject": ").*(?="})/g, subject => subject.replace(/"/g, "'"));
-            console.log(`[debug] sanitizedOutput 1: ${sanitizedOutput}`);
 
             // Also remove any newlines and escape backslashes
-            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace('\\', '\\\\');
-            console.log(`[debug] sanitizedOutput 2: ${sanitizedOutput}`);
+            sanitizedOutput = sanitizedOutput.replace(/(\r\n|\n|\r)/gm, '').replace(/\\/g, '\\\\');
 
             // Then format as JSON and convert to a proper JS object
             const json = `[${sanitizedOutput}]`.replace('},]', '}]');
-            console.log(`[debug] json: ${json}`);
 
             return JSON.parse(json);
         });