From 149279ed8360cbcb8ddb57e60a2ce12c3945ea33 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Sun, 14 Mar 2021 11:55:24 -0600 Subject: [PATCH] Release v2.0.0 Signed-off-by: Ivan Kozlovic --- .travis.yml | 16 +++++++--------- go.mod | 4 ++-- go.sum | 18 +++++++++--------- v2/go.mod | 6 +++--- v2/go.sum | 18 +++++++++--------- v2/signingkeys.go | 5 +---- 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 220af33..6afe652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,21 +3,20 @@ os: - windows language: go go: - - 1.13.x - - 1.14.x + - 1.16.x + - 1.15.x git: depth: false env: - V= - V=v2 -install: +before_script: + - cd $TRAVIS_BUILD_DIR/${V} - go get -t ./... - go get -u honnef.co/go/tools/cmd/staticcheck - go get -u github.com/client9/misspell/cmd/misspell - go get github.com/mattn/goveralls - go get github.com/wadey/gocovmerge -before_script: - - cd $TRAVIS_BUILD_DIR/${V} - go vet ./... - misspell -error -locale US . - staticcheck ./... @@ -31,7 +30,6 @@ deploy: skip_cleanup: true script: $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service travis-ci on: - condition: ${V} = "" && $TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION =~ ^1.14 - - - + # Does not matter what is the value of ${V} here, just that we want to do the + # release only once. So we put all conditions that reduce the matrix to 1 run. + condition: ${V} = "v2" && $TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION =~ 1.16 diff --git a/go.mod b/go.mod index 99666c5..73ca381 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/nats-io/jwt -require github.com/nats-io/nkeys v0.2.0 +go 1.16 -go 1.14 +require github.com/nats-io/nkeys v0.3.0 diff --git a/go.sum b/go.sum index 05ef1fb..e2eb252 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ -github.com/nats-io/nkeys v0.2.0 h1:WXKF7diOaPU9cJdLD7nuzwasQy9vT1tBqzXZZf3AMJM= -github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/v2/go.mod b/v2/go.mod index 2b66464..36158f2 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -1,10 +1,10 @@ module github.com/nats-io/jwt/v2 require ( - github.com/nats-io/jwt v1.1.0 - github.com/nats-io/nkeys v0.2.0 + github.com/nats-io/jwt v1.2.2 + github.com/nats-io/nkeys v0.3.0 ) -replace github.com/nats-io/jwt v1.1.0 => ../ +replace github.com/nats-io/jwt v1.2.2 => ../ go 1.14 diff --git a/v2/go.sum b/v2/go.sum index 05ef1fb..e2eb252 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -1,9 +1,9 @@ -github.com/nats-io/nkeys v0.2.0 h1:WXKF7diOaPU9cJdLD7nuzwasQy9vT1tBqzXZZf3AMJM= -github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/v2/signingkeys.go b/v2/signingkeys.go index 44637ad..87fc951 100644 --- a/v2/signingkeys.go +++ b/v2/signingkeys.go @@ -110,10 +110,7 @@ func (sk SigningKeys) Validate(vr *ValidationResults) { for k, v := range sk { // regular signing keys won't have a scope if v != nil { - sv, ok := v.(Scope) - if ok { - sv.Validate(vr) - } + v.Validate(vr) } else { if !nkeys.IsValidPublicAccountKey(k) { vr.AddError("%q is not a valid account signing key", k)