From 6a5d44882ac7b813334bc9b3286243a416c6b6f5 Mon Sep 17 00:00:00 2001 From: Johan Siebens Date: Thu, 11 Jan 2024 09:25:19 +0100 Subject: [PATCH] chore(deps): use renamed mockoidc module --- go.mod | 5 +---- go.sum | 6 ++---- tests/sc/scenario.go | 6 +++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 75574a7..2d92789 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/jsiebens/ionscale go 1.21 -replace github.com/oauth2-proxy/mockoidc => github.com/jsiebens/mockoidc v0.0.0-20240108082145-5b2747b94b1b - require ( github.com/apparentlymart/go-cidr v1.1.0 github.com/bufbuild/connect-go v1.10.0 @@ -19,6 +17,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/imdario/mergo v0.3.16 github.com/jsiebens/go-edit v0.1.0 + github.com/jsiebens/mockoidc v0.1.0-rc2 github.com/klauspost/compress v1.17.4 github.com/labstack/echo-contrib v0.15.0 github.com/labstack/echo/v4 v4.11.4 @@ -32,7 +31,6 @@ require ( github.com/mitchellh/pointerstructure v1.2.1 github.com/mr-tron/base58 v1.2.0 github.com/nleeper/goment v1.4.4 - github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282 github.com/ory/dockertest/v3 v3.10.0 github.com/prometheus/client_golang v1.18.0 github.com/rodaine/table v1.1.0 @@ -179,7 +177,6 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect google.golang.org/grpc v1.60.1 // indirect - gopkg.in/square/go-jose.v2 v2.6.0 // indirect gotest.tools/v3 v3.4.0 // indirect modernc.org/libc v1.40.1 // indirect modernc.org/mathutil v1.6.0 // indirect diff --git a/go.sum b/go.sum index b333c41..5666b7c 100644 --- a/go.sum +++ b/go.sum @@ -531,8 +531,8 @@ github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86/go.mod h1:aFAMt github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jsiebens/go-edit v0.1.0 h1:62SSGW8Qc2zoBcJx7gV86ImPHmQzlU/DQhwCOR4uilE= github.com/jsiebens/go-edit v0.1.0/go.mod h1:m/wuWMv8sNhSl+M2qA35gP/K5jX2J7Aa+g16VwyfxrI= -github.com/jsiebens/mockoidc v0.0.0-20240108082145-5b2747b94b1b h1:Y/oA8TYORWGvOq5Ynl9tY+eA6IEV/5tjb3ugSU2Khfo= -github.com/jsiebens/mockoidc v0.0.0-20240108082145-5b2747b94b1b/go.mod h1:5AdBTMDkanoW4IMv51fajiAUEEmKyNza7s8R2D/5pbw= +github.com/jsiebens/mockoidc v0.1.0-rc2 h1:ifKYhKxfYQMmglcBKkRX9EUuTYmOMnrrOrB6r1zW/gs= +github.com/jsiebens/mockoidc v0.1.0-rc2/go.mod h1:ym8B5bmE8RQAyxuC3lzqtNvxXyJomwxZZG5CIJGXCtk= github.com/jsimonetti/rtnetlink v1.4.0 h1:Z1BF0fRgcETPEa0Kt0MRk3yV5+kF1FWTni6KUFKrq2I= github.com/jsimonetti/rtnetlink v1.4.0/go.mod h1:5W1jDvWdnthFJ7fxYX1GMK07BUpI4oskfOqvPteYS6E= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -1353,8 +1353,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -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.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tests/sc/scenario.go b/tests/sc/scenario.go index 066d1a8..ee12018 100644 --- a/tests/sc/scenario.go +++ b/tests/sc/scenario.go @@ -9,9 +9,9 @@ import ( api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1" ionscaleconnect "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1/ionscalev1connect" "github.com/jsiebens/ionscale/tests/tsn" - "github.com/oauth2-proxy/mockoidc" - mockoidcv1 "github.com/oauth2-proxy/mockoidc/pkg/gen/mockoidc/v1" - "github.com/oauth2-proxy/mockoidc/pkg/gen/mockoidc/v1/mockoidcv1connect" + "github.com/jsiebens/mockoidc" + mockoidcv1 "github.com/jsiebens/mockoidc/pkg/gen/mockoidc/v1" + "github.com/jsiebens/mockoidc/pkg/gen/mockoidc/v1/mockoidcv1connect" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require"