Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(2.11) Bump github.com/nats-io/jwt/v2 from 2.6.0 to 2.7.0 #5915

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

(2.11) Bump github.com/nats-io/jwt/v2 from 2.6.0 to 2.7.0 #5915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01beae8
Bump github.com/nats-io/jwt/v2 from 2.6.0 to 2.7.0
dependabot[bot] Sep 23, 2024
da3bd05
Fix build error as a result of JWT library update
neilalexander Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/go-tpm v0.9.0
github.com/klauspost/compress v1.17.9
github.com/minio/highwayhash v1.0.3
github.com/nats-io/jwt/v2 v2.6.0
github.com/nats-io/jwt/v2 v2.7.0
github.com/nats-io/nats.go v1.36.0
github.com/nats-io/nkeys v0.4.7
github.com/nats-io/nuid v1.0.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q=
github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ=
github.com/nats-io/jwt/v2 v2.6.0 h1:yXoBTdEotZw3NujMT+Nnu1UPNlFWdKQ3d0JJF/+pJag=
github.com/nats-io/jwt/v2 v2.6.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw=
github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
github.com/nats-io/nats.go v1.36.0 h1:suEUPuWzTSse/XhESwqLxXGuj8vGRuPRoG7MoRN/qyU=
github.com/nats-io/nats.go v1.36.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
Expand Down
2 changes: 1 addition & 1 deletion server/accounts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3686,7 +3686,7 @@ func (s *Server) updateAccountClaimsWithRefresh(a *Account, ac *jwt.AccountClaim
// Raft groups running on the system so that they can move their subs if needed.
a.mu.Lock()
previous := ajs.nrgAccount
switch tokens := strings.SplitN(ac.ClusterTraffic, ":", 2); tokens[0] {
switch ac.ClusterTraffic {
case "system", _EMPTY_:
ajs.nrgAccount = _EMPTY_
case "owner":
Expand Down
2 changes: 1 addition & 1 deletion server/jetstream_jwt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,7 +1582,7 @@ func TestJetStreamJWTClusterAccountNRG(t *testing.T) {
// functionality yet. If/when we do enable, this test is ready just by
// uncommenting the third state below.
for _, state := range []string{"system", "owner" /*, thirdAcc */} {
accClaim.ClusterTraffic = state
accClaim.ClusterTraffic = jwt.ClusterTraffic(state)
accJwt = encodeClaim(t, accClaim, aExpPub)

for _, s := range c.servers {
Expand Down
2 changes: 1 addition & 1 deletion server/opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2164,7 +2164,7 @@ func parseJetStreamForAccount(v any, acc *Account, errors *[]error) error {
if !ok {
return &configErr{tk, fmt.Sprintf("Expected either 'system' or 'account' string value for %q, got %v", mk, mv)}
}
switch tokens := strings.SplitN(vv, ":", 2); strings.ToLower(tokens[0]) {
switch vv {
case "system", _EMPTY_:
acc.js.nrgAccount = _EMPTY_
case "owner":
Expand Down