Skip to content

Commit

Permalink
refactor: Switch to Go 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
notheotherben committed Nov 12, 2018
1 parent 7326a81 commit ad76f4a
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use a mutli-stage build pipeline to generate the executable
FROM golang:1.9
FROM golang:1.11

ARG SENTRY_DSN=""
ARG VERSION="development"
Expand All @@ -9,7 +9,6 @@ ENV GO_PATH="/go"
ADD . $GO_PATH/src/github.com/SierraSoftworks/bender
WORKDIR $GO_PATH/src/github.com/SierraSoftworks/bender

RUN go get -t ./...
RUN go test -v ./...

ENV CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net/http"

"github.com/SierraSoftworks/bender/models"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/rs/cors"
log "github.com/sirupsen/logrus"
)

var registrars = []func(*API) error{}
Expand Down
2 changes: 1 addition & 1 deletion api/preprocessors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/SierraSoftworks/girder"
sentry "github.com/SierraSoftworks/sentry-go"
log "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
)

func SentryRequestLogger(c *girder.Context) error {
Expand Down
13 changes: 13 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module github.com/SierraSoftworks/bender

require (
github.com/SierraSoftworks/gatekeeper v0.0.0-20160823094219-c9a25dab7ddd // indirect
github.com/SierraSoftworks/girder v0.0.0-20180807143843-c91a93322da2
github.com/SierraSoftworks/sentry-go v1.0.2
github.com/gorilla/mux v1.6.2
github.com/gorilla/websocket v1.4.0 // indirect
github.com/pkg/errors v0.8.0
github.com/rs/cors v1.6.0
github.com/sirupsen/logrus v1.1.1
github.com/urfave/cli v1.20.0
)
33 changes: 33 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
github.com/SierraSoftworks/gatekeeper v0.0.0-20160823094219-c9a25dab7ddd h1:ZHk4lAuNvN05ZvosHRSHl/sdoT6vuDxM1KARsSmCe3A=
github.com/SierraSoftworks/gatekeeper v0.0.0-20160823094219-c9a25dab7ddd/go.mod h1:z1Mxlp8qJlGlZl3S+wGdVUfaXgiiBmU1QL8PZVcag6E=
github.com/SierraSoftworks/girder v0.0.0-20180807143843-c91a93322da2 h1:7G0F0d9sLucTRgw8UrV5zK5jdTuFCNcemIaTsTlysWc=
github.com/SierraSoftworks/girder v0.0.0-20180807143843-c91a93322da2/go.mod h1:BZVJiXIbpGg+ijGIGTu89VXoIqgojRE0FsT8FgbGwBg=
github.com/SierraSoftworks/sentry-go v1.0.2 h1:yu+yd/pN2OQVawjes4uB6Nex5WhIHaJTkHYJ7gFmIpg=
github.com/SierraSoftworks/sentry-go v1.0.2/go.mod h1:hVphfiHfAYl7doknB0WFQL71vHdhA8vuHLE20iTHHPI=
github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2 h1:MmeatFT1pTPSVb4nkPmBFN/LRZ97vPjsFKsZrU3KKTs=
github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gopherjs/gopherjs v0.0.0-20181004151105-1babbf986f6f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs=
github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/matishsiao/goInfo v0.0.0-20170803142006-617e6440957e h1:Y+GY+bv5vf1gssphFsGiq6R8qdHxnpDZvYljFnXfhD8=
github.com/matishsiao/goInfo v0.0.0-20170803142006-617e6440957e/go.mod h1:yLZrFIhv+Z20hxHvcZpEyKVQp9HMsOJkXAxx7yDqtvg=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/sirupsen/logrus v1.1.1 h1:VzGj7lhU7KEB9e9gMpAV/v5XT2NVSvLJhJLCWbnkgXg=
github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/SierraSoftworks/bender/api"
"github.com/SierraSoftworks/bender/models"
sentry "github.com/SierraSoftworks/sentry-go"
log "github.com/Sirupsen/logrus"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion models/quotes.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

sentry "github.com/SierraSoftworks/sentry-go"
log "github.com/Sirupsen/logrus"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)

type Quote struct {
Expand Down

0 comments on commit ad76f4a

Please sign in to comment.