Skip to content

Commit eb446a2

Browse files
basbeubasbeu
authored
[CLOUDTRUST-3881] Migrate from dep to go modules (#8)
* [CLOUDTRUST-3881] Migrate from dep to go modules * [CLOUDTRUST-3881] FIX Migrate from dep to go modules Co-authored-by: Beuchat Bastien <bastien.beuchat@elca.ch>
1 parent 985a523 commit eb446a2

File tree

9 files changed

+114
-204
lines changed

9 files changed

+114
-204
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ bin/*
2222
configs/DEV/*
2323
**/mock
2424
.idea/
25+
26+
# Activate vendoring
27+
!vendor/modules.txt

‎Gopkg.lock‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎Gopkg.toml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎Jenkinsfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@ pipeline {
2929
3030
golint ./... | tee golint.out || true
3131
32-
dep ensure
33-
3432
go generate ./...
33+
go mod vendor
3534
3635
go test -coverprofile=coverage.out -json ./... | tee report.json
3736
go tool cover -func=coverage.out
3837
bash -c \"go vet ./... > >(cat) 2> >(tee govet.out)\" || true
3938
gometalinter --vendor --disable=gotype --disable=golint --disable=vet --disable=gocyclo --exclude=/usr/local/go/src --deadline=300s ./... | tee gometalinter.out || true
4039
41-
nancy -no-color Gopkg.lock || true
40+
go list -json -deps | nancy -no-color || true
4241
4342
JAVA_TOOL_OPTIONS="" sonar-scanner \
4443
-Dsonar.host.url=https://sonarqube-cloudtrust-cicd.openshift.west.ch.elca-cloud.com \

‎authorization.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/url"
77
"time"
88

9-
jwt "github.com/gbrlsnchs/jwt"
9+
jwt "github.com/gbrlsnchs/jwt/v2"
1010
"github.com/pkg/errors"
1111
"gopkg.in/h2non/gentleman.v2"
1212
"gopkg.in/h2non/gentleman.v2/context"

‎go.mod‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module github.com/cloudtrust/httpclient
2+
3+
go 1.15
4+
5+
require (
6+
github.com/davecgh/go-spew v1.1.1 // indirect
7+
github.com/gbrlsnchs/jwt/v2 v2.0.0
8+
github.com/golang/mock v1.5.0
9+
github.com/gorilla/mux v1.8.0
10+
github.com/pkg/errors v0.9.1
11+
github.com/pmezard/go-difflib v1.0.0 // indirect
12+
github.com/stretchr/testify v1.7.0
13+
golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect
14+
golang.org/x/text v0.3.6 // indirect
15+
gopkg.in/h2non/gentleman.v2 v2.0.5
16+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
17+
)

‎go.sum‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/gbrlsnchs/jwt v1.1.0 h1:Gh2CoXcIfk8/LxV8ks0GDOmUDCpVIrw8Oa34Ozmw/10=
5+
github.com/gbrlsnchs/jwt/v2 v2.0.0 h1:4iEVJykJPXrCimVaQJAfBWKAvuzDJi5fDdUBdrdTZ3M=
6+
github.com/gbrlsnchs/jwt/v2 v2.0.0/go.mod h1:7kIj4oeJPffUpLL8RnU5Y3xT1Sm/VuFqjv8T1tqhqc8=
7+
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
8+
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
9+
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
10+
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
11+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
12+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
13+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
14+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
15+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
16+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
17+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
18+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
19+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
20+
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
21+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
22+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
23+
golang.org/x/net v0.0.0-20210505214959-0714010a04ed h1:V9kAVxLvz1lkufatrpHuUVyJ/5tR3Ms7rk951P4mI98=
24+
golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
25+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
26+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
27+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
28+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
29+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
30+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
31+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
32+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
33+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
34+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
35+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
36+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
37+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
38+
gopkg.in/h2non/gentleman.v2 v2.0.5 h1:ckmb6cLxL2DDk7WN7LSdxXDq7jNkOicFg4JZ4ZnDNuE=
39+
gopkg.in/h2non/gentleman.v2 v2.0.5/go.mod h1:A1c7zwrTgAyyf6AbpvVksYtBayTB4STBUGmdkEtlHeA=
40+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
41+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
42+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎mock_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
package httpclient
22

3-
//go:generate mockgen -destination=./mock/http.go -package=mock -mock_names=Handler=Handler net/http Handler
3+
import _ "github.com/golang/mock/mockgen/model"
4+
5+
//go:generate mockgen --build_flags=--mod=mod -destination=./mock/http.go -package=mock -mock_names=Handler=Handler net/http Handler

‎vendor/modules.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# github.com/davecgh/go-spew v1.1.1
2+
## explicit
3+
github.com/davecgh/go-spew/spew
4+
# github.com/gbrlsnchs/jwt/v2 v2.0.0
5+
## explicit
6+
github.com/gbrlsnchs/jwt/v2
7+
# github.com/golang/mock v1.5.0
8+
## explicit
9+
github.com/golang/mock/gomock
10+
github.com/golang/mock/mockgen/model
11+
# github.com/gorilla/mux v1.8.0
12+
## explicit
13+
github.com/gorilla/mux
14+
# github.com/pkg/errors v0.9.1
15+
## explicit
16+
github.com/pkg/errors
17+
# github.com/pmezard/go-difflib v1.0.0
18+
## explicit
19+
github.com/pmezard/go-difflib/difflib
20+
# github.com/stretchr/testify v1.7.0
21+
## explicit
22+
github.com/stretchr/testify/assert
23+
# golang.org/x/net v0.0.0-20210505214959-0714010a04ed
24+
## explicit
25+
golang.org/x/net/publicsuffix
26+
# golang.org/x/text v0.3.6
27+
## explicit
28+
# gopkg.in/h2non/gentleman.v2 v2.0.5
29+
## explicit
30+
gopkg.in/h2non/gentleman.v2
31+
gopkg.in/h2non/gentleman.v2/context
32+
gopkg.in/h2non/gentleman.v2/middleware
33+
gopkg.in/h2non/gentleman.v2/mux
34+
gopkg.in/h2non/gentleman.v2/plugin
35+
gopkg.in/h2non/gentleman.v2/plugins/body
36+
gopkg.in/h2non/gentleman.v2/plugins/bodytype
37+
gopkg.in/h2non/gentleman.v2/plugins/cookies
38+
gopkg.in/h2non/gentleman.v2/plugins/headers
39+
gopkg.in/h2non/gentleman.v2/plugins/multipart
40+
gopkg.in/h2non/gentleman.v2/plugins/query
41+
gopkg.in/h2non/gentleman.v2/plugins/timeout
42+
gopkg.in/h2non/gentleman.v2/plugins/url
43+
gopkg.in/h2non/gentleman.v2/utils
44+
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
45+
## explicit
46+
gopkg.in/yaml.v3

0 commit comments

Comments
 (0)