From 24fb64ce75e524e44fed315fb8352b85b616eb50 Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Fri, 25 Sep 2020 11:20:47 -0400 Subject: [PATCH] OpenIDConnectIdentityProvider CRD: missed regen in ba6bc7f105cff --- deploy/idp.pinniped.dev_openidconnectidentityproviders.yaml | 2 +- generated/1.17/apis/idp/v1alpha1/types_openidconnect.go | 2 +- .../crds/idp.pinniped.dev_openidconnectidentityproviders.yaml | 2 +- generated/1.18/apis/idp/v1alpha1/types_openidconnect.go | 2 +- .../crds/idp.pinniped.dev_openidconnectidentityproviders.yaml | 2 +- generated/1.19/apis/idp/v1alpha1/types_openidconnect.go | 2 +- .../crds/idp.pinniped.dev_openidconnectidentityproviders.yaml | 2 +- test/integration/oidc_test.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/idp.pinniped.dev_openidconnectidentityproviders.yaml b/deploy/idp.pinniped.dev_openidconnectidentityproviders.yaml index 55f9afb2..d4982cf8 100644 --- a/deploy/idp.pinniped.dev_openidconnectidentityproviders.yaml +++ b/deploy/idp.pinniped.dev_openidconnectidentityproviders.yaml @@ -57,7 +57,7 @@ spec: description: RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization request flow with an OIDC identity provider. - pattern: ^https?:// + pattern: ^https:// type: string scopes: description: Scopes are the scopes that will be requested as part diff --git a/generated/1.17/apis/idp/v1alpha1/types_openidconnect.go b/generated/1.17/apis/idp/v1alpha1/types_openidconnect.go index 40699822..567643c8 100644 --- a/generated/1.17/apis/idp/v1alpha1/types_openidconnect.go +++ b/generated/1.17/apis/idp/v1alpha1/types_openidconnect.go @@ -22,7 +22,7 @@ type OpenIDConnectIdentityProviderStatus struct { type OpenIDConnectAuthorizationConfig struct { // RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization // request flow with an OIDC identity provider. - // +kubebuilder:validation:Pattern=`^https?://` + // +kubebuilder:validation:Pattern=`^https://` RedirectURI string `json:"redirectURI"` // Scopes are the scopes that will be requested as part of the authorization request flow with diff --git a/generated/1.17/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml b/generated/1.17/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml index 55f9afb2..d4982cf8 100644 --- a/generated/1.17/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml +++ b/generated/1.17/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml @@ -57,7 +57,7 @@ spec: description: RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization request flow with an OIDC identity provider. - pattern: ^https?:// + pattern: ^https:// type: string scopes: description: Scopes are the scopes that will be requested as part diff --git a/generated/1.18/apis/idp/v1alpha1/types_openidconnect.go b/generated/1.18/apis/idp/v1alpha1/types_openidconnect.go index 40699822..567643c8 100644 --- a/generated/1.18/apis/idp/v1alpha1/types_openidconnect.go +++ b/generated/1.18/apis/idp/v1alpha1/types_openidconnect.go @@ -22,7 +22,7 @@ type OpenIDConnectIdentityProviderStatus struct { type OpenIDConnectAuthorizationConfig struct { // RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization // request flow with an OIDC identity provider. - // +kubebuilder:validation:Pattern=`^https?://` + // +kubebuilder:validation:Pattern=`^https://` RedirectURI string `json:"redirectURI"` // Scopes are the scopes that will be requested as part of the authorization request flow with diff --git a/generated/1.18/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml b/generated/1.18/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml index 55f9afb2..d4982cf8 100644 --- a/generated/1.18/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml +++ b/generated/1.18/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml @@ -57,7 +57,7 @@ spec: description: RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization request flow with an OIDC identity provider. - pattern: ^https?:// + pattern: ^https:// type: string scopes: description: Scopes are the scopes that will be requested as part diff --git a/generated/1.19/apis/idp/v1alpha1/types_openidconnect.go b/generated/1.19/apis/idp/v1alpha1/types_openidconnect.go index 40699822..567643c8 100644 --- a/generated/1.19/apis/idp/v1alpha1/types_openidconnect.go +++ b/generated/1.19/apis/idp/v1alpha1/types_openidconnect.go @@ -22,7 +22,7 @@ type OpenIDConnectIdentityProviderStatus struct { type OpenIDConnectAuthorizationConfig struct { // RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization // request flow with an OIDC identity provider. - // +kubebuilder:validation:Pattern=`^https?://` + // +kubebuilder:validation:Pattern=`^https://` RedirectURI string `json:"redirectURI"` // Scopes are the scopes that will be requested as part of the authorization request flow with diff --git a/generated/1.19/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml b/generated/1.19/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml index 55f9afb2..d4982cf8 100644 --- a/generated/1.19/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml +++ b/generated/1.19/crds/idp.pinniped.dev_openidconnectidentityproviders.yaml @@ -57,7 +57,7 @@ spec: description: RedirectURI is the URI of the redirect endpoint that will be used in the OAuth2 authorization request flow with an OIDC identity provider. - pattern: ^https?:// + pattern: ^https:// type: string scopes: description: Scopes are the scopes that will be requested as part diff --git a/test/integration/oidc_test.go b/test/integration/oidc_test.go index ed9078bf..7241ee39 100644 --- a/test/integration/oidc_test.go +++ b/test/integration/oidc_test.go @@ -38,7 +38,7 @@ func TestOIDC(t *testing.T) { Spec: idpv1alpha1.OpenIDConnectIdentityProviderSpec{ Issuer: "https://some-issuer", AuthorizationConfig: idpv1alpha1.OpenIDConnectAuthorizationConfig{ - RedirectURI: "http://localhost:12345", + RedirectURI: "https://some-redirect-uri:12345", Scopes: []string{ "tuna", "fish",