Implement build-harness support (#11)

Author: goruha

.editorconfig

@@ -0,0 +1,8 @@
+# Override for Makefile
+[{Makefile, makefile, GNUmakefile}]
+indent_style = tab
+indent_size = 4
+
+[Makefile.*]
+indent_style = tab
+indent_size = 4

.gitignore

@@ -20,7 +20,6 @@ _cgo_export.*
 _testmain.go
 
 *.exe
-*.test
 *.prof
 
 .idea
@@ -39,3 +38,5 @@ github-authorized-keys
 glide.lock
 .glide
 vendor/
+
+build-harness/

.travis.yml

@@ -1,15 +1,19 @@
 sudo: required
 env:
-  - DOCKER_IMAGE_NAME=cloudposse/github-authorized-keys
+  global:
+    - DOCKER_IMAGE_NAME=clo/udposse/github-authorized-keys
+    - RUN_TESTS=1
+    - TEST_GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
+    - TEST_GITHUB_ORGANIZATION=${GITHUB_ORGANIZATION}
+    - TEST_GITHUB_TEAM=${GITHUB_TEAM}
+    - TEST_GITHUB_TEAM_ID=${GITHUB_TEAM_ID}
+    - TEST_GITHUB_USER=${GITHUB_USER}
+    - TEST_ETCD_ENDPOINT=http://${ETCD_IP}:2379
 services:
 - docker
 install:
-- |-
-  docker login \
-    --email="$DOCKER_HUB_EMAIL" \
-    --username="$DOCKER_HUB_USERNAME" \
-    --password="$DOCKER_HUB_PASSWORD"
-
+- make init
+- make docker:login
 - pip install docker-compose
 
 script:
@@ -19,45 +23,16 @@ script:
 - docker-compose -f docker-compose-test.yaml up -d
 
 - |-
-  docker build --tag test \
-    --build-arg RUN_TESTS=1 \
-    --build-arg TEST_GITHUB_API_TOKEN=${GITHUB_API_TOKEN} \
-    --build-arg TEST_GITHUB_ORGANIZATION=${GITHUB_ORGANIZATION} \
-    --build-arg TEST_GITHUB_TEAM=${GITHUB_TEAM} \
-    --build-arg TEST_GITHUB_TEAM_ID=${GITHUB_TEAM_ID} \
-    --build-arg TEST_GITHUB_USER=${GITHUB_USER} \
-    --build-arg TEST_ETCD_ENDPOINT=http://${ETCD_IP}:2379 \
-    ./
+  make docker:build \
+    ARGS="RUN_TESTS \
+          TEST_GITHUB_API_TOKEN \
+          TEST_GITHUB_ORGANIZATION \
+          TEST_GITHUB_TEAM \
+          TEST_GITHUB_TEAM_ID \
+          TEST_GITHUB_USER \
+          TEST_ETCD_ENDPOINT \
+          "
 
 after_success:
-- docker build -t $DOCKER_IMAGE_NAME .
-
-- |-
-  if [ ! -z "$TRAVIS_TAG" ]; then \
-    docker tag $DOCKER_IMAGE_NAME  $DOCKER_IMAGE_NAME:$TRAVIS_TAG &&  \
-    docker push $DOCKER_IMAGE_NAME:$TRAVIS_TAG; \
-  fi
-
-- |-
-  if [ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]; then \
-    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:pr-$TRAVIS_PULL_REQUEST_BRANCH && \
-    docker push $DOCKER_IMAGE_NAME:pr-$TRAVIS_PULL_REQUEST_BRANCH; \
-  fi
-
-- |-
-  if [[ -z "$TRAVIS_PULL_REQUEST_BRANCH" && ! -z "$TRAVIS_BRANCH" ]]; then \
-    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_BRANCH && \
-    docker push $DOCKER_IMAGE_NAME:$TRAVIS_BRANCH; \
-  fi
-
-- |-
-  if [[ -z "$TRAVIS_TAG"  &&  -z "$TRAVIS_PULL_REQUEST_BRANCH"  &&  -z "$TRAVIS_BRANCH" ]]; then \
-    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest && \
-    docker push $DOCKER_IMAGE_NAME:latest; \
-  fi
-
-- |-
-  if [[ -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]  && [[ "$TRAVIS_BRANCH" == "master" ]]; then \
-    docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest && \
-    docker push $DOCKER_IMAGE_NAME:latest; \
-  fi
+- make docker:build
+- make travis:docker-tag-and-push

Dockerfile

@@ -26,9 +26,14 @@ RUN set -ex \
 		git \
 		make \
 		curl \
-		&& curl https://glide.sh/get | sh \
-		&& make deps \
-		&& ( [[ $RUN_TESTS -eq 0 ]]  ||  make test; )  \
+		bash \
+		&& make init \
+    && make go:deps-dev \
+    && make go:lint \
+		&& make go:deps-build \
+		&& make go:deps \
+		&& ( [[ $RUN_TESTS -eq 0 ]]  ||  make go:test; )  \
+    && make go:build \
 		&& go-wrapper install \
 		&& rm -rf  /go/src \
 		&& apk del .build-deps

Makefile

@@ -1,73 +1,22 @@
-GO	:= $(shell which go)
-GLIDE	:= $(shell which glide)
-APP	?= github-authorized-keys
-INSTALL_DIR ?= /usr/local/sbin
+SHELL = /bin/bash
+export BUILD_HARNESS_PATH ?= $(shell until [ -d "build-harness" ] || [ "`pwd`" == '/' ]; do cd ..; done; pwd)/build-harness
+-include $(BUILD_HARNESS_PATH)/Makefile
 
-include Makefile.*
+APP:=github-authorized-keys
+COPYRIGHT_SOFTWARE:=Github Authorized Keys
+COPYRIGHT_SOFTWARE_DESCRIPTION:=Use GitHub teams to manage system user accounts and authorized_keys
 
-## Update table of contents in README.md
-.PHONY : update-docs
-update-docs:
-	@doctoc --notitle --github README.md
+.PHONY : init
+## Init build-harness
+init:
+	@curl --retry 5 --retry-delay 1 https://raw.githubusercontent.com/cloudposse/build-harness/master/bin/install.sh | bash
 
-.PHONY: build
-## Build binary
-build: $(GO)
-	$(GO) build -o $(APP)
-
-.PHONY: test
-## Run tests
-test: $(GO)
-	$(GO) test $(shell $(GO) list ./... | grep -v /vendor/)
-
-.PHONY: deps
-## Install dependencies
-deps: $(GLIDE)
-	$(GLIDE) install
-
-## Clean compiled binary
+.PHONY : clean
+## Clean build-harness
 clean:
-	rm -f $(APP)
-	$(GLIDE) remove all
-
-## Install cli
-install: $(APP)
-	cp $(APP) $(INSTALL_DIR)
-	chmod 755 $(INSTALL_DIR)/$(APP)
+	@rm -rf $(BUILD_HARNESS_PATH)
 
-.PHONY: lint
-## Lint code
-lint: $(GO) vet
-	find . ! -path "*/vendor/*" ! -path "*/.glide/*" -type f -name '*.go' | xargs -n 1 golint
 
-.PHONY: vet
-## Vet code
-vet: $(GO)
-	find . ! -path "*/vendor/*" ! -path "*/.glide/*" -type f -name '*.go' | xargs -n 1 $(GO) vet -v
 
-.PHONY: fmt
-## Format code according to Golang convention
-fmt: $(GO)
-	find . ! -path "*/vendor/*" ! -path "*/.glide/*" -type f -name '*.go' | xargs -n 1 gofmt -w -l -s
 
-.PHONY: deps-dev
-## Install development dependencies
-deps-dev: $(GO)
-	$(GO) get -d -v "github.com/golang/lint"
-	$(GO) install -v "github.com/golang/lint/golint"
 
-## This help screen
-help:
-	@printf "Available targets:\n\n"
-	@awk '/^[a-zA-Z\-\_0-9%:\\]+:/ { \
-	  helpMessage = match(lastLine, /^## (.*)/); \
-	  if (helpMessage) { \
-	    helpCommand = $$1; \
-	    helpMessage = substr(lastLine, RSTART + 3, RLENGTH); \
-      gsub("\\\\", "", helpCommand); \
-      gsub(":+$$", "", helpCommand); \
-	    printf "  \x1b[32;01m%-35s\x1b[0m %s\n", helpCommand, helpMessage; \
-	  } \
-	} \
-	{ lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u
-	@printf "\n"

Makefile.copyright

@@ -22,6 +22,10 @@ import:
   version: v2.3.7
   subpackages:
   - client.v1
+- package: github.com/ugorji/go/codec
+  version: f4485b318aadd133842532f841dc205a8e339d74
+  subpackages:
+  - codec
 - package: github.com/Sirupsen/logrus
   version: v0.11.0
 - package: github.com/valyala/fasttemplate