fix: Fix go-jose dep. Fixes #7814 (#7874)

Signed-off-by: Jin Dong <[email protected]>
argoproj · Feb 13, 2022 · 69c5bc7 · 69c5bc7
1 parent 4ee1567
commit 69c5bc7
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -65,7 +65,7 @@ require (
  gopkg.in/go-playground/webhooks.v5 v5.17.0
  gopkg.in/jcmturner/gokrb5.v5 v5.3.0
  gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
- gopkg.in/square/go-jose.v2 v2.6.0
+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
  k8s.io/api v0.21.5
  k8s.io/apimachinery v0.21.5
  k8s.io/client-go v0.21.5
@@ -76,7 +76,10 @@ require (
  upper.io/db.v3 v3.6.3+incompatible
 )
 
-require github.com/go-git/go-git/v5 v5.3.0
+require (
+ github.com/go-git/go-git/v5 v5.3.0
+ github.com/go-jose/go-jose/v3 v3.0.0
+)
 
 require (
  cloud.google.com/go v0.100.2 // indirect

diff --git a/go.sum b/go.sum
@@ -361,6 +361,8 @@ github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
+github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
 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/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -1166,6 +1168,7 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

diff --git a/server/auth/gatekeeper_test.go b/server/auth/gatekeeper_test.go
@@ -5,12 +5,12 @@ import (
  "os"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  log "github.com/sirupsen/logrus"
  "github.com/sirupsen/logrus/hooks/test"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/mock"
  "google.golang.org/grpc/metadata"
- "gopkg.in/square/go-jose.v2/jwt"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  kubefake "k8s.io/client-go/kubernetes/fake"

diff --git a/server/auth/serviceaccount/claims.go b/server/auth/serviceaccount/claims.go
@@ -7,7 +7,7 @@ import (
  "io/ioutil"
  "strings"
 
- "gopkg.in/square/go-jose.v2/jwt"
+ "github.com/go-jose/go-jose/v3/jwt"
  "k8s.io/client-go/rest"
 
  "github.com/argoproj/argo-workflows/v3/server/auth/types"

diff --git a/server/auth/sso/sso.go b/server/auth/sso/sso.go
@@ -14,10 +14,10 @@ import (
 
  pkgrand "github.com/argoproj/pkg/rand"
  "github.com/coreos/go-oidc/v3/oidc"
+ "github.com/go-jose/go-jose/v3"
+ "github.com/go-jose/go-jose/v3/jwt"
  log "github.com/sirupsen/logrus"
  "golang.org/x/oauth2"
- "gopkg.in/square/go-jose.v2"
- "gopkg.in/square/go-jose.v2/jwt"
  apiv1 "k8s.io/api/core/v1"
  apierr "k8s.io/apimachinery/pkg/api/errors"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/server/auth/types/claims.go b/server/auth/types/claims.go
@@ -5,7 +5,7 @@ import (
  "fmt"
  "net/http"
 
- "gopkg.in/square/go-jose.v2/jwt"
+ "github.com/go-jose/go-jose/v3/jwt"
 )
 
 type Claims struct {

diff --git a/server/auth/types/claims_test.go b/server/auth/types/claims_test.go
@@ -8,8 +8,8 @@ import (
  "net/http"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
 )
 
 func TestUnmarshalJSON(t *testing.T) {

diff --git a/server/clusterworkflowtemplate/cluster_workflow_template_server_test.go b/server/clusterworkflowtemplate/cluster_workflow_template_server_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
  "k8s.io/client-go/kubernetes/fake"
 
  clusterwftmplpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/clusterworkflowtemplate"

diff --git a/server/cronworkflow/cron_workflow_server_test.go b/server/cronworkflow/cron_workflow_server_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
 
  cronworkflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/cronworkflow"
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"

diff --git a/server/event/dispatch/operation_test.go b/server/event/dispatch/operation_test.go
@@ -6,9 +6,9 @@ import (
  "sort"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
  "google.golang.org/grpc/metadata"
- "gopkg.in/square/go-jose.v2/jwt"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/client-go/tools/record"
 

diff --git a/server/info/info_server_test.go b/server/info/info_server_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/server/auth"

diff --git a/server/workflow/workflow_server_test.go b/server/workflow/workflow_server_test.go
@@ -5,9 +5,9 @@ import (
  "fmt"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/mock"
- "gopkg.in/square/go-jose.v2/jwt"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/runtime"

diff --git a/server/workflowtemplate/workflow_template_server_test.go b/server/workflowtemplate/workflow_template_server_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/client-go/kubernetes/fake"
 

diff --git a/workflow/creator/creator_test.go b/workflow/creator/creator_test.go
@@ -5,8 +5,8 @@ import (
  "strings"
  "testing"
 
+ "github.com/go-jose/go-jose/v3/jwt"
  "github.com/stretchr/testify/assert"
- "gopkg.in/square/go-jose.v2/jwt"
 
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/server/auth"