From 7cede6903e9dbcee1ee37459b7c5e4de57b685a3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 13 Aug 2021 13:59:24 +0200 Subject: [PATCH] autorest/adal: switch to github.com/golang-jwt/jwt v3.2.2 The github.com/form3tech-oss/jwt-go fork has been archived, and all development is moved to the github.com/golang-jwt/jwt project, which is now the canonical/official fork of github.com/dgrijalva/jwt-go. The latest version of github.com/golang-jwt/jwt (v4.0.0) also adds go module support, but the main github.com/Azure/go-autorest package currently uses "go dep", which is not compatible with go modules that use versioned import paths (github.com/golang-jwt/jwt/v4) for modules that do not use a `v` directory. Signed-off-by: Sebastiaan van Stijn --- Gopkg.lock | 8 ++++---- Gopkg.toml | 10 ++++++---- autorest/adal/go.mod | 5 ++++- autorest/adal/go.sum | 9 +++++---- autorest/adal/token.go | 2 +- autorest/adal/token_test.go | 2 +- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6a54f01ec..0749ef9cc 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -41,11 +41,11 @@ version = "v1.1.0" [[projects]] - digest = "1:3be7b7206a3fd8686175fd974eb33a1c9dd109c149bdf19801e32b8f48733530" - name = "github.com/form3tech-oss/jwt-go" + digest = "1:12ec4f6802cbeeb97618997973d510d53150a3650ab91cf6084a5255187af720" + name = "github.com/golang-jwt/jwt" packages = ["."] pruneopts = "UT" - revision = "9162a5abdbc046b7c8b03ee90052cee67e25caa7" + revision = "4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29" version = "v3.2.2" [[projects]] @@ -310,7 +310,7 @@ input-imports = [ "contrib.go.opencensus.io/exporter/ocagent", "github.com/dimchansky/utfbom", - "github.com/form3tech-oss/jwt-go", + "github.com/golang-jwt/jwt", "github.com/mitchellh/go-homedir", "github.com/stretchr/testify/require", "go.opencensus.io/plugin/ochttp", diff --git a/Gopkg.toml b/Gopkg.toml index fcb0295f8..a0a0b5779 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,6 +38,12 @@ required = ["golang.org/x/lint/golint"] name = "github.com/dimchansky/utfbom" version = "1.1.0" +[[constraint]] + name = "github.com/golang-jwt/jwt" + # NOTE: cannot move to github.com/golang-jwt/jwt/v4 yet, because go dep is not + # compatible with v2+ go modules that do not use a v directory. + version = "<4.0.0" + [[constraint]] name = "github.com/mitchellh/go-homedir" version = "1.1.0" @@ -53,7 +59,3 @@ required = ["golang.org/x/lint/golint"] [[constraint]] branch = "master" name = "golang.org/x/crypto" - -[[constraint]] - name = "github.com/form3tech-oss/jwt-go" - version = "3.2.2" diff --git a/autorest/adal/go.mod b/autorest/adal/go.mod index 732c6ff2b..14d972df8 100644 --- a/autorest/adal/go.mod +++ b/autorest/adal/go.mod @@ -8,6 +8,9 @@ require ( github.com/Azure/go-autorest/autorest/mocks v0.4.1 github.com/Azure/go-autorest/logger v0.2.1 github.com/Azure/go-autorest/tracing v0.6.0 - github.com/form3tech-oss/jwt-go v3.2.2+incompatible + // NOTE: cannot move to github.com/golang-jwt/jwt/v4 yet, because the main + // github.com/Azure/go-autorest code uses go dep, which is not + // compatible with v2+ go modules that do not use a v directory. + github.com/golang-jwt/jwt v3.2.2+incompatible golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 ) diff --git a/autorest/adal/go.sum b/autorest/adal/go.sum index 5ee68e700..548f6d040 100644 --- a/autorest/adal/go.sum +++ b/autorest/adal/go.sum @@ -8,14 +8,15 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/autorest/adal/token.go b/autorest/adal/token.go index 1d0241f8e..60195d787 100644 --- a/autorest/adal/token.go +++ b/autorest/adal/token.go @@ -37,7 +37,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/Azure/go-autorest/logger" - "github.com/form3tech-oss/jwt-go" + "github.com/golang-jwt/jwt" ) const ( diff --git a/autorest/adal/token_test.go b/autorest/adal/token_test.go index e74413862..0c375374b 100644 --- a/autorest/adal/token_test.go +++ b/autorest/adal/token_test.go @@ -36,7 +36,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/Azure/go-autorest/autorest/mocks" - jwt "github.com/form3tech-oss/jwt-go" + jwt "github.com/golang-jwt/jwt" ) const (