ci: correctly handle commit message with carriage returns in payload-size.sh (angular#43569)

gkalpak · alxhub · commit 9d290bd01251 · 2021-09-24T10:56:41.000-07:00
Previously, if a commit message contained a carriage return in its header, the `payload-size.sh` script would fail to upload the payload size data to Firebase, because the JSON payload would be messed up when trying to concatenate the commit message headers. See an example [here][1]. This commit avoids this problem by replacing carriage returns before concatenating the commit message headers with the JSON payload string. [1]: https://app.circleci.com/pipelines/github/angular/angular/37437/workflows/d0fa4adf-43bb-464e-a2fd-d87da15226dd PR Close angular#43569
diff --git a/scripts/ci/payload-size.sh b/scripts/ci/payload-size.sh
@@ -96,7 +96,7 @@ addMessage() {
   # because $CI_COMMIT_RANGE may contain the previous SHA which will not be in the
   # force push or commit, hence we default to last commit.
   message=$(git --git-dir ${PROJECT_ROOT}/.git log --oneline $commitRange -- || git --git-dir ${PROJECT_ROOT}/.git log --oneline -n1)
-  message=$(echo $message | sed 's/\\/\\\\/g' | sed 's/"/\\"/g')
+  message=$(echo $message | sed 's/\r//g' | sed 's/\\/\\\\/g' | sed 's/"/\\"/g')
   payloadData="$payloadData\"message\": \"$message\", "
 }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ addMessage() {`
`96`	`96`	`# because $CI_COMMIT_RANGE may contain the previous SHA which will not be in the`
`97`	`97`	`# force push or commit, hence we default to last commit.`
`98`	`98`	`message=$(git --git-dir ${PROJECT_ROOT}/.git log --oneline $commitRange -- \|\| git --git-dir ${PROJECT_ROOT}/.git log --oneline -n1)`
`99`		`- message=$(echo $message \| sed 's/\\/\\\\/g' \| sed 's/"/\\"/g')`
	`99`	`+ message=$(echo $message \| sed 's/\r//g' \| sed 's/\\/\\\\/g' \| sed 's/"/\\"/g')`
`100`	`100`	`payloadData="$payloadData\"message\": \"$message\", "`
`101`	`101`	`}`
`102`	`102`