Merge pull request #13378 from ysksuzuki/replace-jwt-go

Replace github.com/dgrijalva/jwt-go with github.com/golang-jwt/jwt
etcd-io · Oct 4, 2021 · 8ea187e · 8ea187e
2 parents 41061e5 + e63d058
commit 8ea187e
Show file tree

Hide file tree

Showing 22 changed files with 101 additions and 56 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [1.12.17, 1.15.13]
+        go: [1.12.17, 1.15.15]
         target:
         - linux-amd64-fmt
         - linux-amd64-integration-1-cpu
@@ -22,17 +22,17 @@ jobs:
           target: linux-amd64-grpcproxy
         - go: 1.12.17
           target: linux-386-unit
-        - go: 1.15.13
+        - go: 1.15.15
           target: linux-amd64-integration-1-cpu
-        - go: 1.15.13
+        - go: 1.15.15
           target: linux-amd64-integration-2-cpu
         - go: 1.12.17
           target: linux-amd64-unit
-        - go: 1.15.13
+        - go: 1.15.15
           target: linux-amd64-coverage
         - go: 1.12.17
           target: linux-amd64-fmt
-        - go: 1.15.13
+        - go: 1.15.15
           target: linux-386-unit
     steps:
     - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
         TARGET: ${{ matrix.target }}
         GO_VERSION: ${{ matrix.go }}
       run: |
-        RACE='true'; if [[ ${GO_VERSION} == 1.15.13 ]]; then echo 'setting race off'; RACE='false'; fi
+        RACE='true'; if [[ ${GO_VERSION} == 1.15.15 ]]; then echo 'setting race off'; RACE='false'; fi
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-fmt)

diff --git a/auth/jwt.go b/auth/jwt.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"time"
 
-	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/golang-jwt/jwt"
 	"go.uber.org/zap"
 )
 

diff --git a/auth/options.go b/auth/options.go
@@ -21,7 +21,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/golang-jwt/jwt"
 )
 
 const (

diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -45,29 +45,29 @@
 		]
 	},
 	{
-		"project": "github.com/dgrijalva/jwt-go",
+		"project": "github.com/dustin/go-humanize",
 		"licenses": [
 			{
 				"type": "MIT License",
-				"confidence": 0.9891304347826086
+				"confidence": 0.96875
 			}
 		]
 	},
 	{
-		"project": "github.com/dustin/go-humanize",
+		"project": "github.com/gogo/protobuf",
 		"licenses": [
 			{
-				"type": "MIT License",
-				"confidence": 0.96875
+				"type": "BSD 3-clause \"New\" or \"Revised\" License",
+				"confidence": 0.9163346613545816
 			}
 		]
 	},
 	{
-		"project": "github.com/gogo/protobuf",
+		"project": "github.com/golang-jwt/jwt",
 		"licenses": [
 			{
-				"type": "BSD 3-clause \"New\" or \"Revised\" License",
-				"confidence": 0.9163346613545816
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
 			}
 		]
 	},

diff --git a/go.mod b/go.mod
@@ -9,10 +9,10 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7
 	github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf
 	github.com/creack/pty v1.1.11
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/gogo/protobuf v1.2.1
+	github.com/golang-jwt/jwt v3.2.1+incompatible
 	github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
 	github.com/golang/protobuf v1.3.2
 	github.com/google/btree v1.0.0

diff --git a/go.sum b/go.sum
@@ -22,8 +22,6 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -37,6 +35,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
+github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=

diff --git a/vendor/github.com/dgrijalva/jwt-go/LICENSE → vendor/github.com/golang-jwt/jwt/LICENSE b/vendor/github.com/dgrijalva/jwt-go/LICENSE → vendor/github.com/golang-jwt/jwt/LICENSE
diff --git a/vendor/github.com/dgrijalva/jwt-go/claims.go → vendor/github.com/golang-jwt/jwt/claims.go b/vendor/github.com/dgrijalva/jwt-go/claims.go → vendor/github.com/golang-jwt/jwt/claims.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/doc.go → vendor/github.com/golang-jwt/jwt/doc.go b/vendor/github.com/dgrijalva/jwt-go/doc.go → vendor/github.com/golang-jwt/jwt/doc.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa.go → vendor/github.com/golang-jwt/jwt/ecdsa.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa.go → vendor/github.com/golang-jwt/jwt/ecdsa.go
diff --git a/...ithub.com/dgrijalva/jwt-go/ecdsa_utils.go → .../github.com/golang-jwt/jwt/ecdsa_utils.go b/...ithub.com/dgrijalva/jwt-go/ecdsa_utils.go → .../github.com/golang-jwt/jwt/ecdsa_utils.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/errors.go → vendor/github.com/golang-jwt/jwt/errors.go b/vendor/github.com/dgrijalva/jwt-go/errors.go → vendor/github.com/golang-jwt/jwt/errors.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/hmac.go → vendor/github.com/golang-jwt/jwt/hmac.go b/vendor/github.com/dgrijalva/jwt-go/hmac.go → vendor/github.com/golang-jwt/jwt/hmac.go
diff --git a/...github.com/dgrijalva/jwt-go/map_claims.go → ...r/github.com/golang-jwt/jwt/map_claims.go b/...github.com/dgrijalva/jwt-go/map_claims.go → ...r/github.com/golang-jwt/jwt/map_claims.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/none.go → vendor/github.com/golang-jwt/jwt/none.go b/vendor/github.com/dgrijalva/jwt-go/none.go → vendor/github.com/golang-jwt/jwt/none.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/parser.go → vendor/github.com/golang-jwt/jwt/parser.go b/vendor/github.com/dgrijalva/jwt-go/parser.go → vendor/github.com/golang-jwt/jwt/parser.go
diff --git a/vendor/github.com/dgrijalva/jwt-go/rsa.go → vendor/github.com/golang-jwt/jwt/rsa.go b/vendor/github.com/dgrijalva/jwt-go/rsa.go → vendor/github.com/golang-jwt/jwt/rsa.go
diff --git a/...or/github.com/dgrijalva/jwt-go/rsa_pss.go → vendor/github.com/golang-jwt/jwt/rsa_pss.go b/...or/github.com/dgrijalva/jwt-go/rsa_pss.go → vendor/github.com/golang-jwt/jwt/rsa_pss.go
diff --git a/.../github.com/dgrijalva/jwt-go/rsa_utils.go → ...or/github.com/golang-jwt/jwt/rsa_utils.go b/.../github.com/dgrijalva/jwt-go/rsa_utils.go → ...or/github.com/golang-jwt/jwt/rsa_utils.go
diff --git a/...ub.com/dgrijalva/jwt-go/signing_method.go → ...thub.com/golang-jwt/jwt/signing_method.go b/...ub.com/dgrijalva/jwt-go/signing_method.go → ...thub.com/golang-jwt/jwt/signing_method.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ import ( @@
     	"io/ioutil"
     	"time"
-    	jwt "github.com/dgrijalva/jwt-go"
+    	"github.com/golang-jwt/jwt"
     )
     const (
@@ Expand Down @@