Upgrade go to 1.11 and switch to go modules from gvt

Author: drubin

.travis.yml

@@ -3,16 +3,15 @@ sudo: required
 services:
   - docker
 go:
-  - 1.7
+  - 1.11
 before_install:
-  - go get -u github.com/FiloSottile/gvt
-  - gvt restore
+  - go mod download
   - go get -u github.com/mattn/goveralls
 
 install: true
 
 env:
-  - GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=catalogue;
+  - GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=catalogue GO111MODULE=on
 
 script:
   - set -e

README.md

@@ -21,8 +21,7 @@ Checkout the API Spec [here](http://microservices-demo.github.io/api/index?url=h
 
 #### Dependencies
 ```
-go get -u github.com/FiloSottile/gvt
-gvt restore
+GO111MODULE=on go mod download
 ```
 
 #### Go tools
@@ -31,7 +30,7 @@ $GOPATH directory: $GOPATH/src/github.com/microservices-demo/catalogue/. Once th
 
 ```
 cd $GOPATH/src/github.com/microservices-demo/catalogue/cmd/cataloguesvc/
-go build -o catalogue
+catalogue go build -o catalogue
 ```
 
 The result is a binary named `catalogue`, in the current directory.

docker/catalogue/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.7
+FROM golang:1.11
 
-COPY . /go/src/github.com/microservices-demo/catalogue
+COPY go.mod go.sum /go/src/github.com/microservices-demo/catalogue/
 WORKDIR /go/src/github.com/microservices-demo/catalogue
-
-RUN go get -u github.com/FiloSottile/gvt
-RUN gvt restore && \
-    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app github.com/microservices-demo/catalogue/cmd/cataloguesvc
+ENV GO111MODULE=on
+RUN go mod download
+ADD . /go/src/github.com/microservices-demo/catalogue/
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app github.com/microservices-demo/catalogue/cmd/cataloguesvc
 
 FROM alpine:3.4
 

go.mod

@@ -0,0 +1,66 @@
+module github.com/garden-io/sock-shop-mono/src/catalogue
+
+require (
+	cloud.google.com/go v0.0.0-20170321144122-daf945bb8684 // indirect
+	github.com/Shopify/sarama v1.11.0 // indirect
+	github.com/Sirupsen/logrus v0.0.0-20170317143214-10f801ebc38b // indirect
+	github.com/VividCortex/gohistogram v1.0.0 // indirect
+	github.com/afex/hystrix-go v0.0.0-20160615205002-39520ddd07a9 // indirect
+	github.com/apache/thrift v0.0.0-20161222112917-30a8b65dcec8 // indirect
+	github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
+	github.com/circonus-labs/circonus-gometrics v0.0.0-20161208202948-4d93a8f79cb1 // indirect
+	github.com/circonus-labs/circonusllhist v0.0.0-20161121135153-7d649b46cdc2 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/felixge/httpsnoop v0.0.0-20161125085600-287b56e9e314 // indirect
+	github.com/go-kit/kit v0.0.0-20170113143921-b8f878dd8851
+	github.com/go-logfmt/logfmt v0.3.0 // indirect
+	github.com/go-sql-driver/mysql v1.3.0
+	github.com/go-stack/stack v1.5.2 // indirect
+	github.com/gogo/protobuf v0.0.0-20161220170212-84af2615df1b // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01 // indirect
+	github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70 // indirect
+	github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec // indirect
+	github.com/googleapis/gax-go v0.0.0-20170321005343-9af46dd5a171 // indirect
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/mux v0.0.0-20160920230813-757bef944d0f
+	github.com/hashicorp/go-cleanhttp v0.0.0-20160407174126-ad28ea4487f0 // indirect
+	github.com/hashicorp/go-retryablehttp v0.0.0-20160930035102-6e85be8fee1d // indirect
+	github.com/influxdata/influxdb v0.0.0-20161209155552-855c567c67d7 // indirect
+	github.com/jmoiron/sqlx v0.0.0-20161209024531-cac998c4f095
+	github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49 // indirect
+	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect
+	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/microservices-demo/catalogue v0.0.0-20180608164449-97545f4ae068
+	github.com/opentracing/opentracing-go v0.0.0-20161202035312-ac5446f53f2c
+	github.com/openzipkin/zipkin-go-opentracing v0.2.2
+	github.com/pborman/uuid v0.0.0-20161206184745-5007efa264d9 // indirect
+	github.com/performancecopilot/speed v0.0.0-20161205145110-6c862057c50f // indirect
+	github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac // indirect
+	github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897 // indirect
+	github.com/prometheus/client_golang v0.0.0-20161124155732-575f371f7862
+	github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
+	github.com/prometheus/common v0.0.0-20161201123508-195bde7883f7 // indirect
+	github.com/prometheus/procfs v0.0.0-20161206222141-fcdb11ccb438 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5 // indirect
+	github.com/sony/gobreaker v0.0.0-20160504140302-809bcd5a528f
+	github.com/stathat/go v1.0.0 // indirect
+	github.com/streadway/handy v0.0.0-20160402200321-f450267a206e // indirect
+	github.com/stretchr/testify v0.0.0-20161217200445-2402e8e7a02f // indirect
+	github.com/weaveworks/common v0.0.0-20170321114712-f94043b3da14
+	golang.org/x/crypto v0.0.0-20170317163734-459e26527287 // indirect
+	golang.org/x/net v0.0.0-20170308210134-a6577fac2d73
+	golang.org/x/oauth2 v0.0.0-20170321013421-7fdf09982454 // indirect
+	golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 // indirect
+	golang.org/x/tools v0.0.0-20161213205818-ae0208420024 // indirect
+	google.golang.org/api v0.0.0-20170321005416-16ab375f9450 // indirect
+	google.golang.org/appengine v0.0.0-20170307235554-b79c28f01977 // indirect
+	google.golang.org/grpc v1.2.0 // indirect
+	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
+	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
+	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.1 // indirect
+)

go.sum

@@ -0,0 +1,103 @@
+cloud.google.com/go v0.0.0-20170321144122-daf945bb8684/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/Shopify/sarama v1.11.0 h1:JD701r42hP1ms1uytUMa34jZgoddt0XhiElhJt+2ERE=
+github.com/Shopify/sarama v1.11.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Sirupsen/logrus v0.0.0-20170317143214-10f801ebc38b h1:rPRExiQXdUAAM9Y1ahb0oGVZzsD1vnK13PtAk5FcSL4=
+github.com/Sirupsen/logrus v0.0.0-20170317143214-10f801ebc38b/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/afex/hystrix-go v0.0.0-20160615205002-39520ddd07a9 h1:u66crHBFVPAewNQgWzJ+gJmqThmHc3+4qRtPT7NR35A=
+github.com/afex/hystrix-go v0.0.0-20160615205002-39520ddd07a9/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/apache/thrift v0.0.0-20161222112917-30a8b65dcec8 h1:G8pzjPir0sIjIUSn9HyNZstjwL8Vg9v2AuOv9eXRXTU=
+github.com/apache/thrift v0.0.0-20161222112917-30a8b65dcec8/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c=
+github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/circonus-labs/circonus-gometrics v0.0.0-20161208202948-4d93a8f79cb1/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.0.0-20161121135153-7d649b46cdc2/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42 h1:f8ERmXYuaC+kCSv2w+y3rBK/oVu6If4DEm3jywJJ0hc=
+github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934 h1:oGLoaVIefp3tiOgi7+KInR/nNPvEpPM6GFo+El7fd14=
+github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/felixge/httpsnoop v0.0.0-20161125085600-287b56e9e314/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8=
+github.com/go-kit/kit v0.0.0-20170113143921-b8f878dd8851 h1:UaqnVjGSkYqUusRaabgxhuL/a/63ooG6HjjccKqGHJ8=
+github.com/go-kit/kit v0.0.0-20170113143921-b8f878dd8851/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-sql-driver/mysql v1.3.0 h1:pgwjLi/dvffoP9aabwkT3AKpXQM93QARkjFhDDqC1UE=
+github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.5.2 h1:5sTB/0oZM2O31k/N1IRwxxVXzLIt5NF2Aqx/2gWI9OY=
+github.com/go-stack/stack v1.5.2/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v0.0.0-20161220170212-84af2615df1b h1:xEk31ToB+0XsD0BKkKSws9hrXoIVKC7mCSl0/tq04Co=
+github.com/gogo/protobuf v0.0.0-20161220170212-84af2615df1b/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70 h1:WKo1/VPcI3cbJwnIHISxazgDxbw+UIrktU3zNxzcp4c=
+github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec h1:ZaSUjYC8aWT/om43c8YVz0SqjT8ABtqw7REbZGsCroE=
+github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/googleapis/gax-go v0.0.0-20170321005343-9af46dd5a171/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v0.0.0-20160920230813-757bef944d0f h1:MMWIc1CNY0wbzX1vf1pTaNeK7X1gQQg036wVnlYPsaI=
+github.com/gorilla/mux v0.0.0-20160920230813-757bef944d0f/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/hashicorp/go-cleanhttp v0.0.0-20160407174126-ad28ea4487f0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-retryablehttp v0.0.0-20160930035102-6e85be8fee1d/go.mod h1:fXcdFsQoipQa7mwORhKad5jmDCeSy/RCGzWA08PO0lM=
+github.com/influxdata/influxdb v0.0.0-20161209155552-855c567c67d7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
+github.com/jmoiron/sqlx v0.0.0-20161209024531-cac998c4f095 h1:6uwZHp3lyVH2mZxH/NLFbfBmbra2a2VDMSN2sp5NgGc=
+github.com/jmoiron/sqlx v0.0.0-20161209024531-cac998c4f095/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
+github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
+github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 h1:KAZ1BW2TCmT6PRihDPpocIy1QTtsAsrx6TneU/4+CMg=
+github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/microservices-demo/catalogue v0.0.0-20180608164449-97545f4ae068 h1:js0w8D8xHoJsUU8yGOSfk5IDw3FvZocl5QDugZtOVKs=
+github.com/microservices-demo/catalogue v0.0.0-20180608164449-97545f4ae068/go.mod h1:h6AD/L9tyIOqcdNdVXvKvPrfoCebqmsiaUclMeIjw0M=
+github.com/opentracing/opentracing-go v0.0.0-20161202035312-ac5446f53f2c h1:aZxDQDVPSq3xLeOFrOiLtn+dqo4BSTvZ/R7FoB7/sF0=
+github.com/opentracing/opentracing-go v0.0.0-20161202035312-ac5446f53f2c/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin/zipkin-go-opentracing v0.2.2 h1:2PLiliCVlagg3bi13LIEfABAoNCJ9vrXxY2HLbPKztk=
+github.com/openzipkin/zipkin-go-opentracing v0.2.2/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE=
+github.com/pborman/uuid v0.0.0-20161206184745-5007efa264d9/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
+github.com/performancecopilot/speed v0.0.0-20161205145110-6c862057c50f/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
+github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac h1:tKcxwAA5OHUQjL6sWsuCIcP9OnzN+RwKfvomtIOsfy8=
+github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897 h1:jp3jc/PyyTrTKjJJ6rWnhTbmo7tGgBFyG9AL5FIrO1I=
+github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I=
+github.com/prometheus/client_golang v0.0.0-20161124155732-575f371f7862 h1:iDIro+5xQV9yVkRhr91wWstwWp3/4KI76XJlSKJljU4=
+github.com/prometheus/client_golang v0.0.0-20161124155732-575f371f7862/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 h1:0E/5GnGmzoDCtmzTycjGDWW33H0UBmAhR0h+FC8hWLs=
+github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20161201123508-195bde7883f7 h1:skjefbrmNeFoEDgFSE3ZXL9t3vWVLm63zPDvVVPreeM=
+github.com/prometheus/common v0.0.0-20161201123508-195bde7883f7/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20161206222141-fcdb11ccb438 h1:t0jDsBXJqPXOsFlEsxwz/iHeeN1p8dETvQzrKlIkfXg=
+github.com/prometheus/procfs v0.0.0-20161206222141-fcdb11ccb438/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5 h1:gwcdIpH6NU2iF8CmcqD+CP6+1CkRBOhHaPR+iu6raBY=
+github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/sony/gobreaker v0.0.0-20160504140302-809bcd5a528f h1:V8bdX9yAqzObBVpJ7OvTOe88b0ygY4mjC8Szx5ID2VQ=
+github.com/sony/gobreaker v0.0.0-20160504140302-809bcd5a528f/go.mod h1:XvpJiTD8NibaH7z0NzyfhR1+NQDtR9F/x92xheTwC9k=
+github.com/stathat/go v1.0.0/go.mod h1:+9Eg2szqkcOGWv6gfheJmBBsmq9Qf5KDbzy8/aYYR0c=
+github.com/streadway/handy v0.0.0-20160402200321-f450267a206e h1:kMuBo7Qw/VrZq9MrojwJZp8hyeywuc8J+KdnXIeRmMY=
+github.com/streadway/handy v0.0.0-20160402200321-f450267a206e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
+github.com/stretchr/testify v0.0.0-20161217200445-2402e8e7a02f/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/weaveworks/common v0.0.0-20170321114712-f94043b3da14 h1:ZGVMFdrTHz0tgb6DzqFRvacoiNpnrYeeui91mrL+RlA=
+github.com/weaveworks/common v0.0.0-20170321114712-f94043b3da14/go.mod h1:pSm+0KR57BG3pvGoJWFXJSAC7+sEPewcvdt5StevL3A=
+golang.org/x/crypto v0.0.0-20170317163734-459e26527287/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 h1:5kGFsglTK4KqaHYb/WCmYmj+Gm1+dzbilbtzruHj6dw=
+golang.org/x/net v0.0.0-20170308210134-a6577fac2d73/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/oauth2 v0.0.0-20170321013421-7fdf09982454/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 h1:U3NsAsR1IG0Aet3Z+IToBDWbPoJ7hjwgDpqqch4APkU=
+golang.org/x/sys v0.0.0-20170308153327-99f16d856c98/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/tools v0.0.0-20161213205818-ae0208420024/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/api v0.0.0-20170321005416-16ab375f9450/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/appengine v0.0.0-20170307235554-b79c28f01977/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/grpc v1.2.0 h1:v8eFdETH8nqZHQ9x+0f2PLuU6W7zo5PFZuVEwH5126Y=
+google.golang.org/grpc v1.2.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.1.4 h1:fJ175KxE4wUAZMv1f5kMw1k0OL0SrJ+bBk5UCAynuoA=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.1.4/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.1/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=

scripts/build.sh

@@ -33,8 +33,7 @@ cp -r $CODE_DIR/docker $BUILD_DIR/
 cp -r $CODE_DIR/images/ $BUILD_DIR/docker/catalogue/images/
 cp -r $CODE_DIR/cmd/ $BUILD_DIR/docker/catalogue/cmd/
 cp $CODE_DIR/*.go $BUILD_DIR/docker/catalogue/
-mkdir -p $BUILD_DIR/docker/catalogue/vendor/ && \
-cp $CODE_DIR/vendor/manifest $BUILD_DIR/docker/catalogue/vendor/
+cp $CODE_DIR/go.* $BUILD_DIR/docker/catalogue/
 
 REPO=${GROUP}/$(basename catalogue);
 

service_test.go

@@ -5,10 +5,9 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-
+        "gopkg.in/DATA-DOG/go-sqlmock.v1"
 	"github.com/go-kit/kit/log"
 	"github.com/jmoiron/sqlx"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
 var (
@@ -131,7 +130,7 @@ func TestCatalogueServiceCount(t *testing.T) {
 		if err != nil {
 			t.Errorf(
 				"Count(%v): returned error %s",
-				testcase.tags, err.Error(),
+				testcase.tags,
 				err.Error(),
 			)
 		}

test/unit.py

@@ -11,7 +11,7 @@ def test_go(self):
         code_dir = script_dir + "/.."
         home = expanduser("~")
         goPath = os.environ['GOPATH']
-        command = ['docker', 'run', '--rm', '-v', goPath + ':/go/src/', '-v', code_dir + ':/go/src/github.com/microservices-demo/catalogue', '-w', '/go/src/github.com/microservices-demo/catalogue', '-e', 'GOPATH=/go/', 'golang:1.7', 'go', 'test', '-v', '-covermode=count', '-coverprofile=coverage.out']
+        command = ['docker', 'run', '--rm', '-v', goPath + ':/go/src/', '-v', code_dir + ':/go/src/github.com/microservices-demo/catalogue', '-w', '/go/src/github.com/microservices-demo/catalogue', '-e', 'GOPATH=/go/','-e', 'GO111MODULE=on', 'golang:1.11', 'go', 'test', '-v', '-covermode=count', '-coverprofile=coverage.out']
 
         print(Docker().execute(command))