update version tag to prefix with v

Add insecure option for TLS endpoints

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.0.20 - 2016-01-21
+
+* [issue [#28](https://github.com/Netflix-Skunkworks/go-jira/issues/28)] check to make sure we got back issuetypes for create metadata [Cory Bennett] [[ee0e780](https://github.com/Netflix-Skunkworks/go-jira/commit/ee0e780)]
+* Add insecure option for TLS endpoints [Brian Lalor] [[6a88bb9](https://github.com/Netflix-Skunkworks/go-jira/commit/6a88bb9)]
+* Correct naming of parameter: set/add/remove are actions. [Mike Pountney] [[303784f](https://github.com/Netflix-Skunkworks/go-jira/commit/303784f)]
+* Tweak CmdLabels args so that magic happens with CLI [Mike Pountney] [[40a7c65](https://github.com/Netflix-Skunkworks/go-jira/commit/40a7c65)]
+* Expose ViewTicket as per FindIssues [Mike Pountney] [[8977f3d](https://github.com/Netflix-Skunkworks/go-jira/commit/8977f3d)]
+* Add exposed versions of getTemplate and runTemplate [Mike Pountney] [[da6cbd5](https://github.com/Netflix-Skunkworks/go-jira/commit/da6cbd5)]
+* Add 'labels' command to set/add/remove labels [Mike Pountney] [[230b52d](https://github.com/Netflix-Skunkworks/go-jira/commit/230b52d)]
+* Add a 'join' func to the template engine [Mike Pountney] [[a7820fe](https://github.com/Netflix-Skunkworks/go-jira/commit/a7820fe)]
+* make "jira" golang package, move code from jira/cli to root, move jira/main.go to main/main.go [Cory Bennett] [[7268b9e](https://github.com/Netflix-Skunkworks/go-jira/commit/7268b9e)]
+
+## 0.0.19 - 2015-12-09
+
+* fix jira trans TRANS ISSUE (case sensitivity issue), also go fmt [Cory Bennett] [[3c30f3b](https://github.com/Netflix-Skunkworks/go-jira/commit/3c30f3b)]
+
+## 0.0.18 - 2015-12-03
+
+* need to default "quiet" to false [Cory Bennett] [[4f4a89b](https://github.com/Netflix-Skunkworks/go-jira/commit/4f4a89b)]
+
 ## 0.0.17 - 2015-12-03
 
 * add --quiet command to not print the OK .. add --saveFile option to print the issue/link to a file on create command [Cory Bennett] [[c9ac162](https://github.com/Netflix-Skunkworks/go-jira/commit/c9ac162)]

Makefile

@@ -14,20 +14,32 @@ PLATFORMS= \
 	$(NULL)
 
 DIST=$(shell pwd)/dist
+
 export GOPATH=$(shell pwd)
-GOBIN ?= $(shell pwd)/bin
+
+GOBIN ?= $(shell pwd)
 NAME=jira
 
+BIN ?= $(GOBIN)/$(NAME)
+
 CURVER ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags || grep ^\#\# CHANGELOG.md | awk '{print $$2; exit}')
-LDFLAGS:=-X main.buildVersion=$(CURVER)
+LDFLAGS:=-X jira.VERSION=$(patsubst v%,%,$(CURVER)) -w
+
+# use make DEBUG=1 and you can get a debuggable golang binary
+# see https://github.com/mailgun/godebug
+ifneq ($(DEBUG),)
+	GOBUILD=go get -v github.com/mailgun/godebug && ./bin/godebug build
+else
+	GOBUILD=go build -v -ldflags "$(LDFLAGS) -s"
+endif
 
 build: src/github.com/Netflix-Skunkworks/go-jira
-	go build -ldflags "$(LDFLAGS)" -o $(GOBIN)/$(NAME) jira/main.go
+	$(GOBUILD) -o $(BIN) main/main.go
 
 src/%:
 	mkdir -p $(@D)
 	test -L $@ || ln -sf ../../.. $@
-	go get -v $*/jira
+	go get -v $* $*/main
 
 cross-setup:
 	for p in $(PLATFORMS); do \
@@ -40,33 +52,36 @@ all:
 	mkdir -p $(DIST); \
 	for p in $(PLATFORMS); do \
         echo "Building for $$p"; \
-        GOOS=$${p/-*/} GOARCH=$${p/*-/} go build -v -ldflags "$(LDFLAGS) -s" -o $(DIST)/$(NAME)-$$p jira/main.go ; \
+        ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
     done
 
 fmt:
-	gofmt -s -w jira
+	gofmt -s -w main/*.go *.go
 
 install:
-	export GOBIN=~/bin && ${MAKE} build
+	${MAKE} GOBIN=~/bin build
 
 NEWVER ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
 TODAY  := $(shell date +%Y-%m-%d)
 
 changes:
-	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^$(CURVER) HEAD jira | grep -v gofmt | grep -v "bump version"
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^$(CURVER) HEAD main/*.go *.go | grep -vE 'gofmt|go fmt'
 
-update-changelog: 
+update-changelog:
 	@echo "# Changelog" > CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
 	echo "## $(NEWVER) - $(TODAY)" >> CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
-	$(MAKE) changes | \
+	$(MAKE) --no-print-directory --silent changes | \
 	perl -pe 's{\[([a-f0-9]+)\]}{[[$$1](https://github.com/Netflix-Skunkworks/go-jira/commit/$$1)]}g' | \
 	perl -pe 's{\#(\d+)}{[#$$1](https://github.com/Netflix-Skunkworks/go-jira/issues/$$1)}g' >> CHANGELOG.md.new; \
-	tail +2 CHANGELOG.md >> CHANGELOG.md.new; \
+	tail -n +2 CHANGELOG.md >> CHANGELOG.md.new; \
 	mv CHANGELOG.md.new CHANGELOG.md; \
 	git commit -m "Updated Changelog" CHANGELOG.md; \
-	git tag $(NEWVER)
+	git tag v$(NEWVER)
+
+version:
+	@echo $(patsubst v%,%,$(CURVER))
 
 clean:
-	rm -rf pkg dist bin src ./toolkit
+	rm -rf pkg dist bin src ./$(NAME)

cli.go

@@ -1,7 +1,8 @@
-package cli
+package jira
 
 import (
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"github.com/kballard/go-shellquote"
@@ -18,7 +19,10 @@ import (
 	"time"
 )
 
-var log = logging.MustGetLogger("jira.cli")
+var (
+	log     = logging.MustGetLogger("jira")
+	VERSION string
+)
 
 type Cli struct {
 	endpoint   *url.URL
@@ -33,15 +37,26 @@ func New(opts map[string]interface{}) *Cli {
 	endpoint, _ := opts["endpoint"].(string)
 	url, _ := url.Parse(strings.TrimRight(endpoint, "/"))
 
+	transport := &http.Transport{
+		TLSClientConfig: &tls.Config{},
+	}
+
 	if project, ok := opts["project"].(string); ok {
 		opts["project"] = strings.ToUpper(project)
 	}
 
+	if insecureSkipVerify, ok := opts["insecure"].(bool); ok {
+		transport.TLSClientConfig.InsecureSkipVerify = insecureSkipVerify
+	}
+
 	cli := &Cli{
 		endpoint:   url,
 		opts:       opts,
 		cookieFile: fmt.Sprintf("%s/.jira.d/cookies.js", homedir),
-		ua:         &http.Client{Jar: cookieJar},
+		ua: &http.Client{
+			Jar:       cookieJar,
+			Transport: transport,
+		},
 	}
 
 	cli.ua.Jar.SetCookies(url, cli.loadCookies())
@@ -174,6 +189,10 @@ func (c *Cli) makeRequest(req *http.Request) (resp *http.Response, err error) {
 	return resp, nil
 }
 
+func (c *Cli) GetTemplate(name string) string {
+	return c.getTemplate(name)
+}
+
 func (c *Cli) getTemplate(name string) string {
 	if override, ok := c.opts["template"].(string); ok {
 		if _, err := os.Stat(override); err == nil {
@@ -361,6 +380,16 @@ func (c *Cli) SaveData(data interface{}) error {
 	return nil
 }
 
+func (c *Cli) ViewIssue(issue string) (interface{}, error) {
+	uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
+	data, err := responseToJson(c.get(uri))
+	if err != nil {
+		return nil, err
+	} else {
+		return data, nil
+	}
+}
+
 func (c *Cli) FindIssues() (interface{}, error) {
 	var query string
 	var ok bool

commands.go

@@ -1,4 +1,4 @@
-package cli
+package jira
 
 import (
 	"bytes"
@@ -80,12 +80,10 @@ func (c *Cli) CmdList() error {
 func (c *Cli) CmdView(issue string) error {
 	log.Debug("view called")
 	c.Browse(issue)
-	uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
-	data, err := responseToJson(c.get(uri))
+	data, err := c.ViewIssue(issue)
 	if err != nil {
 		return err
 	}
-
 	return runTemplate(c.getTemplate("view"), data, nil)
 }
 
@@ -126,7 +124,7 @@ func (c *Cli) CmdEdit(issue string) error {
 
 			if resp.StatusCode == 204 {
 				c.Browse(issueData["key"].(string))
-				if ! c.opts["quiet"].(bool) {
+				if !c.opts["quiet"].(bool) {
 					fmt.Printf("OK %s %s/browse/%s\n", issueData["key"], c.endpoint, issueData["key"])
 				}
 				return nil
@@ -235,6 +233,11 @@ func (c *Cli) CmdCreate() error {
 			return err
 		}
 		if val, ok = val.([]interface{})[0].(map[string]interface{})["issuetypes"]; ok {
+			if len(val.([]interface{})) == 0 {
+				err = fmt.Errorf("Project '%s' does not support issuetype '%s'.  Unable to create issue.", project, issuetype)
+				log.Error("%s", err)
+				return err
+			}
 			issueData["meta"] = val.([]interface{})[0]
 		}
 	}
@@ -267,9 +270,9 @@ func (c *Cli) CmdCreate() error {
 					c.Browse(key)
 					c.SaveData(map[string]string{
 						"issue": key,
-						"link": link,
+						"link":  link,
 					})
-					if ! c.opts["quiet"].(bool) {
+					if !c.opts["quiet"].(bool) {
 						fmt.Printf("OK %s %s\n", key, link)
 					}
 				}
@@ -326,7 +329,7 @@ func (c *Cli) CmdBlocks(blocker string, issue string) error {
 	}
 	if resp.StatusCode == 201 {
 		c.Browse(issue)
-		if ! c.opts["quiet"].(bool) {
+		if !c.opts["quiet"].(bool) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -369,7 +372,7 @@ func (c *Cli) CmdDups(duplicate string, issue string) error {
 	}
 	if resp.StatusCode == 201 {
 		c.Browse(issue)
-		if ! c.opts["quiet"].(bool) {
+		if !c.opts["quiet"].(bool) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -403,7 +406,7 @@ func (c *Cli) CmdWatch(issue string) error {
 	}
 	if resp.StatusCode == 204 {
 		c.Browse(issue)
-		if ! c.opts["quiet"].(bool) {
+		if !c.opts["quiet"].(bool) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -432,7 +435,7 @@ func (c *Cli) CmdTransition(issue string, trans string) error {
 		name := transition.(map[string]interface{})["name"].(string)
 		id := transition.(map[string]interface{})["id"].(string)
 		found = append(found, name)
-		if strings.Contains(strings.ToLower(name), trans) {
+		if strings.Contains(strings.ToLower(name), strings.ToLower(trans)) {
 			transName = name
 			transId = id
 			transMeta = transition.(map[string]interface{})
@@ -459,7 +462,7 @@ func (c *Cli) CmdTransition(issue string, trans string) error {
 		}
 		if resp.StatusCode == 204 {
 			c.Browse(issue)
-			if ! c.opts["quiet"].(bool) {
+			if !c.opts["quiet"].(bool) {
 				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 			}
 		} else {
@@ -512,7 +515,7 @@ func (c *Cli) CmdComment(issue string) error {
 
 		if resp.StatusCode == 201 {
 			c.Browse(issue)
-			if ! c.opts["quiet"].(bool) {
+			if !c.opts["quiet"].(bool) {
 				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 			}
 			return nil
@@ -544,6 +547,71 @@ func (c *Cli) CmdComment(issue string) error {
 	return nil
 }
 
+func (c *Cli) CmdLabels(action string, issue string, labels []string) error {
+	log.Debug("label called")
+
+	if action != "add" && action != "remove" && action != "set" {
+		return fmt.Errorf("action must be 'add', 'set' or 'remove': %q is invalid", action)
+	}
+
+	handlePut := func(json string) error {
+		log.Debug("JSON: %s", json)
+		uri := fmt.Sprintf("%s/rest/api/2/issue/%s", c.endpoint, issue)
+		if c.getOptBool("dryrun", false) {
+			log.Debug("PUT: %s", json)
+			log.Debug("Dryrun mode, skipping POST")
+			return nil
+		}
+		resp, err := c.put(uri, json)
+		if err != nil {
+			return err
+		}
+
+		if resp.StatusCode == 204 {
+			c.Browse(issue)
+			if !c.opts["quiet"].(bool) {
+				fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
+			}
+			return nil
+		} else {
+			logBuffer := bytes.NewBuffer(make([]byte, 0))
+			resp.Write(logBuffer)
+			err := fmt.Errorf("Unexpected Response From PUT")
+			log.Error("%s:\n%s", err, logBuffer)
+			return err
+		}
+	}
+
+	var labels_json string
+	var err error
+	if action == "set" {
+		labelsActions := make([]map[string][]string, 1)
+		labelsActions[0] = map[string][]string{
+			"set": labels,
+		}
+		labels_json, err = jsonEncode(map[string]interface{}{
+			"labels": labelsActions,
+		})
+	} else {
+		labelsActions := make([]map[string]string, len(labels))
+		for i, label := range labels {
+			labelActionMap := map[string]string{
+				action: label,
+			}
+			labelsActions[i] = labelActionMap
+		}
+		labels_json, err = jsonEncode(map[string]interface{}{
+			"labels": labelsActions,
+		})
+	}
+	if err != nil {
+		return err
+	}
+	json := fmt.Sprintf("{ \"update\": %s }", labels_json)
+	return handlePut(json)
+
+}
+
 func (c *Cli) CmdAssign(issue string, user string) error {
 	log.Debug("assign called")
 
@@ -566,7 +634,7 @@ func (c *Cli) CmdAssign(issue string, user string) error {
 	}
 	if resp.StatusCode == 204 {
 		c.Browse(issue)
-		if ! c.opts["quiet"].(bool) {
+		if !c.opts["quiet"].(bool) {
 			fmt.Printf("OK %s %s/browse/%s\n", issue, c.endpoint, issue)
 		}
 	} else {
@@ -609,13 +677,13 @@ func (c *Cli) CmdExportTemplates() error {
 func (c *Cli) CmdRequest(uri, content string) (err error) {
 	log.Debug("request called")
 
-	if ! strings.HasPrefix(uri, "http") {
+	if !strings.HasPrefix(uri, "http") {
 		uri = fmt.Sprintf("%s%s", c.endpoint, uri)
 	}
 
 	method := strings.ToUpper(c.opts["method"].(string))
 	var data interface{}
-	if  method == "GET" {
+	if method == "GET" {
 		data, err = responseToJson(c.get(uri))
 	} else if method == "POST" {
 		data, err = responseToJson(c.post(uri, content))

main/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/Netflix-Skunkworks/go-jira/jira/cli"
+	"github.com/Netflix-Skunkworks/go-jira"
 	"github.com/coryb/optigo"
 	"github.com/op/go-logging"
 	"gopkg.in/coryb/yaml.v2"
@@ -14,10 +14,9 @@ import (
 )
 
 var (
-	log = logging.MustGetLogger("jira")
+	log    = logging.MustGetLogger("jira")
 	format = "%{color}%{time:2006-01-02T15:04:05.000Z07:00} %{level:-5s} [%{shortfile}]%{color:reset} %{message}"
-	buildVersion string
-)	
+)
 
 func main() {
 	logBackend := logging.NewLogBackend(os.Stderr, "", 0)
@@ -66,6 +65,7 @@ Usage:
   jira start ISSUE [--edit] <Edit Options>
   jira stop ISSUE [--edit] <Edit Options>
   jira comment ISSUE [--noedit] <Edit Options>
+  jira (set,add,remove) labels ISSUE [LABEL] ...
   jira take ISSUE
   jira (assign|give) ISSUE ASSIGNEE
   jira fields
@@ -84,6 +84,7 @@ Usage:
 General Options:
   -b --browse         Open your browser to the Jira issue
   -e --endpoint=URI   URI to use for jira
+  -k --insecure       disable TLS certificate verification
   -h --help           Show this usage
   -t --template=FILE  Template file to use for output/editing
   -u --user=USER      Username to use for authenticaion (default: %s)
@@ -137,6 +138,8 @@ Command Options:
 		"start":            "start",
 		"stop":             "stop",
 		"comment":          "comment",
+		"label":            "labels",
+		"labels":           "labels",
 		"take":             "take",
 		"assign":           "assign",
 		"give":             "assign",
@@ -161,6 +164,7 @@ Command Options:
 		"sort":        defaultSort,
 		"max_results": defaultMaxResults,
 		"method":      "GET",
+		"quiet":       false,
 	}
 	opts := make(map[string]interface{})
 
@@ -171,7 +175,7 @@ Command Options:
 	op := optigo.NewDirectAssignParser(map[string]interface{}{
 		"h|help": usage,
 		"version": func() {
-			fmt.Println(fmt.Sprintf("version: %s", buildVersion))
+			fmt.Println(fmt.Sprintf("version: %s", jira.VERSION))
 			os.Exit(0)
 		},
 		"v|verbose+": func() {
@@ -182,6 +186,7 @@ Command Options:
 		"editor=s":              setopt,
 		"u|user=s":              setopt,
 		"endpoint=s":            setopt,
+		"k|insecure":            setopt,
 		"t|template=s":          setopt,
 		"q|query=s":             setopt,
 		"p|project=s":           setopt,
@@ -216,6 +221,7 @@ Command Options:
 			args = args[1:]
 		} else if len(args) > 1 {
 			// look at second arg for "dups" and "blocks" commands
+			// also for 'set/add/remove' actions like 'labels'
 			if alias, ok := jiraCommands[args[1]]; ok {
 				command = alias
 				args = append(args[:1], args[2:]...)
@@ -257,7 +263,7 @@ Command Options:
 		os.Exit(1)
 	}
 
-	c := cli.New(opts)
+	c := jira.New(opts)
 
 	log.Debug("opts: %s", opts)
 
@@ -305,7 +311,7 @@ Command Options:
 				for _, issue := range issues {
 					if err = c.CmdEdit(issue.(map[string]interface{})["key"].(string)); err != nil {
 						switch err.(type) {
-						case cli.NoChangesFound:
+						case jira.NoChangesFound:
 							log.Warning("No Changes found: %s", err)
 							err = nil
 							continue
@@ -348,7 +354,7 @@ Command Options:
 	case "transition":
 		requireArgs(2)
 		setEditing(true)
-		err = c.CmdTransition(args[0], args[1])
+		err = c.CmdTransition(args[1], args[0])
 	case "close":
 		requireArgs(1)
 		setEditing(false)
@@ -377,6 +383,12 @@ Command Options:
 		requireArgs(1)
 		setEditing(true)
 		err = c.CmdComment(args[0])
+	case "labels":
+		requireArgs(2)
+		action := args[0]
+		issue := args[1]
+		labels := args[2:]
+		err = c.CmdLabels(action, issue, labels)
 	case "take":
 		requireArgs(1)
 		err = c.CmdAssign(args[0], opts["user"].(string))
@@ -440,9 +452,9 @@ func populateEnv(opts map[string]interface{}) {
 
 func loadConfigs(opts map[string]interface{}) {
 	populateEnv(opts)
-	paths := cli.FindParentPaths(".jira.d/config.yml")
+	paths := jira.FindParentPaths(".jira.d/config.yml")
 	// prepend
-	paths = append([]string{"/etc/jira-cli.yml"}, paths...)
+	paths = append([]string{"/etc/go-jira.yml"}, paths...)
 
 	// iterate paths in reverse
 	for i := len(paths) - 1; i >= 0; i-- {

templates.go

@@ -1,4 +1,4 @@
-package cli
+package jira
 
 var all_templates = map[string]string{
 	"debug":          default_debug_template,

util.go

@@ -1,4 +1,4 @@
-package cli
+package jira
 
 import (
 	"bufio"
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"gopkg.in/coryb/yaml.v2"
 	"github.com/mgutz/ansi"
+	"gopkg.in/coryb/yaml.v2"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -109,8 +109,11 @@ func dateFormat(format string, content string) (string, error) {
 	}
 }
 
-func runTemplate(templateContent string, data interface{}, out io.Writer) error {
+func RunTemplate(templateContent string, data interface{}, out io.Writer) error {
+	return runTemplate(templateContent, data, out)
+}
 
+func runTemplate(templateContent string, data interface{}, out io.Writer) error {
 	if out == nil {
 		out = os.Stdout
 	}
@@ -161,6 +164,13 @@ func runTemplate(templateContent string, data interface{}, out io.Writer) error
 		"split": func(sep string, content string) []string {
 			return strings.Split(content, sep)
 		},
+		"join": func(sep string, content []interface{}) string {
+			vals := make([]string, len(content))
+			for i, v := range content {
+				vals[i] = v.(string)
+			}
+			return strings.Join(vals, sep)
+		},
 		"abbrev": func(max int, content string) string {
 			if len(content) > max {
 				var buffer bytes.Buffer