Skip to content

Commit

Permalink
Upgrade golang to 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
javuto committed Apr 14, 2020
1 parent 147d3fd commit 1250e86
Show file tree
Hide file tree
Showing 20 changed files with 54 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
- GO111MODULE=on

go:
- 1.12.x
- 1.14.x

git:
depth: 1
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,8 @@ test:
go clean -testcache ./...
go test ./utils -v
go test ./tls/handlers -v

# Check test coverage
test_cover:
cd utils && go test -cover .
cd tls/handlers && go test -cover .
2 changes: 1 addition & 1 deletion admin/auth/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/jmpsec/osctrl/admin/auth

go 1.12
go 1.14
2 changes: 1 addition & 1 deletion admin/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/javuto/osctrl/admin/handlers

go 1.12
go 1.14
2 changes: 1 addition & 1 deletion admin/sessions/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/jmpsec/osctrl/admin/sessions

go 1.12
go 1.14
2 changes: 1 addition & 1 deletion api/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/javuto/osctrl/api/handlers

go 1.12
go 1.14
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/backend

go 1.12
go 1.14

require (
github.com/jinzhu/gorm v1.9.12
Expand Down
2 changes: 1 addition & 1 deletion carves/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/jmpsec/osctrl/carves

go 1.12
go 1.14

require github.com/jinzhu/gorm v1.9.8
2 changes: 1 addition & 1 deletion environments/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/environments

go 1.12
go 1.14

require (
github.com/jinzhu/gorm v1.9.8
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl

go 1.12
go 1.14

require (
github.com/beevik/etree v1.1.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion logging/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/logging

go 1.12
go 1.14

require (
cloud.google.com/go v0.37.4 // indirect
Expand Down
2 changes: 1 addition & 1 deletion metrics/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/jmpsec/osctrl/metrics

go 1.12
go 1.14

require github.com/spf13/viper v1.4.0
2 changes: 1 addition & 1 deletion nodes/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/jmpsec/osctrl/nodes

go 1.12
go 1.14

require github.com/jinzhu/gorm v1.9.8
2 changes: 1 addition & 1 deletion queries/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/queries

go 1.12
go 1.14

require (
github.com/jinzhu/gorm v1.9.8
Expand Down
2 changes: 1 addition & 1 deletion settings/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/jmpsec/osctrl/settings

go 1.12
go 1.14

require github.com/jinzhu/gorm v1.9.8
21 changes: 10 additions & 11 deletions tls/handlers/go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
module github.com/javuto/osctrl/tls/handlers

go 1.12
go 1.14

require (
github.com/gorilla/mux v1.6.2
github.com/jmpsec/osctrl/backend v0.0.0-20200326023543-cb8ff04ecc7c // indirect
github.com/jmpsec/osctrl/carves v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/environments v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/logging v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/metrics v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/nodes v0.0.0-20200321003619-c21be7214ee4
github.com/jmpsec/osctrl/queries v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/settings v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/types v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/utils v0.0.0-20200326023543-cb8ff04ecc7c
github.com/jmpsec/osctrl/carves v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/environments v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/logging v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/metrics v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/nodes v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/queries v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/settings v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/types v0.0.0-20200413201649-147d3fd0ab35
github.com/jmpsec/osctrl/utils v0.0.0-20200413201649-147d3fd0ab35
github.com/segmentio/ksuid v1.0.2
github.com/stretchr/testify v1.5.1
)
22 changes: 22 additions & 0 deletions tls/handlers/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
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/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=
Expand Down Expand Up @@ -76,26 +77,46 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/jinzhu/now v1.0.0/go.mod h1:oHTiXerJ20+SfYcrdlBO7rzZRJWGwSTQ0iUY2jI6Gfc=
github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
github.com/jmpsec/osctrl v0.2.1 h1:NsR2alFig9wzS/giEBkI3U3CIEGTHsjpqqcRzke/6+E=
github.com/jmpsec/osctrl/backend v0.0.0-20200326023543-cb8ff04ecc7c h1:UMg4mOEKRM1XZN0dj903TUYBArRVFnWF7jQg20kNXek=
github.com/jmpsec/osctrl/backend v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:888k0May18kvEwFmTVDbEYV/wyPib8ntxULgXkJ38E8=
github.com/jmpsec/osctrl/carves v0.0.0-20200326023543-cb8ff04ecc7c h1:qojIMezlqwI8VhgFq+qXllOU/saonH4G4EC7gn5VTrw=
github.com/jmpsec/osctrl/carves v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:eOC4irpvpQjYbU3ya194OnrkqnU9N6arYK8r3+Kx0VU=
github.com/jmpsec/osctrl/carves v0.0.0-20200413201649-147d3fd0ab35 h1:/+HGQVATtWrF5kRU4TUFi8hEyaKNf5XecxMj6k2jZFA=
github.com/jmpsec/osctrl/carves v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:eOC4irpvpQjYbU3ya194OnrkqnU9N6arYK8r3+Kx0VU=
github.com/jmpsec/osctrl/environments v0.0.0-20200326023543-cb8ff04ecc7c h1:KUSm1pCPQ5vnYdjVnWGWcB8+GTPFEPhgwmohL0xFokM=
github.com/jmpsec/osctrl/environments v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:Go92RTW0ZCMtZqN2fZzLcfLDoTg2znB1Ku7GnkO2iLg=
github.com/jmpsec/osctrl/environments v0.0.0-20200413201649-147d3fd0ab35 h1:1TZtUDYWxpiXGTMKr78Mbg/ozgL5uOET0Z9/FY2Ol3E=
github.com/jmpsec/osctrl/environments v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:Go92RTW0ZCMtZqN2fZzLcfLDoTg2znB1Ku7GnkO2iLg=
github.com/jmpsec/osctrl/logging v0.0.0-20200326023543-cb8ff04ecc7c h1:9nqAAMkZ2RUdSnS4D2/+UrPpr8kMpyNY4kYZMspu0IY=
github.com/jmpsec/osctrl/logging v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:e3WMFIjRyRC/p8Zcq03lmMSniZD1RH4hNfFJm66DWbc=
github.com/jmpsec/osctrl/logging v0.0.0-20200413201649-147d3fd0ab35 h1:vyJiDEmDYdxDoZewIgGnO7QhPuLaCEXgkzaIlv8T2Jk=
github.com/jmpsec/osctrl/logging v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:Zh7tDcIIqwLIBOKAz6lz7gkW2iW104RtcMPeQdMs668=
github.com/jmpsec/osctrl/metrics v0.0.0-20200326023543-cb8ff04ecc7c h1:nIYXb0fs99wusH7IZd/XPNfiS9b7RMyLwW9s2zg6iBI=
github.com/jmpsec/osctrl/metrics v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:aErXQUUZ4TUi5OUxyDvHqEnhqALcKsS+SAJszsK0jdg=
github.com/jmpsec/osctrl/metrics v0.0.0-20200413201649-147d3fd0ab35 h1:+ajYjU2wsZixq/FpAHLJ5PAHSqZmSmppr2MboekWiug=
github.com/jmpsec/osctrl/metrics v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:aErXQUUZ4TUi5OUxyDvHqEnhqALcKsS+SAJszsK0jdg=
github.com/jmpsec/osctrl/nodes v0.0.0-20200321003619-c21be7214ee4 h1:E2HUseTq4nCI0H9o3RYQo1BP/YAegllbLDkT6E56u6M=
github.com/jmpsec/osctrl/nodes v0.0.0-20200321003619-c21be7214ee4/go.mod h1:o8iBR3e+m2Rxaf8tnIWSVtKieL7UenN2NjidHclvoII=
github.com/jmpsec/osctrl/nodes v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:o8iBR3e+m2Rxaf8tnIWSVtKieL7UenN2NjidHclvoII=
github.com/jmpsec/osctrl/nodes v0.0.0-20200413201649-147d3fd0ab35 h1:pdoz6Xh+6Su9URqFWLhF9TW4ocDX2Ht1IPTeI07WWNA=
github.com/jmpsec/osctrl/nodes v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:o8iBR3e+m2Rxaf8tnIWSVtKieL7UenN2NjidHclvoII=
github.com/jmpsec/osctrl/queries v0.0.0-20200326023543-cb8ff04ecc7c h1:xSp9cS7Ew1RES3AEzMpJbMbd7JseAXZ+eKrLlscklls=
github.com/jmpsec/osctrl/queries v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:AWM5+hdL7LQgQYi2zmcHkTe5qqdegvfE/TbrUtc5Qx4=
github.com/jmpsec/osctrl/queries v0.0.0-20200413201649-147d3fd0ab35 h1:Go9Oaomekj9euFeldxrL/f2Otdpx0HUU20oJANbq8DM=
github.com/jmpsec/osctrl/queries v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:AWM5+hdL7LQgQYi2zmcHkTe5qqdegvfE/TbrUtc5Qx4=
github.com/jmpsec/osctrl/settings v0.0.0-20200326023543-cb8ff04ecc7c h1:O/+WM4LRlop+OyAu5QGDjqDt06SpA2DEjyQqKbl7YBI=
github.com/jmpsec/osctrl/settings v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:WiRce5ho75/4JVmjW3CKXLodGJgY54XbcadtRTbvRPw=
github.com/jmpsec/osctrl/settings v0.0.0-20200413201649-147d3fd0ab35 h1:OHY8V1cH88SDxh5iTCpiDOu+z6ydoh+eqJQuoGPWPR4=
github.com/jmpsec/osctrl/settings v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:WiRce5ho75/4JVmjW3CKXLodGJgY54XbcadtRTbvRPw=
github.com/jmpsec/osctrl/types v0.0.0-20200326023543-cb8ff04ecc7c h1:8d9y4wgDPdtUjigeHA/65vHTxGXHQPwDHcgZMza+Tdg=
github.com/jmpsec/osctrl/types v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:v7W82e2LcngpKB93mXyl0M/xyQ8qeCMOskOZJ1bB9ys=
github.com/jmpsec/osctrl/types v0.0.0-20200413201649-147d3fd0ab35 h1:pe2DbLbD5vM+oUfW64mFkiFxTialBJ0ChGZ/bY8aBHs=
github.com/jmpsec/osctrl/types v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:v7W82e2LcngpKB93mXyl0M/xyQ8qeCMOskOZJ1bB9ys=
github.com/jmpsec/osctrl/utils v0.0.0-20200326023543-cb8ff04ecc7c h1:oZ0oxXMS8t+6CS7I6QxYA/j02oovIiO6m5S5LFpsvDY=
github.com/jmpsec/osctrl/utils v0.0.0-20200326023543-cb8ff04ecc7c/go.mod h1:z3pO8Bka1r9SE871u9ugRhfHGzc/vHRoSw5okzbFroU=
github.com/jmpsec/osctrl/utils v0.0.0-20200413201649-147d3fd0ab35 h1:5dC9cR7uVQOHJsnuAIgBeXz3VeysMqAm1zIGgeT6gvY=
github.com/jmpsec/osctrl/utils v0.0.0-20200413201649-147d3fd0ab35/go.mod h1:z3pO8Bka1r9SE871u9ugRhfHGzc/vHRoSw5okzbFroU=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
Expand Down Expand Up @@ -246,6 +267,7 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
2 changes: 1 addition & 1 deletion types/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/jmpsec/osctrl/types

go 1.12
go 1.14
2 changes: 1 addition & 1 deletion users/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jmpsec/osctrl/users

go 1.12
go 1.14

require (
github.com/dgrijalva/jwt-go v3.2.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion utils/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/jmpsec/osctrl/utils

go 1.12
go 1.14

require github.com/stretchr/testify v1.5.1

0 comments on commit 1250e86

Please sign in to comment.