v1beta3 API

This reverts commit c3fa020.

Signed-off-by: Alex Snaps <[email protected]>

Makefile

@@ -155,7 +155,7 @@ report-benchmarks:
 cover: ## Shows test coverage
 	go tool cover -html=cover.out
 
-AUTHCONFIG_VERSION ?= v1beta2
+AUTHCONFIG_VERSION ?= v1beta3
 VERBOSE ?= 0
 e2e: ## Runs the end-to-end tests on a local environment setup
 	$(MAKE) local-setup NAMESPACE=authorino KIND_CLUSTER_NAME=authorino-e2e AUTHORINO_IMAGE=$(AUTHORINO_IMAGE) TLS_ENABLED=$(TLS_ENABLED) OPERATOR_BRANCH=$(OPERATOR_BRANCH) AUTHORINO_MANIFESTS=$(AUTHORINO_MANIFESTS) AUTHORINO_INSTANCE=$(AUTHORINO_INSTANCE) ENVOY_OVERLAY=$(ENVOY_OVERLAY) DEPLOY_KEYCLOAK=1 FF=1

api/v1beta2/auth_config_types.go

@@ -164,21 +164,13 @@ type PatternExpression struct {
 	Value string `json:"value,omitempty"`
 }
 
-type CelExpression struct {
-	Expression string `json:"expression,omitempty"`
-}
-
-type CelPredicate struct {
-	Predicate string `json:"predicate,omitempty"`
-}
-
 // +kubebuilder:validation:Enum:=eq;neq;incl;excl;matches
 type PatternExpressionOperator string
 
 type PatternExpressionOrRef struct {
 	PatternExpression `json:",omitempty"`
 	PatternRef        `json:",omitempty"`
-	CelPredicate      `json:",omitempty"`
+
 	// A list of pattern expressions to be evaluated as a logical AND.
 	All []UnstructuredPatternExpressionOrRef `json:"all,omitempty"`
 	// A list of pattern expressions to be evaluated as a logical OR.
@@ -207,8 +199,6 @@ type ValueOrSelector struct {
 	// 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,omitempty"`
-
-	Expression CelExpression `json:",omitempty"`
 }
 
 type CommonEvaluatorSpec struct {

api/v1beta3/auth_config_conversion.go

@@ -0,0 +1,4 @@
+package v1beta3
+
+// Hub marks this version as a conversion hub.
+func (a *AuthConfig) Hub() {}