Merge pull request #29 from microservices-demo/refactor/middleware

Refactor to use middleware code from weaveworks/common.
microservices-demo · Mar 21, 2017 · 923c8b0 · 923c8b0
2 parents dd16f30 + f7fff2c
commit 923c8b0
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 137 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 services:
 - docker
 go:
-- 1.6
+- 1.7
 before_install:
 - go get -u github.com/mattn/goveralls
 - go get -u github.com/FiloSottile/gvt

diff --git a/docker/payment/Dockerfile b/docker/payment/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6
+FROM golang:1.7
 
 RUN mkdir /app
 COPY . /go/src/github.com/microservices-demo/payment/

diff --git a/middleware/instrument.go b/middleware/instrument.go
diff --git a/middleware/middleware.go b/middleware/middleware.go
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -23,7 +23,6 @@ CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
 
 cp -r $CODE_DIR/cmd/ $CODE_DIR/docker/payment/cmd/
-cp -r $CODE_DIR/middleware/ $CODE_DIR/docker/payment/middleware/
 cp $CODE_DIR/*.go $CODE_DIR/docker/payment/
 mkdir $CODE_DIR/docker/payment/vendor && cp $CODE_DIR/vendor/manifest $CODE_DIR/docker/payment/vendor/
 

diff --git a/test/unit.py b/test/unit.py
@@ -13,7 +13,7 @@ def test_go(self):
             '-v', code_dir + ':/go/src/github.com/microservices-demo/payment',
             '-w', '/go/src/github.com/microservices-demo/payment',
             '-e', 'GOPATH=/go/',
-            'golang:1.6',
+            'golang:1.7',
             'go', 'test', '-v', '-covermode=count', '-coverprofile=coverage.out'
         ]