From 979c3e8cbcf4b7c3b3be9a008e43aba244e8e612 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Tue, 15 Feb 2022 17:24:48 +0000 Subject: [PATCH] Move internal OIDC package to providers package --- oauthproxy_test.go | 2 +- pkg/apis/options/options.go | 2 +- pkg/{ => providers}/oidc/oidc_suite_test.go | 0 pkg/{oidc/verify.go => providers/oidc/verifier.go} | 0 pkg/{oidc/verify_test.go => providers/oidc/verifier_test.go} | 0 pkg/validation/options.go | 2 +- providers/adfs_test.go | 2 +- providers/azure_test.go | 2 +- providers/keycloak_oidc_test.go | 2 +- providers/oidc_test.go | 2 +- providers/provider_data.go | 2 +- providers/provider_data_test.go | 2 +- providers/providers.go | 2 +- 13 files changed, 10 insertions(+), 10 deletions(-) rename pkg/{ => providers}/oidc/oidc_suite_test.go (100%) rename pkg/{oidc/verify.go => providers/oidc/verifier.go} (100%) rename pkg/{oidc/verify_test.go => providers/oidc/verifier_test.go} (100%) diff --git a/oauthproxy_test.go b/oauthproxy_test.go index 51dad4a..d31d62b 100644 --- a/oauthproxy_test.go +++ b/oauthproxy_test.go @@ -21,7 +21,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/cookies" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" sessionscookie "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/cookie" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/upstream" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/validation" diff --git a/pkg/apis/options/options.go b/pkg/apis/options/options.go index 2535b58..7749276 100644 --- a/pkg/apis/options/options.go +++ b/pkg/apis/options/options.go @@ -5,7 +5,7 @@ import ( "net/url" ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" "github.com/spf13/pflag" ) diff --git a/pkg/oidc/oidc_suite_test.go b/pkg/providers/oidc/oidc_suite_test.go similarity index 100% rename from pkg/oidc/oidc_suite_test.go rename to pkg/providers/oidc/oidc_suite_test.go diff --git a/pkg/oidc/verify.go b/pkg/providers/oidc/verifier.go similarity index 100% rename from pkg/oidc/verify.go rename to pkg/providers/oidc/verifier.go diff --git a/pkg/oidc/verify_test.go b/pkg/providers/oidc/verifier_test.go similarity index 100% rename from pkg/oidc/verify_test.go rename to pkg/providers/oidc/verifier_test.go diff --git a/pkg/validation/options.go b/pkg/validation/options.go index 771d076..1d83a0a 100644 --- a/pkg/validation/options.go +++ b/pkg/validation/options.go @@ -13,7 +13,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/ip" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/util" ) diff --git a/providers/adfs_test.go b/providers/adfs_test.go index 434175d..0822b99 100755 --- a/providers/adfs_test.go +++ b/providers/adfs_test.go @@ -15,7 +15,7 @@ import ( "github.com/golang-jwt/jwt" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" diff --git a/providers/azure_test.go b/providers/azure_test.go index 5e91285..1341903 100644 --- a/providers/azure_test.go +++ b/providers/azure_test.go @@ -17,7 +17,7 @@ import ( "github.com/golang-jwt/jwt" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" diff --git a/providers/keycloak_oidc_test.go b/providers/keycloak_oidc_test.go index 1e1cb73..4488c46 100644 --- a/providers/keycloak_oidc_test.go +++ b/providers/keycloak_oidc_test.go @@ -14,7 +14,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" ) const ( diff --git a/providers/oidc_test.go b/providers/oidc_test.go index b462de5..2fe6064 100644 --- a/providers/oidc_test.go +++ b/providers/oidc_test.go @@ -14,7 +14,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" "github.com/stretchr/testify/assert" ) diff --git a/providers/provider_data.go b/providers/provider_data.go index 03eeb93..096d470 100644 --- a/providers/provider_data.go +++ b/providers/provider_data.go @@ -13,7 +13,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/util" "golang.org/x/oauth2" ) diff --git a/providers/provider_data_test.go b/providers/provider_data_test.go index 64c8326..ecdd18c 100644 --- a/providers/provider_data_test.go +++ b/providers/provider_data_test.go @@ -16,7 +16,7 @@ import ( "github.com/golang-jwt/jwt" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" . "github.com/onsi/gomega" "golang.org/x/oauth2" ) diff --git a/providers/providers.go b/providers/providers.go index 84dcc97..0c30600 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -11,7 +11,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" - internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/oidc" + internaloidc "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/providers/oidc" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests" k8serrors "k8s.io/apimachinery/pkg/util/errors" )