From 716dc054886fd83934999bed6b399965ad2c2f9b Mon Sep 17 00:00:00 2001
From: Gavin Bunney <gavin.bunney@gmail.com>
Date: Tue, 8 Oct 2019 11:12:06 -0700
Subject: [PATCH] Added local bitbucket testing scripts; fix username passing
 for travis build

---
 .gitignore                      |  1 +
 .travis.yml                     |  2 +-
 Makefile                        |  9 +++++++++
 scripts/start-docker-compose.sh | 14 ++++++++++----
 scripts/stop-docker-compose.sh  |  7 +++++++
 5 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100755 scripts/stop-docker-compose.sh

diff --git a/.gitignore b/.gitignore
index 50d76dd..e51f2c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ website/vendor
 !command/test-fixtures/**/.terraform/
 
 scripts/gogetcookie.sh
+docker-compose
diff --git a/.travis.yml b/.travis.yml
index d76dd2d..343368f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
 script:
   - bash scripts/start-docker-compose.sh
   - make build
-  - BITBUCKET_SERVER=http://localhost:7990 BITBUCKER_USERNAME=admin BITBUCKET_PASSWORD=admin make testacc
+  - BITBUCKET_SERVER=http://localhost:7990 BITBUCKET_USERNAME=admin BITBUCKET_PASSWORD=admin make testacc
 
 matrix:
   fast_finish: true
diff --git a/Makefile b/Makefile
index c497b3d..cd14cfc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,10 @@ GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 PKG_NAME=bitbucket
 export GO111MODULE=on
 
+export BITBUCKET_SERVER=http://localhost:7990
+export BITBUCKET_USERNAME=admin
+export BITBUCKET_PASSWORD=admin
+
 default: build
 
 build: fmtcheck
@@ -16,6 +20,11 @@ test: fmtcheck
 testacc: fmtcheck
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -count=1
 
+testacc-bitbucket: fmtcheck
+	@sh scripts/start-docker-compose.sh
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -count=1
+	@sh scripts/stop-docker-compose.sh
+
 vet:
 	@echo "go vet ."
 	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
diff --git a/scripts/start-docker-compose.sh b/scripts/start-docker-compose.sh
index 1281f4c..86e5836 100755
--- a/scripts/start-docker-compose.sh
+++ b/scripts/start-docker-compose.sh
@@ -1,12 +1,18 @@
 #!/bin/bash
 set -e
 
-echo "--> Downloading docker-compose"
-curl -L https://github.com/docker/compose/releases/download/1.20.1/docker-compose-`uname -s`-`uname -m` > docker-compose
-chmod +x docker-compose
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+cd ${DIR}
+
+if [ ! -f ${DIR}/docker-compose ]; then
+  echo "--> Downloading docker-compose"
+  curl -L https://github.com/docker/compose/releases/download/1.20.1/docker-compose-`uname -s`-`uname -m` > ${DIR}/docker-compose
+  chmod +x ${DIR}/docker-compose
+fi
 
 echo "--> Starting docker-compose"
-docker-compose up -d
+${DIR}/docker-compose up -d
 
 echo "--> Wait for bitbucket to be ready"
 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:7990/status)" != "200" ]]; do sleep 5; done'
diff --git a/scripts/stop-docker-compose.sh b/scripts/stop-docker-compose.sh
new file mode 100755
index 0000000..7d30322
--- /dev/null
+++ b/scripts/stop-docker-compose.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+echo "--> Stopping docker-compose"
+${DIR}/docker-compose down