Merge branch 'main' into NO-SNOW-missing-jira-ticket

Author: sfc-gh-fpawlowski

.github/workflows/jira_issue.yml

@@ -19,18 +19,20 @@ jobs:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+          ISSUE_TITLE: ${{ github.event.issue.title }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
+          ISSUE_URL: ${{ github.event.issue.html_url }}
         run: |
           # debug
           set -x
           TMP_BODY=$(mktemp)
           trap "rm -f $TMP_BODY" EXIT
 
           # Escape special characters in title and body
-          TITLE=$(echo '${{ github.event.issue.title }}' | sed 's/"/\\"/g' | sed "s/'/\\\'/g")
-
-          echo "${{ github.event.issue.body }}" > $TMP_BODY
-          echo -e "\n\n_Created from GitHub Action_ for ${{ github.event.issue.html_url }}" >> $TMP_BODY
-          BODY=$(cat "$TMP_BODY" | sed 's/"/\\"/g' | sed "s/'/\\\'/g")
+          TITLE=$(echo "${ISSUE_TITLE//`/\\`}" | sed 's/"/\\"/g' | sed "s/'/\\\'/g")
+          echo "${ISSUE_BODY//`/\\`}" | sed 's/"/\\"/g' | sed "s/'/\\\'/g" > $TMP_BODY
+          echo -e "\n\n_Created from GitHub Action_ for $ISSUE_URL" >> $TMP_BODY
+          BODY=$(cat "$TMP_BODY")
 
           PAYLOAD=$(jq -n \
           --arg issuetitle "$TITLE" \
@@ -78,11 +80,25 @@ jobs:
           JIRA_KEY: ${{ steps.create.outputs.jira_key }}
           ISSUE_TITLE: ${{ github.event.issue.title }}
         run: |
+          TITLE=$(echo "${ISSUE_TITLE//`/\\`}" | sed 's/"/\\"/g' | sed "s/'/\\\'/g")
+          PAYLOAD=$(jq -n \
+          --arg issuetitle "$TITLE" \
+          --arg jirakey "$JIRA_KEY" \
+          '{
+            title: ($jirakey + ": " + $issuetitle)
+          }')
+
           # Update Github issue title with jira id
-          GH_UPD_RESPONSE=$(curl -s \
+          curl -s \
             -X PATCH \
             -H "Authorization: Bearer $GITHUB_TOKEN" \
             -H "Accept: application/vnd.github+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             "https://api.github.com/repos/$REPOSITORY/issues/$ISSUE_NUMBER" \
-            -d "{\"title\":\"$JIRA_KEY: $ISSUE_TITLE\"}")
+            -d "$PAYLOAD"
+
+          if [ "$?" != 0 ]; then
+            echo "Failed to update GH issue. Payload was:"
+            echo "$PAYLOAD"
+            exit 1
+          fi