Skip to content

Commit

Permalink
Merge pull request #470 from Kuadrant/bump-go-jose
Browse files Browse the repository at this point in the history
Upgrade go-jose dependency
  • Loading branch information
guicassolato committed Jun 3, 2024
1 parent 38fd5aa commit dc90ac8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion controllers/auth_config_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"github.com/kuadrant/authorino/pkg/oauth2"
"github.com/kuadrant/authorino/pkg/utils"

"github.com/go-jose/go-jose/v4"
"github.com/go-logr/logr"
"gopkg.in/square/go-jose.v2"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/eko/gocache v1.2.0
github.com/envoyproxy/go-control-plane v0.12.0
github.com/go-jose/go-jose/v4 v4.0.2
github.com/go-logr/logr v1.4.1
github.com/gogo/googleapis v1.4.0
github.com/golang-jwt/jwt v3.2.2+incompatible
Expand All @@ -32,7 +33,6 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gopkg.in/square/go-jose.v2 v2.5.1
gotest.tools v2.2.0+incompatible
k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3
Expand Down Expand Up @@ -61,6 +61,7 @@ require (
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
)

require (
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk=
github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
Expand Down
2 changes: 1 addition & 1 deletion pkg/evaluators/response/wristband.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/kuadrant/authorino/pkg/evaluators/identity"
"github.com/kuadrant/authorino/pkg/json"

jose "github.com/go-jose/go-jose/v4"
"github.com/golang-jwt/jwt"
jose "gopkg.in/square/go-jose.v2"
)

const DEFAULT_WRISTBAND_DURATION = int64(300)
Expand Down
2 changes: 1 addition & 1 deletion pkg/evaluators/response/wristband_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/kuadrant/authorino/pkg/json"

envoy_auth "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
jose "github.com/go-jose/go-jose/v4"
"github.com/golang/mock/gomock"
jose "gopkg.in/square/go-jose.v2"
"gotest.tools/assert"
)

Expand Down

0 comments on commit dc90ac8

Please sign in to comment.