Merge pull request #72 from apiaryio/abtris/using-go1.11-modules

chore: move to golang 1.11 and using modules instead glide

Author: abtris

Dockerfile

@@ -1,20 +1,15 @@
-FROM golang:1.8 as builder
+FROM golang:1.11 as builder
 
-ENV GLIDE_VERSION v0.12.3
-ENV APP_VERSION 1.0.2
+ENV APP_VERSION 1.1.0
 
-ADD https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/glide-${GLIDE_VERSION}-linux-amd64.tar.gz /tmp
-RUN cp /tmp/linux-amd64/glide /usr/local/bin/glide && \
-    chmod 755 /usr/local/bin/glide && \
-    rm -rf /tmp/linux-amd64/
+RUN mkdir -p /usr/src/app
 
+COPY . /usr/src/app
 
-COPY . /go/src/github.com/apiaryio/heroku-datadog-drain-go
-
-RUN cd /go/src/github.com/apiaryio/heroku-datadog-drain-go && \
-    glide install && \
+RUN cd /usr/src/app && \
+    go get ./... && \
     go install
 
 FROM scratch
-COPY --from=builder /go/bin/heroku-datadog-drain-go .
-CMD ["./heroku-datadog-drain-go"]
+COPY --from=builder /go/bin/heroku-datadog-drain-golang .
+CMD ["./heroku-datadog-drain-golang"]

README.md

@@ -45,9 +45,11 @@ heroku config:add DATADOG_API_KEY=<your-Datadog-API-key>
 Don't forget [set right golang version](https://devcenter.heroku.com/articles/go-support#go-versions).
 
 ```
-heroku config:add GOVERSION=go1.9
+heroku config:add GOVERSION=go1.11
 ```
 
+You can use specific settings for [Go modules](https://github.com/heroku/heroku-buildpack-go#go-module-specifics)
+
 ### Deploy to Heroku.
 
 ```

glide.lock

@@ -0,0 +1,24 @@
+// +heroku goVersion go1.11
+module github.com/apiaryio/heroku-datadog-drain-golang
+
+require (
+	github.com/DataDog/datadog-go v0.0.0-20170427165718-0ddda6bee211
+	github.com/Sirupsen/logrus v0.11.5
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
+	github.com/gin-gonic/gin v0.0.0-20170702092826-d459835d2b07
+	github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41 // indirect
+	github.com/heroku/x v0.0.0-20171004170240-705849e307dd
+	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.2 // indirect
+	github.com/ugorji/go v0.0.0-20171231121548-ccfe18359b55 // indirect
+	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a // indirect
+	golang.org/x/sys v0.0.0-20160415135844-f64b50fbea64 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
+	gopkg.in/go-playground/validator.v8 v8.15.1 // indirect
+	gopkg.in/yaml.v2 v2.0.0-20160912165603-31c299268d30 // indirect
+)

glide.yaml

@@ -0,0 +1,41 @@
+github.com/DataDog/datadog-go v0.0.0-20170427165718-0ddda6bee211 h1:hOSWYZBOWXZwYN+huYLFKsb4f6uohHgpx6cLlAXOqjA=
+github.com/DataDog/datadog-go v0.0.0-20170427165718-0ddda6bee211/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/Sirupsen/logrus v0.11.5 h1:aIMrrsnipdTlAieMe7FC/iiuJ0+ELiXCT4YiVQiK9j8=
+github.com/Sirupsen/logrus v0.11.5/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v0.0.0-20170702092826-d459835d2b07 h1:cZPJWzd2oNeoS0oJM2TlN9rl0OnCgUr10gC8Q4mH+6M=
+github.com/gin-gonic/gin v0.0.0-20170702092826-d459835d2b07/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
+github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41 h1:BIDtr9YECqqvixqxNnfN1Dp4dlRZB2nS68tywI+YZj4=
+github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/heroku/x v0.0.0-20171004170240-705849e307dd h1:zn29UrzyUeQgqxBGXIwQqQJf75IiK4aeCtO5q1V2Vyo=
+github.com/heroku/x v0.0.0-20171004170240-705849e307dd/go.mod h1:opmAyjmIGn9/Y+9Nia6eIaktIXIoMhhFXEFbHLMsX3Y=
+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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/ugorji/go v0.0.0-20171231121548-ccfe18359b55 h1:1IR8KZO9eYKhBHbeUWCb10PVIr7dAcglEhe43mEmInQ=
+github.com/ugorji/go v0.0.0-20171231121548-ccfe18359b55/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20160415135844-f64b50fbea64 h1:bCcPub4lKv9/pHMpgldrftsXW84TsZrI/QPdbxiaE/4=
+golang.org/x/sys v0.0.0-20160415135844-f64b50fbea64/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.15.1 h1:IrBBTcgklCPw+7tjCGdAErvsk+44VaIeS/4T1utPQ+I=
+gopkg.in/go-playground/validator.v8 v8.15.1/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/yaml.v2 v2.0.0-20160912165603-31c299268d30 h1:mNnzt76aN10kG6/XNojKVKR8VDIWvEp4mlj5kyRf6hk=
+gopkg.in/yaml.v2 v2.0.0-20160912165603-31c299268d30/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

go.mod

@@ -1,8 +1,10 @@
-box: golang
+box: golang:1.11
 build:
   steps:
-    - setup-go-workspace
-    - glide-install
+    - script:
+        name: go install
+        code: |
+          go get ./...
     # Build the project
     - script:
         name: go build