Fixing issues with the jira client

Author: KensoDev

client.go

@@ -30,7 +30,7 @@ func Create(client Client) (string, error) {
 func PrepareCommitMessage(client Client, branchName, commitMessage string) string {
 	return client.PrepareCommitMessage(branchName, commitMessage)
 }
-	
+
 // Comment : Comment on an issue
 func Comment(client Client, branchName, comment string) error {
 	return client.Comment(branchName, comment)
@@ -58,7 +58,7 @@ func NewClient(clientName string) (Client, error) {
 
 	return nil, fmt.Errorf("Could not find client: %v", clientName)
 }
-	
+
 // NewAuthenticatedClient : Return a new client authenticated
 func NewAuthenticatedClient() (Client, error) {
 	fields, err := Load()

jira.go

@@ -15,6 +15,7 @@ type JiraClient struct {
 	config map[string]string
 }
 
+// Create will create a new client
 func (j *JiraClient) Create() (string, error) {
 	domain, err := j.GetDomain()
 
@@ -63,9 +64,7 @@ func GetIssueID(branchName string) string {
 
 // Comment : Post a comment on a jira issue
 func (j *JiraClient) Comment(branchName, comment string) error {
-	fmt.Println(branchName)
 	issueID := GetIssueID(branchName)
-	fmt.Println(issueID)
 
 	jiraComment := &jira.Comment{
 		Body: comment,
@@ -75,6 +74,7 @@ func (j *JiraClient) Comment(branchName, comment string) error {
 	return err
 }
 
+// GetDomain : Get the domain from the config
 func (j *JiraClient) GetDomain() (string, error) {
 
 	domain, ok := j.config["domain"]
@@ -130,27 +130,18 @@ func indexOf(status string, data []string) int {
 func (j *JiraClient) Start(issueType string, issueID string) (string, error) {
 	allowed := strings.Split(j.config["transitions"], ",")
 
-	fmt.Println(issueID)
-
 	transitions, response, err := j.client.Issue.GetTransitions(issueID)
-	fmt.Println(transitions)
-
-	if err != nil {
-		fmt.Println(err)
-		fmt.Println(response.Body)
-		return "", err
-	}
-
-	nextTransition := transitions[0]
 
-	if indexOf(nextTransition.Name, allowed) > -1 {
-		_, err := j.client.Issue.DoTransition(issueID, nextTransition.ID)
+	for _, transition := range transitions {
+		if indexOf(transition.Name, allowed) > -1 {
+			_, err := j.client.Issue.DoTransition(issueID, transition.ID)
 
-		if err != nil {
-			return "", err
+			if err != nil {
+				fmt.Println(err)
+				fmt.Println(response.Body)
+				return "", err
+			}
 		}
-
-		_, _ = j.Start(issueType, issueID)
 	}
 
 	branchName, err := j.GetBranchName(issueType, issueID)
@@ -167,7 +158,6 @@ func (j *JiraClient) FormatField(fieldName string, value string) string {
 	if fieldName == "domain" {
 		return fmt.Sprintf("https://%s", value)
 	}
-
 	return value
 }
 
@@ -184,15 +174,14 @@ func (j *JiraClient) GetAuthFields() map[string]bool {
 
 // Authenticate : Authenticates using the fields passed in
 func (j *JiraClient) Authenticate(fields map[string]string) bool {
-	jiraClient, err := jira.NewClient(nil, fields["domain"])
-
-	if err != nil {
-		return false
+	tp := jira.BasicAuthTransport{
+		Username: fields["username"],
+		Password: fields["password"],
 	}
 
-	res, err := jiraClient.Authentication.AcquireSessionCookie(fields["username"], fields["password"])
+	jiraClient, err := jira.NewClient(tp.Client(), fields["domain"])
 
-	if err != nil || res == false {
+	if err != nil {
 		return false
 	}
 

pivotal.go

@@ -3,8 +3,8 @@ package gong
 import (
 	"fmt"
 	"gopkg.in/salsita/go-pivotaltracker.v1/v5/pivotal"
-	"strconv"
 	"regexp"
+	"strconv"
 )
 
 // PivotalClient : Struct implementing the generic Client interface
@@ -20,7 +20,7 @@ func NewPivotalClient() *PivotalClient {
 
 func (p *PivotalClient) Create() (string, error) {
 	fields, err := Load()
-	
+
 	if err != nil {
 		fmt.Println(err)
 	}

pivotal_test.go

@@ -11,30 +11,29 @@ type PivotalClientSuit struct{}
 
 var _ = Suite(&PivotalClientSuit{})
 
-func (p *PivotalClientSuit) TestBrowseWithCorrectBranchName(c * C) {
+func (p *PivotalClientSuit) TestBrowseWithCorrectBranchName(c *C) {
 	pivotalClient := &PivotalClient{}
 
 	url, err := pivotalClient.Browse("feature/124352-test-only")
 	c.Assert(err, Equals, nil)
 	c.Assert(url, Equals, "https://www.pivotaltracker.com/story/show/124352")
 }
 
-func (p *PivotalClientSuit) TestBrowseWithIncorrectBranchName(c * C) {
+func (p *PivotalClientSuit) TestBrowseWithIncorrectBranchName(c *C) {
 	pivotalClient := &PivotalClient{}
 
 	url, err := pivotalClient.Browse("feature/test-only")
 	c.Assert(err, Equals, nil)
 	c.Assert(url, Equals, "https://www.pivotaltracker.com/story/show/")
 }
 
-func (p *PivotalClientSuit) TestGetPivotalIssueIDWithCorrectBranchName(c * C) {
+func (p *PivotalClientSuit) TestGetPivotalIssueIDWithCorrectBranchName(c *C) {
 	branchName := "feature/1234-test-only"
 	issueId := GetPivotalIssueID(branchName)
 	c.Assert(issueId, Equals, "1234")
 }
 
-
-func (p *PivotalClientSuit) TestGetPivotalIssueIDWithInCorrectBranchName(c * C) {
+func (p *PivotalClientSuit) TestGetPivotalIssueIDWithInCorrectBranchName(c *C) {
 	branchName := "feature/test-only"
 	issueId := GetPivotalIssueID(branchName)
 	c.Assert(issueId, Equals, "")