From 43a733b4d76b938f1449b2d6fb53adad1b33d5b1 Mon Sep 17 00:00:00 2001 From: croche Date: Thu, 20 Jun 2024 11:25:49 +0100 Subject: [PATCH] OCM-6166 | chore: migrate square/go-jose to v4 of go-jose/go-jose --- go.mod | 2 +- go.sum | 4 ++-- pkg/rosa/oidcconfigs/oidcconfigs.go | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 19a072c..681e3fb 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.30.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.40.3 github.com/aws/aws-sdk-go-v2/service/sts v1.28.5 + github.com/go-jose/go-jose/v4 v4.0.2 github.com/hashicorp/go-version v1.6.0 github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.30.0 @@ -21,7 +22,6 @@ require ( github.com/sirupsen/logrus v1.9.3 go.uber.org/mock v0.3.0 golang.org/x/crypto v0.22.0 - gopkg.in/square/go-jose.v2 v2.6.0 ) require github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect diff --git a/go.sum b/go.sum index db2f192..3619d26 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn 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/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk= +github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -117,8 +119,6 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/pkg/rosa/oidcconfigs/oidcconfigs.go b/pkg/rosa/oidcconfigs/oidcconfigs.go index 87608dc..a4ac5a2 100644 --- a/pkg/rosa/oidcconfigs/oidcconfigs.go +++ b/pkg/rosa/oidcconfigs/oidcconfigs.go @@ -16,8 +16,7 @@ import ( "regexp" "strings" - "gopkg.in/square/go-jose.v2" - + "github.com/go-jose/go-jose/v4" "github.com/openshift-online/ocm-common/pkg/utils" )