From 1160ef94141a102f94c6dd07e93a2738fc4435b1 Mon Sep 17 00:00:00 2001 From: Beuchat Bastien Date: Fri, 12 Nov 2021 15:27:08 +0100 Subject: [PATCH 1/2] [CLOUDTRUST-3881] Migrate from dep to go modules --- Gopkg.lock | 145 ----------------------------------------------- Gopkg.toml | 54 ------------------ Jenkinsfile | 5 +- authorization.go | 2 +- go.mod | 17 ++++++ go.sum | 42 ++++++++++++++ mock_test.go | 2 + 7 files changed, 64 insertions(+), 203 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 87b8cbd..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,145 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "UT" - revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" - version = "v1.1.1" - -[[projects]] - digest = "1:cb07c3f044a051a6e3c984dc6f09ba5cb7d51d74fb9a0f15db294561c98740f8" - name = "github.com/gbrlsnchs/jwt" - packages = ["."] - pruneopts = "UT" - revision = "808efa0714baff8c25cc65ef8681966740beb9f9" - version = "v2.0.0" - -[[projects]] - digest = "1:a4e1932ad06fc04794b8af07eb167d549bbb402d5a962857f0351fca1fcc0d1c" - name = "github.com/golang/mock" - packages = ["gomock"] - pruneopts = "UT" - revision = "a23c5e7c8f7bb73c8ae5d8711815bbd30f3cfac8" - version = "v1.5.0" - -[[projects]] - digest = "1:6078383dbb7405bfa3ce16957f37564e3b716afa29b6eb45ffdb6674624d1e0d" - name = "github.com/gorilla/mux" - packages = ["."] - pruneopts = "UT" - revision = "98cb6bf42e086f6af920b965c38cacc07402d51b" - version = "v1.8.0" - -[[projects]] - digest = "1:9e1d37b58d17113ec3cb5608ac0382313c5b59470b94ed97d0976e69c7022314" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "UT" - revision = "614d223910a179a466c1767a985424175c39b465" - version = "v0.9.1" - -[[projects]] - digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "UT" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - digest = "1:edb231f4f062fe87e1cc93351e1ee06d4cebf553d1f85f9f3b9b4903df42df20" - name = "github.com/stretchr/testify" - packages = ["assert"] - pruneopts = "UT" - revision = "acba37e5db06f0093b465a7d47822bf13644b66c" - version = "v1.7.0" - -[[projects]] - branch = "master" - digest = "1:ee759bdc188ca4904da9d108a2d997971f3d6352bbd350fc199dc7a25bf9d46f" - name = "golang.org/x/net" - packages = [ - "idna", - "publicsuffix", - ] - pruneopts = "UT" - revision = "0714010a04edd230e18075cd951dd826f04b1e11" - -[[projects]] - digest = "1:d343bfab7897dd73ee9bf8172d1fc83d935b7512067856ed596aaf57a9345f3c" - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/language", - "internal/language/compact", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - ] - pruneopts = "UT" - revision = "e328d63cff14134669501e0e154e4f141c784322" - version = "v0.3.6" - -[[projects]] - digest = "1:e957094a53f7233fbf0847e9789ea6b0e41287eaf5179888503c82c3aecabaf7" - name = "gopkg.in/h2non/gentleman.v2" - packages = [ - ".", - "context", - "middleware", - "mux", - "plugin", - "plugins/body", - "plugins/bodytype", - "plugins/cookies", - "plugins/headers", - "plugins/multipart", - "plugins/query", - "plugins/timeout", - "plugins/url", - "utils", - ] - pruneopts = "UT" - revision = "f14529a1dee7b7a12b57032fea670377c4030f50" - version = "v2.0.5" - -[[projects]] - branch = "v3" - digest = "1:107a619d3c3bcca214b2b7db810a5dffcd74b5d0262813cb2986e063fae2722f" - name = "gopkg.in/yaml.v3" - packages = ["."] - pruneopts = "UT" - revision = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/gbrlsnchs/jwt", - "github.com/golang/mock/gomock", - "github.com/gorilla/mux", - "github.com/pkg/errors", - "github.com/stretchr/testify/assert", - "gopkg.in/h2non/gentleman.v2", - "gopkg.in/h2non/gentleman.v2/context", - "gopkg.in/h2non/gentleman.v2/plugin", - "gopkg.in/h2non/gentleman.v2/plugins/body", - "gopkg.in/h2non/gentleman.v2/plugins/query", - "gopkg.in/h2non/gentleman.v2/plugins/timeout", - "gopkg.in/h2non/gentleman.v2/plugins/url", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index eecf720..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,54 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/gbrlsnchs/jwt" - version = "2.0.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.9.1" - -[[constraint]] - name = "gopkg.in/h2non/gentleman.v2" - version = "2.0.5" - -[[constraint]] - name = "github.com/golang/mock" - version = "1.5.0" - -[[constraint]] - name = "github.com/gorilla/mux" - version = "1.8.0" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.7.0" - -[prune] - go-tests = true - unused-packages = true diff --git a/Jenkinsfile b/Jenkinsfile index d27f6c9..2924d2e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,16 +29,15 @@ pipeline { golint ./... | tee golint.out || true - dep ensure - go generate ./... + go mod vendor go test -coverprofile=coverage.out -json ./... | tee report.json go tool cover -func=coverage.out bash -c \"go vet ./... > >(cat) 2> >(tee govet.out)\" || true gometalinter --vendor --disable=gotype --disable=golint --disable=vet --disable=gocyclo --exclude=/usr/local/go/src --deadline=300s ./... | tee gometalinter.out || true - nancy -no-color Gopkg.lock || true + go list -json -deps | nancy -no-color || true JAVA_TOOL_OPTIONS="" sonar-scanner \ -Dsonar.host.url=https://sonarqube-cloudtrust-cicd.openshift.west.ch.elca-cloud.com \ diff --git a/authorization.go b/authorization.go index 2c1955d..94f2d3c 100644 --- a/authorization.go +++ b/authorization.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - jwt "github.com/gbrlsnchs/jwt" + jwt "github.com/gbrlsnchs/jwt/v2" "github.com/pkg/errors" "gopkg.in/h2non/gentleman.v2" "gopkg.in/h2non/gentleman.v2/context" diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..eaa154b --- /dev/null +++ b/go.mod @@ -0,0 +1,17 @@ +module github.com/cloudtrust/httpclient + +go 1.15 + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gbrlsnchs/jwt/v2 v2.0.0 + github.com/golang/mock v1.5.0 + github.com/gorilla/mux v1.8.0 + github.com/pkg/errors v0.9.1 + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/testify v1.7.0 + golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect + golang.org/x/text v0.3.6 // indirect + gopkg.in/h2non/gentleman.v2 v2.0.5 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..ca6d1b3 --- /dev/null +++ b/go.sum @@ -0,0 +1,42 @@ +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= +github.com/gbrlsnchs/jwt v1.1.0 h1:Gh2CoXcIfk8/LxV8ks0GDOmUDCpVIrw8Oa34Ozmw/10= +github.com/gbrlsnchs/jwt/v2 v2.0.0 h1:4iEVJykJPXrCimVaQJAfBWKAvuzDJi5fDdUBdrdTZ3M= +github.com/gbrlsnchs/jwt/v2 v2.0.0/go.mod h1:7kIj4oeJPffUpLL8RnU5Y3xT1Sm/VuFqjv8T1tqhqc8= +github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210505214959-0714010a04ed h1:V9kAVxLvz1lkufatrpHuUVyJ/5tR3Ms7rk951P4mI98= +golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/h2non/gentleman.v2 v2.0.5 h1:ckmb6cLxL2DDk7WN7LSdxXDq7jNkOicFg4JZ4ZnDNuE= +gopkg.in/h2non/gentleman.v2 v2.0.5/go.mod h1:A1c7zwrTgAyyf6AbpvVksYtBayTB4STBUGmdkEtlHeA= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/mock_test.go b/mock_test.go index 3a354f4..3143ef0 100644 --- a/mock_test.go +++ b/mock_test.go @@ -1,3 +1,5 @@ package httpclient +import _ "github.com/golang/mock/mockgen/model" + //go:generate mockgen -destination=./mock/http.go -package=mock -mock_names=Handler=Handler net/http Handler From bf7bf9b32537f6777ef35525355def85f3ea513b Mon Sep 17 00:00:00 2001 From: Beuchat Bastien Date: Wed, 17 Nov 2021 11:11:36 +0100 Subject: [PATCH 2/2] [CLOUDTRUST-3881] FIX Migrate from dep to go modules --- .gitignore | 3 +++ mock_test.go | 2 +- vendor/modules.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 vendor/modules.txt diff --git a/.gitignore b/.gitignore index e87afe1..65c9eab 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ bin/* configs/DEV/* **/mock .idea/ + +# Activate vendoring +!vendor/modules.txt diff --git a/mock_test.go b/mock_test.go index 3143ef0..edb2c9a 100644 --- a/mock_test.go +++ b/mock_test.go @@ -2,4 +2,4 @@ package httpclient import _ "github.com/golang/mock/mockgen/model" -//go:generate mockgen -destination=./mock/http.go -package=mock -mock_names=Handler=Handler net/http Handler +//go:generate mockgen --build_flags=--mod=mod -destination=./mock/http.go -package=mock -mock_names=Handler=Handler net/http Handler diff --git a/vendor/modules.txt b/vendor/modules.txt new file mode 100644 index 0000000..fc96e87 --- /dev/null +++ b/vendor/modules.txt @@ -0,0 +1,46 @@ +# github.com/davecgh/go-spew v1.1.1 +## explicit +github.com/davecgh/go-spew/spew +# github.com/gbrlsnchs/jwt/v2 v2.0.0 +## explicit +github.com/gbrlsnchs/jwt/v2 +# github.com/golang/mock v1.5.0 +## explicit +github.com/golang/mock/gomock +github.com/golang/mock/mockgen/model +# github.com/gorilla/mux v1.8.0 +## explicit +github.com/gorilla/mux +# github.com/pkg/errors v0.9.1 +## explicit +github.com/pkg/errors +# github.com/pmezard/go-difflib v1.0.0 +## explicit +github.com/pmezard/go-difflib/difflib +# github.com/stretchr/testify v1.7.0 +## explicit +github.com/stretchr/testify/assert +# golang.org/x/net v0.0.0-20210505214959-0714010a04ed +## explicit +golang.org/x/net/publicsuffix +# golang.org/x/text v0.3.6 +## explicit +# gopkg.in/h2non/gentleman.v2 v2.0.5 +## explicit +gopkg.in/h2non/gentleman.v2 +gopkg.in/h2non/gentleman.v2/context +gopkg.in/h2non/gentleman.v2/middleware +gopkg.in/h2non/gentleman.v2/mux +gopkg.in/h2non/gentleman.v2/plugin +gopkg.in/h2non/gentleman.v2/plugins/body +gopkg.in/h2non/gentleman.v2/plugins/bodytype +gopkg.in/h2non/gentleman.v2/plugins/cookies +gopkg.in/h2non/gentleman.v2/plugins/headers +gopkg.in/h2non/gentleman.v2/plugins/multipart +gopkg.in/h2non/gentleman.v2/plugins/query +gopkg.in/h2non/gentleman.v2/plugins/timeout +gopkg.in/h2non/gentleman.v2/plugins/url +gopkg.in/h2non/gentleman.v2/utils +# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b +## explicit +gopkg.in/yaml.v3