Docker-Compose angepasst

Author: SvenLie

.env.example

@@ -5,4 +5,5 @@ IMAP_USER=
 IMAP_PASSWORD=
 JIRA_USER=
 JIRA_PASSWORD=
-JIRA_URL=
+JIRA_URL=
+JIRA_API_VERSION=2

service/cmd/server/main.go

@@ -111,6 +111,7 @@ func run() {
 	imapServerPort := os.Getenv("IMAP_PORT")
 	imapUser := os.Getenv("IMAP_USER")
 	imapPassword := os.Getenv("IMAP_PASSWORD")
+	jiraApiVersion := os.Getenv("JIRA_API_VERSION")
 
 	// Connect to server
 	c, err := client.DialTLS(imapServer+":"+imapServerPort, nil)
@@ -199,12 +200,12 @@ func run() {
 
 					issueNumber := subject[strings.LastIndex(subject, "[")+1 : strings.LastIndex(subject, "]")]
 
-					resp := makeGetRequest("/rest/api/3/issue/" + issueNumber)
+					resp := makeGetRequest("/rest/api/" + jiraApiVersion + "/issue/" + issueNumber)
 
 					if resp.StatusCode != 200 {
 						printErrorFromApi(resp)
 					} else {
-						resp := makePostRequest("/rest/api/3/issue/"+issueNumber+"/comment", jsonString)
+						resp := makePostRequest("/rest/api/"+jiraApiVersion+"/issue/"+issueNumber+"/comment", jsonString)
 
 						if resp.StatusCode != 201 {
 							printErrorFromApi(resp)
@@ -225,7 +226,9 @@ func run() {
 					jsonString = strings.Replace(jsonString, "%SUMMARY%", subject, 1)
 					jsonString = strings.Replace(jsonString, "%DESCRIPTION%", strings.TrimSpace(sanitizedBody), 1)
 
-					resp := makePostRequest("/rest/api/3/issue", jsonString)
+					log.Println(jsonString)
+
+					resp := makePostRequest("/rest/api/"+jiraApiVersion+"/issue", jsonString)
 
 					if resp.StatusCode != 201 {
 						printErrorFromApi(resp)

structure_new_issue.json

@@ -1 +1 @@
-{"fields":{"project":{"key":"TES"},"summary":"%SUMMARY%","description":{"type":"doc","version":1,"content":[{"type":"paragraph","content":[{"text":"%DESCRIPTION%","type":"text"}]}]},"issuetype":{"name":"Task"}}}
+{"fields":{"project":{"key":"TES"},"summary":"%SUMMARY%","description":"%DESCRIPTION%","issuetype":{"name":"Task"}}}