Updated Changelog

Handle keyring.ErrNotFound error instead of panicing.

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.1.15 - 2017-08-25
+
+* merge in edit template changes from v1 branch [#105](https://github.com/Netflix-Skunkworks/go-jira/issues/105) [Cory Bennett] [[21dec2d](https://github.com/Netflix-Skunkworks/go-jira/commit/21dec2d)]
+* Handle keyring.ErrNotFound error instead of panicing. [Will Rouesnel] [[338cc4d](https://github.com/Netflix-Skunkworks/go-jira/commit/338cc4d)]
+* Use name field for fix version name value. Fixes [#89](https://github.com/Netflix-Skunkworks/go-jira/issues/89) [Bryan Baugher] [[fde82b2](https://github.com/Netflix-Skunkworks/go-jira/commit/fde82b2)]
+
+## 0.1.14 - 2017-05-10
+
+* fix unsafe casting for --quiet flag [Cory Bennett] [[6f29f43](https://github.com/Netflix-Skunkworks/go-jira/commit/6f29f43)]
+* [[#80](https://github.com/Netflix-Skunkworks/go-jira/issues/80)] add `jira unassign` and `jira give ISSUE --default` commands [Cory Bennett] [[03d8633](https://github.com/Netflix-Skunkworks/go-jira/commit/03d8633)]
+
+## 0.1.13 - 2017-04-24
+
+* work around `github.com/tmc/keyring` compile error for windows [Cory Bennett] [[85298e9](https://github.com/Netflix-Skunkworks/go-jira/commit/85298e9)]
+* Added generic issuelink command [David Reuss] [[cc54d11](https://github.com/Netflix-Skunkworks/go-jira/commit/cc54d11)]
+* Added --start parameter for pagination on results [David Reuss] [[9b94d9e](https://github.com/Netflix-Skunkworks/go-jira/commit/9b94d9e)]
+
 ## 0.1.12 - 2017-03-22
 
 * Implement "browse" subcommand on Windows [Claus Brod] [[ca333d8](https://github.com/Netflix-Skunkworks/go-jira/commit/ca333d8)]

cli.go

@@ -544,7 +544,7 @@ func (c *Cli) FindIssues() (interface{}, error) {
 
 	json, err := jsonEncode(map[string]interface{}{
 		"jql":        query,
-		"startAt":    "0",
+		"startAt":    c.opts["start_at"],
 		"maxResults": c.opts["max_results"],
 		"fields":     fields,
 		"expand":     c.expansions(),

commands.go

@@ -157,7 +157,7 @@ func (c *Cli) CmdWorklog(action string, issue string) error {
 
 				if resp.StatusCode == 201 {
 					c.Browse(issue)
-					if !c.opts["quiet"].(bool) {
+					if !c.GetOptBool("quiet", false) {
 						fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 					}
 					return nil
@@ -210,7 +210,7 @@ func (c *Cli) CmdEdit(issue string) error {
 
 			if resp.StatusCode == 204 {
 				c.Browse(issueData["key"].(string))
-				if !c.opts["quiet"].(bool) {
+				if !c.GetOptBool("quiet", false) {
 					fmt.Printf("OK %s %s/browse/%s\n", issueData["key"], c.endpoint, issueData["key"])
 				}
 				return nil
@@ -416,7 +416,7 @@ func (c *Cli) CmdCreate() error {
 					"issue": key,
 					"link":  link,
 				})
-				if !c.opts["quiet"].(bool) {
+				if !c.GetOptBool("quiet", false) {
 					fmt.Printf("OK %s %s\n", key, link)
 				}
 				return nil
@@ -506,7 +506,7 @@ func (c *Cli) CmdSubtask(issue string) error {
 					"issue": key,
 					"link":  link,
 				})
-				if !c.opts["quiet"].(bool) {
+				if !c.GetOptBool("quiet", false) {
 					fmt.Printf("OK %s %s\n", key, link)
 				}
 				return nil
@@ -531,6 +531,50 @@ func (c *Cli) CmdIssueLinkTypes() error {
 	return runTemplate(c.getTemplate("issuelinktypes"), data, nil)
 }
 
+// CmdIssueLink is a generic function for adding a link type to an issue
+func (c *Cli) CmdIssueLink(inwardIssue string, issueLinkTypeName string, outwardIssue string) error {
+	log.Debugf("issuelink called")
+
+	json, err := jsonEncode(map[string]interface{}{
+		"type": map[string]string{
+			"name": issueLinkTypeName,
+		},
+		"inwardIssue": map[string]string{
+			"key": inwardIssue,
+		},
+		"outwardIssue": map[string]string{
+			"key": outwardIssue,
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s/rest/api/2/issueLink", c.endpoint)
+	if c.getOptBool("dryrun", false) {
+		log.Debugf("POST: %s", json)
+		log.Debugf("Dryrun mode, skipping POST")
+		return nil
+	}
+	resp, err := c.post(uri, json)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode == 201 {
+		c.Browse(inwardIssue)
+		if !c.GetOptBool("quiet", false) {
+			fmt.Printf("OK %s %s/browse/%s\n", inwardIssue, c.endpoint, inwardIssue)
+		}
+	} else {
+		logBuffer := bytes.NewBuffer(make([]byte, 0))
+		resp.Write(logBuffer)
+		err := fmt.Errorf("Unexpected Response From POST")
+		log.Errorf("%s:\n%s", err, logBuffer)
+		return err
+	}
+	return nil
+}
+
 // CmdBlocks will update the given issue as being "blocked" by the given blocker
 func (c *Cli) CmdBlocks(blocker string, issue string) error {
 	log.Debugf("blocks called")
@@ -562,7 +606,7 @@ func (c *Cli) CmdBlocks(blocker string, issue string) error {
 	}
 	if resp.StatusCode == 201 {
 		c.Browse(issue)
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -607,7 +651,7 @@ func (c *Cli) CmdDups(duplicate string, issue string) error {
 	}
 	if resp.StatusCode == 201 {
 		c.Browse(issue)
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -655,7 +699,7 @@ func (c *Cli) CmdWatch(issue string, watcher string, remove bool) error {
 	}
 	if resp.StatusCode == 204 {
 		c.Browse(issue)
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -699,7 +743,7 @@ func (c *Cli) CmdVote(issue string, up bool) error {
 	}
 	if resp.StatusCode == 204 {
 		c.Browse(issue)
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -722,7 +766,7 @@ func (c *Cli) CmdRankAfter(issue, after string) error {
 	if err != nil {
 		return nil
 	}
-	if !c.opts["quiet"].(bool) {
+	if !c.GetOptBool("quiet", false) {
 		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 	}
 	return nil
@@ -734,7 +778,7 @@ func (c *Cli) CmdRankBefore(issue, before string) error {
 	if err != nil {
 		return nil
 	}
-	if !c.opts["quiet"].(bool) {
+	if !c.GetOptBool("quiet", false) {
 		fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 	}
 	return nil
@@ -785,7 +829,7 @@ func (c *Cli) CmdTransition(issue string, trans string) error {
 		}
 		if resp.StatusCode == 204 {
 			c.Browse(issue)
-			if !c.opts["quiet"].(bool) {
+			if !c.GetOptBool("quiet", false) {
 				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 			}
 		} else {
@@ -855,7 +899,7 @@ func (c *Cli) CmdComment(issue string) error {
 
 		if resp.StatusCode == 201 {
 			c.Browse(issue)
-			if !c.opts["quiet"].(bool) {
+			if !c.GetOptBool("quiet", false) {
 				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 			}
 			return nil
@@ -915,7 +959,7 @@ func (c *Cli) CmdComponent(action string, project string, name string, desc stri
 		return err
 	}
 	if resp.StatusCode == 201 {
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s\n", project, name)
 		}
 	} else {
@@ -950,7 +994,7 @@ func (c *Cli) CmdLabels(action string, issue string, labels []string) error {
 
 		if resp.StatusCode == 204 {
 			c.Browse(issue)
-			if !c.opts["quiet"].(bool) {
+			if !c.GetOptBool("quiet", false) {
 				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 			}
 			return nil
@@ -996,8 +1040,18 @@ func (c *Cli) CmdLabels(action string, issue string, labels []string) error {
 func (c *Cli) CmdAssign(issue string, user string) error {
 	log.Debugf("assign called")
 
+	var userVal interface{} = user
+	// https://docs.atlassian.com/jira/REST/cloud/#api/2/issue-assign
+	// If the name is "-1" automatic assignee is used. A null name will remove the assignee.
+	if user == "" {
+		userVal = nil
+	}
+	if c.GetOptBool("default", false) {
+		userVal = "-1"
+	}
+
 	json, err := jsonEncode(map[string]interface{}{
-		"name": user,
+		"name": userVal,
 	})
 	if err != nil {
 		return err
@@ -1015,7 +1069,7 @@ func (c *Cli) CmdAssign(issue string, user string) error {
 	}
 	if resp.StatusCode == 204 {
 		c.Browse(issue)
-		if !c.opts["quiet"].(bool) {
+		if !c.GetOptBool("quiet", false) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -1028,6 +1082,10 @@ func (c *Cli) CmdAssign(issue string, user string) error {
 	return nil
 }
 
+func (c *Cli) CmdUnassign(issue string) error {
+	return c.CmdAssign(issue, "")
+}
+
 // CmdExportTemplates will export the default templates to the template directory.
 func (c *Cli) CmdExportTemplates() error {
 	dir := c.opts["directory"].(string)

keyring.go

@@ -0,0 +1,17 @@
+// +build !windows
+
+package jira
+
+import "github.com/tmc/keyring"
+
+func keyringGet(user string) (string, error) {
+	password, err := keyring.Get("go-jira", user)
+	if err != nil && err != keyring.ErrNotFound {
+	    return password, err
+	}
+	return password, nil
+}
+
+func keyringSet(user, passwd string) error {
+	return keyring.Set("go-jira", user, passwd)
+}

keyring_windows.go

@@ -0,0 +1,11 @@
+package jira
+
+import "fmt"
+
+func keyringGet(user string) (string, error) {
+	return "", fmt.Errorf("Keyring is not supported for Windows, see: https://github.com/tmc/keyring")
+}
+
+func keyringSet(user, passwd string) error {
+	return fmt.Errorf("Keyring is not supported for Windows, see: https://github.com/tmc/keyring")
+}

main/main.go

@@ -64,6 +64,7 @@ Usage:
   jira subtask ISSUE [--noedit] <Create Options>
   jira DUPLICATE dups ISSUE
   jira BLOCKER blocks ISSUE
+  jira issuelink OUTWARDISSUE ISSUELINKTYPE INWARDISSUE
   jira vote ISSUE [--down]
   jira rank ISSUE (after|before) ISSUE
   jira watch ISSUE [-w WATCHER] [--remove]
@@ -81,7 +82,8 @@ Usage:
   jira comment ISSUE [--noedit] <Edit Options>
   jira (set,add,remove) labels ISSUE [LABEL] ...
   jira take ISSUE
-  jira (assign|give) ISSUE ASSIGNEE
+  jira (assign|give) ISSUE [ASSIGNEE|--default]
+  jira unassign ISSUE
   jira fields
   jira issuelinktypes
   jira transmeta ISSUE
@@ -115,6 +117,7 @@ Query Options:
   -f --queryfields=FIELDS   Fields that are used in "list" template: (default: %s)
   -i --issuetype=ISSUETYPE  The Issue Type
   -l --limit=VAL            Maximum number of results to return in query (default: %d)
+  --start=START             Start parameter for pagination
   -p --project=PROJECT      Project to Search for
   -q --query=JQL            Jira Query Language expression for the search
   -r --reporter=USER        Reporter to search for
@@ -150,6 +153,7 @@ Command Options:
 		"subtask":          "subtask",
 		"dups":             "dups",
 		"blocks":           "blocks",
+		"issuelink":        "issuelink",
 		"watch":            "watch",
 		"trans":            "transition",
 		"transition":       "transition",
@@ -191,6 +195,7 @@ Command Options:
 		"rank":             "rank",
 		"worklog":          "worklog",
 		"addworklog":       "addworklog",
+		"unassign":         "unassign",
 	}
 
 	defaults := map[string]interface{}{
@@ -236,6 +241,7 @@ Command Options:
 		"x|expand=s":            setopt,
 		"s|sort=s":              setopt,
 		"l|limit|max_results=i": setopt,
+		"start|start_at=i":      setopt,
 		"o|override=s%":         &opts,
 		"noedit":                setopt,
 		"edit":                  setopt,
@@ -247,6 +253,7 @@ Command Options:
 		"Q|quiet":               setopt,
 		"unixproxy":             setopt,
 		"down":                  setopt,
+		"default":               setopt,
 	})
 
 	if err := op.ProcessAll(os.Args[1:]); err != nil {
@@ -335,6 +342,9 @@ Command Options:
 
 	var err error
 	switch command {
+	case "issuelink":
+		requireArgs(3)
+		err = c.CmdIssueLink(args[0], args[1], args[2])
 	case "login":
 		err = c.CmdLogin()
 	case "logout":
@@ -496,8 +506,15 @@ Command Options:
 	case "export-templates":
 		err = c.CmdExportTemplates()
 	case "assign":
-		requireArgs(2)
-		err = c.CmdAssign(args[0], args[1])
+		requireArgs(1)
+		assignee := ""
+		if len(args) > 1 {
+			assignee = args[1]
+		}
+		err = c.CmdAssign(args[0], assignee)
+	case "unassign":
+		requireArgs(1)
+		err = c.CmdUnassign(args[0])
 	case "view":
 		requireArgs(1)
 		err = c.CmdView(args[0])

password.go

@@ -7,14 +7,17 @@ import (
 	"strings"
 
 	"github.com/howeyc/gopass"
-	"github.com/tmc/keyring"
 )
 
 func (c *Cli) GetPass(user string) string {
 	passwd := ""
 	if source, ok := c.opts["password-source"].(string); ok {
 		if source == "keyring" {
-			passwd, _ = keyring.Get("go-jira", user)
+			var err error
+			passwd, err = keyringGet(user)
+			if err != nil {
+				panic(err)
+			}
 		} else if source == "pass" {
 			if bin, err := exec.LookPath("pass"); err == nil {
 				buf := bytes.NewBufferString("")
@@ -48,7 +51,7 @@ func (c *Cli) SetPass(user, passwd string) error {
 		log.Debugf("password-source: %s", source)
 		if source == "keyring" {
 			// save password in keychain so that it can be used for subsequent http requests
-			err := keyring.Set("go-jira", user, passwd)
+			err := keyringSet(user, passwd)
 			if err != nil {
 				log.Errorf("Failed to set password in keyring: %s", err)
 				return err

templates.go

@@ -90,19 +90,24 @@ update:
           {{ or .overrides.comment "" | indent 10 }}
 fields:
   summary: {{ or .overrides.summary .fields.summary }}
+{{- if and .meta.fields.components .meta.fields.components.allowedValues }}
   components: # Values: {{ range .meta.fields.components.allowedValues }}{{.name}}, {{end}}{{if .overrides.components }}{{ range (split "," .overrides.components)}}
     - name: {{.}}{{end}}{{else}}{{ range .fields.components }}
-    - name: {{ .name }}{{end}}{{end}}
+    - name: {{ .name }}{{end}}{{end}}{{end}}
+{{- if .meta.fields.assignee}}
   assignee:
-    name: {{ if .overrides.assignee }}{{.overrides.assignee}}{{else}}{{if .fields.assignee }}{{ .fields.assignee.name }}{{end}}{{end}}
+    name: {{ if .overrides.assignee }}{{.overrides.assignee}}{{else}}{{if .fields.assignee }}{{ .fields.assignee.name }}{{end}}{{end}}{{end}}
+{{- if .meta.fields.reporter}}
   reporter:
-    name: {{ if .overrides.reporter }}{{ .overrides.reporter }}{{else if .fields.reporter}}{{ .fields.reporter.name }}{{end}}
+    name: {{ if .overrides.reporter }}{{ .overrides.reporter }}{{else if .fields.reporter}}{{ .fields.reporter.name }}{{end}}{{end}}
+{{- if .meta.fields.customfield_10110}}
   # watchers
   customfield_10110: {{ range .fields.customfield_10110 }}
     - name: {{ .name }}{{end}}{{if .overrides.watcher}}
-    - name: {{ .overrides.watcher}}{{end}}
+    - name: {{ .overrides.watcher}}{{end}}{{end}}
+{{- if .meta.fields.priority }}
   priority: # Values: {{ range .meta.fields.priority.allowedValues }}{{.name}}, {{end}}
-    name: {{ or .overrides.priority .fields.priority.name }}
+    name: {{ or .overrides.priority .fields.priority.name }}{{end}}
   description: |~
     {{ or .overrides.description (or .fields.description "") | indent 4 }}
 # comments:
@@ -191,8 +196,8 @@ fields:
 {{if .meta.fields.fixVersions -}}
   {{if .meta.fields.fixVersions.allowedValues}}
   fixVersions: # Values: {{ range .meta.fields.fixVersions.allowedValues }}{{.name}}, {{end}}{{if .overrides.fixVersions}}{{ range (split "," .overrides.fixVersions)}}
-    - name: {{.}}{{end}}{{else}}{{range .fields.fixVersions}}
-    - name: {{.}}{{end}}{{end}}
+    - name: {{.name}}{{end}}{{else}}{{range .fields.fixVersions}}
+    - name: {{.name}}{{end}}{{end}}
   {{- end -}}
 {{- end -}}
 {{if .meta.fields.issuetype}}