Updated Changelog

fix(http): Add proxy transport

.travis.yml

@@ -1,7 +1,6 @@
-# docker required for the tests (run via prove)
+sudo: true
-sudo: required
+before_install:
-services:
+    - sudo apt-get update && sudo apt-get install -y libgnome-keyring-dev
-  - docker
 
 language: go
 
@@ -15,7 +14,7 @@ script:
   - make vet
   - make lint
   - make
-  - prove -v
+  - JIRACLOUD=1 ./t/100basic.t -w -a 2>&1 
 
 cache:
   directories:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.9 - 2016-12-18
+
+* only warn about needing login when not already running the login command [Cory Bennett] [[6c24e55](https://github.com/Netflix-Skunkworks/go-jira/commit/6c24e55)]
+* fix(http): Add proxy transport [William Hearn] [[4bd740b](https://github.com/Netflix-Skunkworks/go-jira/commit/4bd740b)]
+* fix(http): Add proxy transport [William Hearn] [[2dff6c9](https://github.com/Netflix-Skunkworks/go-jira/commit/2dff6c9)]
+
 ## 0.1.8 - 2016-11-24
 
 * [[#12](https://github.com/Netflix-Skunkworks/go-jira/issues/12)] integrate with keyring for password storage and provide http basic auth credentials for every request since most jira services have websudo enabled with does not allow cookie based authentication [Cory Bennett] [[b8a6e57](https://github.com/Netflix-Skunkworks/go-jira/commit/b8a6e57)]

Makefile

@@ -1,10 +1,10 @@
 PLATFORMS= \
-	freebsd-amd64 \
+	freebsd/amd64 \
-	linux-386 \
+	linux/386 \
-	linux-amd64 \
+	linux/amd64 \
-	windows-386 \
+	windows/386 \
-	windows-amd64 \
+	windows/amd64 \
-	darwin-amd64 \
+	darwin/amd64 \
 	$(NULL)
 
 	# freebsd-386 \
@@ -53,7 +53,7 @@ debug:
 
 src/%:
 	mkdir -p $(@D)
-	test -L $@ || ln -sf '$(GOPATH)' $@
+	test -L $@ || ln -sf '../../..' $@
 	go get -v $* $*/main
 
 vet:
@@ -73,14 +73,21 @@ cross-setup:
 		cd $(GOROOT)/src && sudo GOROOT_BOOTSTRAP=$(GOROOT) GOOS=$${p/-*/} GOARCH=$${p/*-/} bash ./make.bash --no-clean; \
    done
 
-all:
+all: src/gopkg.in/Netflix-Skunkworks/go-jira.v0
-	rm -rf $(DIST); \
+	docker pull karalabe/xgo-latest
-	mkdir -p $(DIST); \
+	rm -rf dist
-	for p in $(PLATFORMS); do \
+	mkdir -p dist
-        echo "Building for $$p"; \
+	docker run --rm -e EXT_GOPATH=/gopath -v $$(pwd):/gopath -e TARGETS="$(PLATFORMS)" -v $$(pwd)/dist:/build karalabe/xgo-latest gopkg.in/Netflix-Skunkworks/go-jira.v0/main
-        ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
+	cd $(DIST) && for x in main-*; do mv $$x jira-$$(echo $$x | cut -c 6-); done
-    done
+
-	for x in $(DIST)/jira-windows-*; do mv $$x $$x.exe; done
+# all:
+# 	rm -rf $(DIST); \
+# 	mkdir -p $(DIST); \
+# 	for p in $(PLATFORMS); do \
+#         echo "Building for $$p"; \
+#         ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
+#     done
+# 	for x in $(DIST)/jira-windows-*; do mv $$x $$x.exe; done
 
 fmt:
 	gofmt -s -w main/*.go *.go

README.md

@@ -38,7 +38,7 @@ jira trans close GOJIRA-321 -o resolution="Won't Fix" --noedit
 # same as above
 jira close GOJIRA-321 -o resolution="Won't Fix"
 
-jira repopen GOJIRA-321 -m "reopening"  # reopen issue
+jira reopen GOJIRA-321 -m "reopening"  # reopen issue
 
 jira watch GOJIRA-321                   # add self as watcher to the issue
 

cli.go

@@ -57,6 +57,7 @@ func New(opts map[string]interface{}) *Cli {
 		}
 	} else {
 		transport := &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
 			TLSClientConfig: &tls.Config{},
 		}
 		if insecureSkipVerify, ok := opts["insecure"].(bool); ok {
@@ -214,12 +215,9 @@ func (c *Cli) makeRequest(req *http.Request) (resp *http.Response, err error) {
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("Content-Type", "application/json")
 
-	if val, ok := c.opts["password-keyring"].(bool); ok && val {
+	if val, ok := c.opts["password-keyring"].(bool); ok && val && !strings.HasSuffix(req.URL.Path, "/rest/auth/1/session") {
 		user, _ := c.opts["user"].(string)
-		password, err := keyring.Get("go-jira", user)
+		password, _ := keyring.Get("go-jira", user)
-		if err != nil {
-			log.Errorf("Failed to load password from keyring: %s", err)
-		}
 		if password == "" {
 			log.Warning("No password for user %s in keyring, please run the 'login' command first", user)
 		} else {

t/.jira.d/config.yml

@@ -1,2 +1,9 @@
-endpoint: http://localhost:8080
+#!/bin/sh
-user: gojira
+if [ -z "$JIRACLOUD" ]; then
+    echo endpoint: http://localhost:8080
+    echo user: gojira
+    echo password-keyring: true
+else
+    echo endpoint: https://go-jira.atlassian.net
+    echo user: gojira@example.com
+fi    

t/000setup.t

@@ -3,6 +3,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
 cd $(dirname $0)
 jira="../jira --user admin"
 
+SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net
 PLAN 15
 
 # clean out any old containers
@@ -25,13 +26,13 @@ docker exec -i go-jira-test tail -f screenlog.0 | grep -m 1 'jira started succes
 RUNS curl -q -L --retry 900 --retry-delay 1 -f -s "http://localhost:8080/rest/api/2/serverInfo?doHealthCheck=1"
 
 # login to jira as admin user
-echo "admin" | RUNS $jira login
+RUNS $jira login
 
 # create gojira user
-RUNS $jira req -M POST /rest/api/2/user '{"name":"gojira","password":"gojira123","emailAddress":"gojira@example.com","displayName":"Go Jira"}'
+RUNS $jira req -M POST /rest/api/2/user '{"name":"gojira","password":"gojira123","emailAddress":"gojira@example.com","displayName":"GoJira"}'
 
-# create mojira user (need secondary user for voting)
+# create mothra user (need secondary user for voting)
-RUNS $jira req -M POST /rest/api/2/user '{"name":"mojira","password":"mojira123","emailAddress":"mojira@example.com","displayName":"Mo Jira"}'
+RUNS $jira req -M POST /rest/api/2/user '{"name":"mothra","password":"mothra123","emailAddress":"mothra@example.com","displayName":"Mothra"}'
 
 # create SCRUM softwareproject
 RUNS $jira req -M POST /rest/api/2/project '{"key":"SCRUM","name":"Scrum","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-scrum-template","lead":"gojira"}'

t/010login.t

@@ -3,6 +3,8 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
 cd $(dirname $0)
 jira=../jira
 
+SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net
+
 PLAN 7
 
 ###############################################################################
@@ -24,6 +26,6 @@ echo "gojira123" | RUNS $jira login
 
 RUNS $jira req /rest/auth/1/session </dev/null
 GREP '"name": "gojira"'
-GREP '"self": "http://localhost:8080/rest/api/latest/user?username=gojira"'
+GREP "\"self\": \"$ENDPOINT/rest/api/latest/user?username=gojira\""
 
 

t/100basic.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project BASIC"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 86
 
 # reset login
@@ -16,11 +21,11 @@ echo "gojira123" | RUNS $jira login
 ###############################################################################
 ## Create an issue
 ###############################################################################
-RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
+RUNS $jira -v -v -v create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -80,7 +85,7 @@ EOF
 
 RUNS $jira done $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -98,13 +103,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -115,8 +120,8 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -153,7 +158,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -162,7 +167,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -194,13 +199,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -208,7 +213,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -235,7 +240,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -257,19 +262,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -278,7 +283,7 @@ EOF
 
 RUNS $jira trans "In Progress" $blocker --noedit
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -287,7 +292,7 @@ EOF
 
 RUNS $jira todo $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -296,7 +301,7 @@ EOF
 
 RUNS $jira trans "review" $blocker --noedit
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -305,7 +310,7 @@ EOF
 
 RUNS $jira todo $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -314,7 +319,7 @@ EOF
 
 RUNS $jira prog $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -323,7 +328,7 @@ EOF
 
 RUNS $jira done $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -354,7 +359,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -375,7 +380,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -386,7 +391,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -414,7 +419,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -442,7 +447,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -465,12 +470,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -481,7 +486,7 @@ status: Done
 summary: blocks
 project: BASIC
 issuetype: Bug
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -498,7 +503,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker

t/110basic-worklog.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project BASIC"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 8
 
 # reset login
@@ -20,7 +25,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -28,7 +33,7 @@ EOF
 ###############################################################################
 RUNS $jira add worklog $issue --comment "work is hard" --time-spent "1h 12m" --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################

t/200scrum.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project SCRUM"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 84
 
 # cleanup from previous failed test executions
@@ -20,7 +25,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -67,7 +72,7 @@ EOF
 
 RUNS $jira done $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -85,13 +90,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -102,8 +107,8 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -140,7 +145,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -149,7 +154,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -181,13 +186,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -195,7 +200,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -222,7 +227,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -244,19 +249,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -265,7 +270,7 @@ EOF
 
 RUNS $jira trans "In Progress" $blocker --noedit
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -274,7 +279,7 @@ EOF
 
 RUNS $jira todo $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -292,7 +297,7 @@ EOF
 
 RUNS $jira todo $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -301,7 +306,7 @@ EOF
 
 RUNS $jira prog $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -310,7 +315,7 @@ EOF
 
 RUNS $jira done $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -341,7 +346,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -362,7 +367,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -373,7 +378,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -401,7 +406,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -429,7 +434,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -452,12 +457,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -468,7 +473,7 @@ status: Done
 summary: blocks
 project: SCRUM
 issuetype: Bug
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -485,7 +490,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker

t/300kanban.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project KANBAN"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 86
 
 # cleanup from previous failed test executions
@@ -20,7 +25,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -67,7 +72,7 @@ EOF
 
 RUNS $jira done $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -85,13 +90,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -102,8 +107,8 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -140,7 +145,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -149,7 +154,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -181,13 +186,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -195,7 +200,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -222,7 +227,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -244,19 +249,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -265,7 +270,7 @@ EOF
 
 RUNS $jira trans "In Progress" $blocker --noedit
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -283,7 +288,7 @@ EOF
 
 RUNS $jira backlog $blocker --noedit
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -301,7 +306,7 @@ EOF
 
 RUNS $jira backlog $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -310,7 +315,7 @@ EOF
 
 RUNS $jira prog $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -319,7 +324,7 @@ EOF
 
 RUNS $jira done $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -350,7 +355,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -371,7 +376,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -382,7 +387,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -410,7 +415,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -438,7 +443,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -461,12 +466,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -477,7 +482,7 @@ status: Done
 summary: blocks
 project: KANBAN
 issuetype: Bug
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[Backlog]
@@ -494,7 +499,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker

t/400project.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project PROJECT"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 84
 
 # cleanup from previous failed test executions
@@ -20,7 +25,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -67,7 +72,7 @@ EOF
 
 RUNS $jira done $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -85,13 +90,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -102,8 +107,8 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -140,7 +145,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -149,7 +154,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -181,13 +186,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -195,7 +200,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -222,7 +227,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -244,19 +249,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -279,12 +284,12 @@ ERROR Invalid Transition 'review', Available: Start Progress, Done
 EOF
 
 ###############################################################################
-## Set it to "Start Progress" and verify that assignee is set to mojira
+## Set it to "Start Progress" and verify that assignee is set to mothra
 ###############################################################################
 
 RUNS $jira start $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -295,7 +300,7 @@ status: In Progress
 summary: blocks
 project: PROJECT
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -311,7 +316,7 @@ EOF
 
 RUNS $jira stop $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 
@@ -321,7 +326,7 @@ EOF
 
 RUNS $jira done $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -352,7 +357,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -373,7 +378,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -384,7 +389,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -395,7 +400,7 @@ status: Done
 summary: blocks
 project: PROJECT
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -412,7 +417,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -423,7 +428,7 @@ status: Done
 summary: blocks
 project: PROJECT
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -440,7 +445,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -451,7 +456,7 @@ status: Done
 summary: blocks
 project: PROJECT
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -468,7 +473,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -491,12 +496,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -507,7 +512,7 @@ status: Done
 summary: blocks
 project: PROJECT
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]

t/500process.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project PROCESS"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 84
 
 # cleanup from previous failed test executions
@@ -21,7 +26,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -69,13 +74,13 @@ EOF
 
 RUNS $jira start $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 
 RUNS $jira stop $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -93,13 +98,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -112,9 +117,9 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -151,7 +156,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -160,7 +165,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -192,13 +197,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -206,7 +211,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -233,7 +238,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -255,19 +260,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -295,7 +300,7 @@ EOF
 
 RUNS $jira start $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -304,7 +309,7 @@ EOF
 
 RUNS $jira stop $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 
@@ -314,7 +319,7 @@ EOF
 
 RUNS $jira reopen $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -345,7 +350,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -366,7 +371,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -377,7 +382,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -405,7 +410,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -433,7 +438,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -456,12 +461,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -472,7 +477,7 @@ status: Open
 summary: blocks
 project: PROCESS
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[Open]
@@ -489,7 +494,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker

t/600task.t

@@ -4,6 +4,11 @@ cd $(dirname $0)
 jira="../jira --project TASK"
 export JIRA_LOG_FORMAT="%{level:-5s} %{message}"
 
+ENDPOINT="http://localhost:8080"
+if [ -n "$JIRACLOUD" ]; then
+    ENDPOINT="https://go-jira.atlassian.net"
+fi
+
 PLAN 82
 
 # cleanup from previous failed test executions
@@ -20,7 +25,7 @@ RUNS $jira create -o summary=summary -o description=description --noedit --saveF
 issue=$(awk '/issue/{print $2}' issue.props)
 
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -67,7 +72,7 @@ EOF
 
 RUNS $jira done $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 ###############################################################################
@@ -85,13 +90,13 @@ EOF
 RUNS $jira create -o summary=summary -o description=description --noedit --saveFile issue.props
 issue=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira create -o summary=dup -o description=dup --noedit --saveFile issue.props
 dup=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 ###############################################################################
@@ -104,8 +109,8 @@ EOF
 
 RUNS $jira $dup dups $issue --noedit
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
-OK $dup http://localhost:8080/browse/$dup
+OK $dup $ENDPOINT/browse/$dup
 EOF
 
 RUNS $jira $issue
@@ -142,7 +147,7 @@ EOF
 RUNS $jira create -o summary=blocks -o description=blocks --noedit --saveFile issue.props
 blocker=$(awk '/issue/{print $2}' issue.props)
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -151,7 +156,7 @@ EOF
 
 RUNS $jira $blocker blocks $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -183,13 +188,13 @@ $(printf %-12s $blocker:) blocks
 EOF
 
 ###############################################################################
-# reset login for mojira for voting
+# reset login for mothra for voting
 ###############################################################################
 
-jira="$jira --user mojira"
+jira="$jira --user mothra"
 
 RUNS $jira logout
-echo "mojira123" | RUNS $jira login
+echo "mothra123" | RUNS $jira login
 
 ###############################################################################
 ## vote for main issue, verify it shows when viewing the issue
@@ -197,7 +202,7 @@ echo "mojira123" | RUNS $jira login
 
 RUNS $jira vote $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -224,7 +229,7 @@ EOF
 
 RUNS $jira vote $issue --down
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -246,19 +251,19 @@ description: |
 EOF
 
 ###############################################################################
-## set mojira user as watcher to issue and verify from REST api
+## set mothra user as watcher to issue and verify from REST api
 ###############################################################################
 
 RUNS $jira watch $issue
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 # FIXME we probably need a watchers command to wrap this?
 RUNS sh -c "$jira req /rest/api/2/issue/$issue/watchers | jq -r .watchers[].name"
 DIFF <<EOF
 gojira
-mojira
+mothra
 EOF
 
 ###############################################################################
@@ -305,7 +310,7 @@ EOF
 
 RUNS $jira done $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 ###############################################################################
@@ -336,7 +341,7 @@ EOF
 
 RUNS $jira comment $issue --noedit -m "Yo, Comment"
 DIFF <<EOF
-OK $issue http://localhost:8080/browse/$issue
+OK $issue $ENDPOINT/browse/$issue
 EOF
 
 RUNS $jira $issue
@@ -357,7 +362,7 @@ description: |
   description
 
 comments:
-  - | # mojira, a minute ago
+  - | # mothra, a minute ago
     Yo, Comment
 
 EOF
@@ -368,7 +373,7 @@ EOF
 
 RUNS $jira add labels $blocker test-label another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -396,7 +401,7 @@ EOF
 
 RUNS $jira remove labels $blocker another-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -424,7 +429,7 @@ EOF
 
 RUNS $jira set labels $blocker more-label better-label
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -447,12 +452,12 @@ description: |
 EOF
 
 ###############################################################################
-## Verify that "mojira" user can take the issue (reassign to self)
+## Verify that "mothra" user can take the issue (reassign to self)
 ###############################################################################
 
 RUNS $jira take $blocker
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker
@@ -463,7 +468,7 @@ status: Done
 summary: blocks
 project: TASK
 issuetype: Task
-assignee: mojira
+assignee: mothra
 reporter: gojira
 blockers: 
 depends: $issue[To Do]
@@ -480,7 +485,7 @@ EOF
 
 RUNS $jira give $blocker gojira
 DIFF <<EOF
-OK $blocker http://localhost:8080/browse/$blocker
+OK $blocker $ENDPOINT/browse/$blocker
 EOF
 
 RUNS $jira $blocker