diff --git a/go.mod b/go.mod index 499fcb15..8f5c4a2e 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/go-redis/redismock/v9 v9.2.0 github.com/go-redsync/redsync/v4 v4.13.0 github.com/gofrs/uuid v4.4.0+incompatible - github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/golang-jwt/jwt/v5 v5.2.2 github.com/google/go-containerregistry v0.20.3 github.com/google/go-github/v62 v62.0.0 github.com/google/uuid v1.6.0 @@ -55,7 +55,7 @@ require ( github.com/project-zot/mockoidc v0.0.0-20240610203808-d69d9e02020a github.com/prometheus/client_golang v1.21.1 github.com/prometheus/client_model v0.6.1 - github.com/redis/go-redis/v9 v9.7.1 + github.com/redis/go-redis/v9 v9.7.3 github.com/rs/zerolog v1.33.0 github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 github.com/sigstore/cosign/v2 v2.4.3 @@ -274,7 +274,7 @@ require ( github.com/gocsaf/csaf/v3 v3.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang-jwt/jwt/v4 v4.5.1 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect diff --git a/go.sum b/go.sum index 0744899d..7edef5df 100644 --- a/go.sum +++ b/go.sum @@ -1278,10 +1278,10 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= -github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -1866,8 +1866,8 @@ github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fO github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U= github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc= github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ= -github.com/redis/go-redis/v9 v9.7.1 h1:4LhKRCIduqXqtvCUlaq9c8bdHOkICjDMrr1+Zb3osAc= -github.com/redis/go-redis/v9 v9.7.1/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= +github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= +github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo= github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= diff --git a/pkg/api/config/redis/redis.go b/pkg/api/config/redis/redis.go index 4539b5c6..a5900393 100644 --- a/pkg/api/config/redis/redis.go +++ b/pkg/api/config/redis/redis.go @@ -190,7 +190,7 @@ func ParseRedisUniversalOptions(redisConfig map[string]interface{}, //nolint: go } if val, ok := getBool(redisConfig, "disable_identity", log); ok { - opts.DisableIndentity = val + opts.DisableIdentity = val } if val, ok := getString(redisConfig, "identity_suffix", false, log); ok { diff --git a/pkg/api/config/redis/redis_test.go b/pkg/api/config/redis/redis_test.go index 1d94be02..fdac2f91 100644 --- a/pkg/api/config/redis/redis_test.go +++ b/pkg/api/config/redis/redis_test.go @@ -127,7 +127,7 @@ func TestRedisOptions(t *testing.T) { So(options.ReadOnly, ShouldEqual, false) So(options.RouteByLatency, ShouldEqual, false) So(options.RouteRandomly, ShouldEqual, false) - So(options.DisableIndentity, ShouldEqual, false) + So(options.DisableIdentity, ShouldEqual, false) So(options.IdentitySuffix, ShouldEqual, "") So(options.UnstableResp3, ShouldEqual, false) @@ -209,7 +209,7 @@ func TestRedisOptions(t *testing.T) { So(options.ReadOnly, ShouldEqual, true) So(options.RouteByLatency, ShouldEqual, false) So(options.RouteRandomly, ShouldEqual, true) - So(options.DisableIndentity, ShouldEqual, false) + So(options.DisableIdentity, ShouldEqual, false) So(options.IdentitySuffix, ShouldEqual, "test") So(options.UnstableResp3, ShouldEqual, true) @@ -287,7 +287,7 @@ func TestRedisOptions(t *testing.T) { So(options.ReadOnly, ShouldEqual, false) So(options.RouteByLatency, ShouldEqual, false) So(options.RouteRandomly, ShouldEqual, false) - So(options.DisableIndentity, ShouldEqual, false) + So(options.DisableIdentity, ShouldEqual, false) So(options.IdentitySuffix, ShouldEqual, "") So(options.UnstableResp3, ShouldEqual, false)