From b046827d8d24d488e9284f138b784c77fc1336eb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 27 Jul 2022 00:16:35 +0000 Subject: [PATCH 1/2] Update module github.com/coreos/go-oidc to v3 --- go.mod | 4 ++-- go.sum | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 8f7873272a..2e1c9ff6b5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module github.com/slsa-framework/slsa-github-generator go 1.18 require ( - github.com/coreos/go-oidc v2.2.1+incompatible + github.com/coreos/go-oidc v2.1.0+incompatible + github.com/coreos/go-oidc/v3 v3.2.0 github.com/go-openapi/strfmt v0.21.3 github.com/go-openapi/swag v0.21.1 github.com/google/go-cmp v0.5.8 @@ -64,7 +65,6 @@ require ( github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect - github.com/coreos/go-oidc/v3 v3.2.0 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect diff --git a/go.sum b/go.sum index 01c254c4d5..c4c738a96e 100644 --- a/go.sum +++ b/go.sum @@ -509,6 +509,7 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= From eac2f8714e4dec9227578f8f99f481a90f89f78f Mon Sep 17 00:00:00 2001 From: Ian Lewis Date: Wed, 27 Jul 2022 01:04:35 +0000 Subject: [PATCH 2/2] Update go-oidc imports to use v3 --- github/oidc.go | 2 +- github/oidctest.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/github/oidc.go b/github/oidc.go index 9dcadc9463..012b291bbe 100644 --- a/github/oidc.go +++ b/github/oidc.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/slsa-framework/slsa-github-generator/internal/errors" ) diff --git a/github/oidctest.go b/github/oidctest.go index 0226cc43b2..16b8b4445e 100644 --- a/github/oidctest.go +++ b/github/oidctest.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "gopkg.in/square/go-jose.v2" )