diff --git a/database/integration_test.go b/database/integration_test.go index f95faa106..7b4c8762a 100644 --- a/database/integration_test.go +++ b/database/integration_test.go @@ -14,7 +14,7 @@ import ( "github.com/adhocore/gronx" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" api "github.com/go-vela/server/api/types" "github.com/go-vela/server/api/types/settings" diff --git a/database/jwk/create.go b/database/jwk/create.go index 4aff0ad7a..e5fdc256e 100644 --- a/database/jwk/create.go +++ b/database/jwk/create.go @@ -7,7 +7,7 @@ import ( "database/sql" "fmt" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/sirupsen/logrus" "github.com/go-vela/server/constants" diff --git a/database/jwk/get.go b/database/jwk/get.go index 432e56fbd..1d43ed173 100644 --- a/database/jwk/get.go +++ b/database/jwk/get.go @@ -5,7 +5,7 @@ package jwk import ( "context" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/go-vela/server/constants" "github.com/go-vela/server/database/types" diff --git a/database/jwk/get_test.go b/database/jwk/get_test.go index 2c7d35d2e..e24601892 100644 --- a/database/jwk/get_test.go +++ b/database/jwk/get_test.go @@ -9,7 +9,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/google/go-cmp/cmp" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/go-vela/server/database/testutils" ) diff --git a/database/jwk/interface.go b/database/jwk/interface.go index 138f6e247..57b6ad979 100644 --- a/database/jwk/interface.go +++ b/database/jwk/interface.go @@ -5,7 +5,7 @@ package jwk import ( "context" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" ) // JWKInterface represents the Vela interface for JWK diff --git a/database/jwk/list.go b/database/jwk/list.go index 5cd31eb4a..f821d8231 100644 --- a/database/jwk/list.go +++ b/database/jwk/list.go @@ -5,7 +5,7 @@ package jwk import ( "context" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/go-vela/server/constants" "github.com/go-vela/server/database/types" diff --git a/database/jwk/list_test.go b/database/jwk/list_test.go index d9bc29aa3..f93191d78 100644 --- a/database/jwk/list_test.go +++ b/database/jwk/list_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/go-vela/server/database/testutils" ) diff --git a/database/testutils/api_resources.go b/database/testutils/api_resources.go index ce3c8a164..ffa272d27 100644 --- a/database/testutils/api_resources.go +++ b/database/testutils/api_resources.go @@ -7,7 +7,7 @@ import ( "crypto/rsa" "github.com/google/uuid" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" api "github.com/go-vela/server/api/types" "github.com/go-vela/server/api/types/actions" diff --git a/database/testutils/mock_args.go b/database/testutils/mock_args.go index 463e1fe33..7489510ea 100644 --- a/database/testutils/mock_args.go +++ b/database/testutils/mock_args.go @@ -8,7 +8,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" ) // This will be used with the github.com/DATA-DOG/go-sqlmock library to compare values diff --git a/database/types/jwk.go b/database/types/jwk.go index 2b4c4b18c..93544fff7 100644 --- a/database/types/jwk.go +++ b/database/types/jwk.go @@ -8,7 +8,7 @@ import ( "errors" "github.com/google/uuid" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" ) var ( diff --git a/go.mod b/go.mod index 5eb550921..fcaa70583 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/hashicorp/vault/api v1.23.0 github.com/invopop/jsonschema v0.14.0 github.com/joho/godotenv v1.5.1 - github.com/lestrrat-go/jwx/v3 v3.1.1 + github.com/lestrrat-go/jwx/v4 v4.0.2 github.com/lib/pq v1.12.3 github.com/microcosm-cc/bluemonday v1.0.27 github.com/minio/minio-go/v7 v7.1.0 @@ -85,7 +85,6 @@ require ( github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect @@ -122,10 +121,7 @@ require ( github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/klauspost/crc32 v1.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/lestrrat-go/blackmagic v1.0.4 // indirect - github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/httprc/v3 v3.0.5 // indirect - github.com/lestrrat-go/option/v2 v2.0.0 // indirect + github.com/lestrrat-go/option/v3 v3.0.0-alpha1 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.28 // indirect github.com/minio/crc64nvme v1.1.1 // indirect @@ -148,7 +144,6 @@ require ( github.com/quic-go/quic-go v0.59.0 // indirect github.com/rs/xid v1.6.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect - github.com/segmentio/asm v1.2.1 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/spf13/cast v1.8.0 // indirect github.com/tinylib/msgp v1.6.1 // indirect diff --git a/go.sum b/go.sum index 2f2c3a144..a2563aff4 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 h1:5RVFMOWjMyRy8cARdy79nAmgYw3hK/4HUq48LQ6Wwqo= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/drone/envsubst v1.0.3 h1:PCIBwNDYjs50AsLZPYdfhSATKaRg/FJmDc2D6+C2x8g= @@ -216,20 +214,12 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA= -github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= -github.com/lestrrat-go/dsig v1.2.1 h1:MwxzZhE4+4fguHi+uDALKVlC3Cn+O1QU1Q/F8D7hVIc= -github.com/lestrrat-go/dsig v1.2.1/go.mod h1:RD2eOaidyPvpc7IJQoO3Qq52RWdy8ZcJs8lrOnoa1Kc= -github.com/lestrrat-go/dsig-secp256k1 v1.0.0 h1:JpDe4Aybfl0soBvoVwjqDbp+9S1Y2OM7gcrVVMFPOzY= -github.com/lestrrat-go/dsig-secp256k1 v1.0.0/go.mod h1:CxUgAhssb8FToqbL8NjSPoGQlnO4w3LG1P0qPWQm/NU= -github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= -github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= -github.com/lestrrat-go/httprc/v3 v3.0.5 h1:S+Mb4L2I+bM6JGTibLmxExhyTOqnXjqx+zi9MoXw/TM= -github.com/lestrrat-go/httprc/v3 v3.0.5/go.mod h1:mSMtkZW92Z98M5YoNNztbRGxbXHql7tSitCvaxvo9l0= -github.com/lestrrat-go/jwx/v3 v3.1.1 h1:yd9AdPmZ4INnQ7k42IrzXYpnEG803+SrQ6hdMvzHJzw= -github.com/lestrrat-go/jwx/v3 v3.1.1/go.mod h1:uw/MN2M/Xiu4FhwcIwH11Zsh9JWx9SWzgALl7/uIEkU= -github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss= -github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg= +github.com/lestrrat-go/dsig v1.3.0 h1:phjMOCXvYzhuIgn7Voe2rex8z166vGfxRxmqM25P9/Q= +github.com/lestrrat-go/dsig v1.3.0/go.mod h1:RD2eOaidyPvpc7IJQoO3Qq52RWdy8ZcJs8lrOnoa1Kc= +github.com/lestrrat-go/jwx/v4 v4.0.2 h1:T3lzN2dynOt6SuowT08ZWo/cPs3YsB0GHZSXKvfE0uQ= +github.com/lestrrat-go/jwx/v4 v4.0.2/go.mod h1:F2a0rSyXsqLAL0orBZGOXrzQGv018Tx4eiEWWYR7Yzo= +github.com/lestrrat-go/option/v3 v3.0.0-alpha1 h1:dvdzLwm/Ba5CJUF3jQP7w/iNYSLfy7yyh9XXNa1WjxI= +github.com/lestrrat-go/option/v3 v3.0.0-alpha1/go.mod h1:5KSg20dfsKkNJtjDmaQRLZVXuUrzuCCcz/gbDK0pfKk= github.com/lib/pq v1.12.3 h1:tTWxr2YLKwIvK90ZXEw8GP7UFHtcbTtty8zsI+YjrfQ= github.com/lib/pq v1.12.3/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= @@ -295,8 +285,6 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= -github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= diff --git a/internal/token/generate_rsa.go b/internal/token/generate_rsa.go index e9134c1f0..f394019b4 100644 --- a/internal/token/generate_rsa.go +++ b/internal/token/generate_rsa.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/google/uuid" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" "github.com/sirupsen/logrus" "github.com/go-vela/server/database" diff --git a/mock/server/authentication.go b/mock/server/authentication.go index 4d644226e..7113e831f 100644 --- a/mock/server/authentication.go +++ b/mock/server/authentication.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/lestrrat-go/jwx/v3/jwk" + "github.com/lestrrat-go/jwx/v4/jwk" api "github.com/go-vela/server/api/types" "github.com/go-vela/server/constants"