From dae86834940f61dc94fafa45a86a31d49fb156ed Mon Sep 17 00:00:00 2001 From: Guilherme Cassolato Date: Wed, 30 Oct 2024 13:36:37 +0100 Subject: [PATCH] optional selector field Signed-off-by: Guilherme Cassolato --- api/v1beta3/auth_config_types.go | 4 ++-- install/crd/authorino.kuadrant.io_authconfigs.yaml | 8 -------- install/manifests.yaml | 8 -------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/api/v1beta3/auth_config_types.go b/api/v1beta3/auth_config_types.go index 31424185..53a9eae7 100644 --- a/api/v1beta3/auth_config_types.go +++ b/api/v1beta3/auth_config_types.go @@ -409,7 +409,7 @@ type PlainIdentitySpec struct { // Simple path selector to fetch content from the authorization JSON (e.g. 'request.method') or a string template with variables that resolve to patterns (e.g. "Hello, {auth.identity.name}!"). // Any pattern supported by https://pkg.go.dev/github.com/tidwall/gjson can be used. // The following Authorino custom modifiers are supported: @extract:{sep:" ",pos:0}, @replace{old:"",new:""}, @case:upper|lower, @base64:encode|decode and @strip. - Selector string `json:"selector"` + Selector string `json:"selector,omitempty"` Expression CelExpression `json:"expression,omitempty"` } @@ -447,7 +447,7 @@ type HttpEndpointSpec struct { // The value can include variable placeholders in the format "{selector}", where "selector" is any pattern supported // by https://pkg.go.dev/github.com/tidwall/gjson and selects value from the authorization JSON. // E.g. https://ext-auth-server.io/metadata?p={request.path} - Url string `json:"url"` + Url string `json:"url,omitempty"` UrlExpression CelExpression `json:"urlExpression,omitempty"` diff --git a/install/crd/authorino.kuadrant.io_authconfigs.yaml b/install/crd/authorino.kuadrant.io_authconfigs.yaml index 5d7f18c3..c658c8f8 100644 --- a/install/crd/authorino.kuadrant.io_authconfigs.yaml +++ b/install/crd/authorino.kuadrant.io_authconfigs.yaml @@ -2620,8 +2620,6 @@ spec: Any pattern supported by https://pkg.go.dev/github.com/tidwall/gjson can be used. The following Authorino custom modifiers are supported: @extract:{sep:" ",pos:0}, @replace{old:"",new:""}, @case:upper|lower, @base64:encode|decode and @strip. type: string - required: - - selector type: object priority: default: 0 @@ -3125,8 +3123,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object rego: description: |- @@ -3587,8 +3583,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object metrics: default: false @@ -3890,8 +3884,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object metrics: default: false diff --git a/install/manifests.yaml b/install/manifests.yaml index d8ec8689..a0ed239b 100644 --- a/install/manifests.yaml +++ b/install/manifests.yaml @@ -2887,8 +2887,6 @@ spec: Any pattern supported by https://pkg.go.dev/github.com/tidwall/gjson can be used. The following Authorino custom modifiers are supported: @extract:{sep:" ",pos:0}, @replace{old:"",new:""}, @case:upper|lower, @base64:encode|decode and @strip. type: string - required: - - selector type: object priority: default: 0 @@ -3433,8 +3431,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object rego: description: |- @@ -3943,8 +3939,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object metrics: default: false @@ -4259,8 +4253,6 @@ spec: type: string urlExpression: type: string - required: - - url type: object metrics: default: false