From 1b68ff6bbf5fe43087bdd09db1d0f749c54e5a80 Mon Sep 17 00:00:00 2001 From: david may <1301201+wass3r@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:00:12 -0500 Subject: [PATCH] fix(deps): switch go-jose lib (#1141) --- go.mod | 26 +++++++++++--------------- go.sum | 2 -- queue/redis/length_test.go | 4 +--- queue/redis/pop_test.go | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 3498c9262..e5501ee7a 100644 --- a/go.mod +++ b/go.mod @@ -42,27 +42,12 @@ require ( golang.org/x/crypto v0.24.0 golang.org/x/oauth2 v0.21.0 golang.org/x/sync v0.7.0 - gopkg.in/square/go-jose.v2 v2.6.0 gorm.io/driver/postgres v1.5.7 gorm.io/driver/sqlite v1.5.5 gorm.io/gorm v1.25.10 k8s.io/apimachinery v0.30.1 ) -require ( - github.com/bytedance/sonic/loader v0.1.1 // indirect - github.com/cloudwego/base64x v0.1.4 // indirect - github.com/cloudwego/iasm v0.2.0 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect - github.com/go-jose/go-jose/v4 v4.0.1 // indirect - github.com/lestrrat-go/blackmagic v1.0.2 // indirect - github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/httprc v1.0.5 // indirect - github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/option v1.0.1 // indirect - github.com/segmentio/asm v1.2.0 // indirect -) - require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -71,12 +56,17 @@ require ( github.com/aymerick/douceur v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -106,6 +96,11 @@ require ( github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lestrrat-go/blackmagic v1.0.2 // indirect + github.com/lestrrat-go/httpcc v1.0.1 // indirect + github.com/lestrrat-go/httprc v1.0.5 // indirect + github.com/lestrrat-go/iter v1.0.2 // indirect + github.com/lestrrat-go/option v1.0.1 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.17 // indirect github.com/mitchellh/copystructure v1.0.0 // indirect @@ -121,6 +116,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect diff --git a/go.sum b/go.sum index 6d22f2b80..b605035f1 100644 --- a/go.sum +++ b/go.sum @@ -364,8 +364,6 @@ google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/queue/redis/length_test.go b/queue/redis/length_test.go index 9656a8c20..cd87b1036 100644 --- a/queue/redis/length_test.go +++ b/queue/redis/length_test.go @@ -4,11 +4,10 @@ package redis import ( "context" + "encoding/json" "reflect" "testing" - "gopkg.in/square/go-jose.v2/json" - "github.com/go-vela/server/queue/models" ) @@ -59,7 +58,6 @@ func TestRedis_Length(t *testing.T) { } } got, err := _redis.Length(context.Background()) - if err != nil { t.Errorf("Length returned err: %v", err) } diff --git a/queue/redis/pop_test.go b/queue/redis/pop_test.go index 190839f80..8afcad695 100644 --- a/queue/redis/pop_test.go +++ b/queue/redis/pop_test.go @@ -4,12 +4,12 @@ package redis import ( "context" + "encoding/json" "testing" "time" "github.com/google/go-cmp/cmp" "golang.org/x/crypto/nacl/sign" - "gopkg.in/square/go-jose.v2/json" "github.com/go-vela/server/queue/models" )