From a692b7e525969083f843e7d6d73da3a51499e51a Mon Sep 17 00:00:00 2001
From: Tomasz Urbaszek <tomasz.urbaszek@snowflake.com>
Date: Thu, 7 Sep 2023 16:41:17 +0200
Subject: [PATCH] Update JIRA create issue action (#367)

* Update JIRA create issue action

* Update issue template
---
 .github/ISSUE_TEMPLATE/BUG-REPORT.yml |  7 ++++++-
 .github/workflows/jira_issue.yml      | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
index ddf520ec5..c47350e02 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -1,11 +1,16 @@
 name: Bug Report
 description: File a bug report
 body:
+  - type: input
+    attributes:
+      label: "SnowCLI version"
+      description: "What version of snow are you using?"
+      placeholder: "Run `snow --version`"
   - type: input
     attributes:
       label: "Python version"
       description: "What version of Python are you using?"
-      placeholder: "Run `python --version --version`"
+      placeholder: "Run `python --version`"
   - type: input
     attributes:
       label: "Platform"
diff --git a/.github/workflows/jira_issue.yml b/.github/workflows/jira_issue.yml
index 09541d785..1aeb38821 100644
--- a/.github/workflows/jira_issue.yml
+++ b/.github/workflows/jira_issue.yml
@@ -46,9 +46,10 @@ jobs:
           project: SNOW
           issuetype: Bug
           summary: '${{ github.event.issue.title }}'
-          description: |
-            ${{ github.event.issue.body }} \\ \\ _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
-          fields: '{"customfield_11401":{"id":"14723"},"labels":["dp-snowcli","github"]}'
+          description: >
+            _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
+            ```${{ github.event.issue.body }}```
+          fields: '{"customfield_11401":{"id":"14723"},"labels":["dp-snowcli","github"],"parent":{"key":"SNOW-870768"}}'
 
       - name: Update GitHub Issue
         uses: ./jira/gajira-issue-update
@@ -59,3 +60,8 @@ jobs:
           owner: "{{ event.repository.owner.login }}"
           name: "{{ event.repository.name }}"
           jira: "${{ steps.create.outputs.issue }}"
+      - name: Transition issue
+        uses: atlassian/gajira-transition@v3
+        with:
+          issue: "${{ steps.create.outputs.issue }}"
+          transition: "TODO"