Introduce Filter CloudEvents Feature (#5424)

* update on spiritzhou/filtercloudevent Signed-off-by: SpiritZhou <[email protected]> * Update CHANGELOG.md Co-authored-by: Tom Kerkhove <[email protected]> Signed-off-by: SpiritZhou <[email protected]> * Update log Signed-off-by: SpiritZhou <[email protected]> * add crd validation Signed-off-by: SpiritZhou <[email protected]> * update Signed-off-by: SpiritZhou <[email protected]> * Fix Signed-off-by: SpiritZhou <[email protected]> * Update pkg/eventemitter/eventemitter.go Co-authored-by: Jorge Turrado Ferrero <[email protected]> Signed-off-by: SpiritZhou <[email protected]> * Update Signed-off-by: SpiritZhou <[email protected]> * Fix Signed-off-by: SpiritZhou <[email protected]> * Fix Signed-off-by: SpiritZhou <[email protected]> * Update Signed-off-by: SpiritZhou <[email protected]> * Update Signed-off-by: SpiritZhou <[email protected]> --------- Signed-off-by: SpiritZhou <[email protected]> Signed-off-by: Jorge Turrado Ferrero <[email protected]> Co-authored-by: Tom Kerkhove <[email protected]> Co-authored-by: Jorge Turrado Ferrero <[email protected]>
kedacore · Apr 10, 2024 · c20c47e · c20c47e
1 parent 7611438
commit c20c47e
Show file tree

Hide file tree

Showing 18 changed files with 754 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,7 +53,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
 
 ### New
 
-- **General**: TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
+- **General**: Provide capability to filter CloudEvents ([#3533](https://github.com/kedacore/keda/issues/3533))
 - **NATS Scaler**: Add TLS authentication ([#2296](https://github.com/kedacore/keda/issues/2296))
 
 #### Experimental

diff --git a/pkg/eventemitter/eventtypes.go → apis/eventing/v1alpha1/cloudevent_types.go b/pkg/eventemitter/eventtypes.go → apis/eventing/v1alpha1/cloudevent_types.go
@@ -14,12 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package eventemitter
+package v1alpha1
+
+// CloudEventType contains the list of cloudevent types
+// +kubebuilder:validation:Enum=keda.scaledobject.ready.v1;keda.scaledobject.failed.v1
+type CloudEventType string
 
 const (
 	// ScaledObjectReadyType is for event when a new ScaledObject is ready
-	ScaledObjectReadyType = "keda.scaledobject.ready.v1"
+	ScaledObjectReadyType CloudEventType = "keda.scaledobject.ready.v1"
 
 	// ScaledObjectFailedType is for event when creating ScaledObject failed
-	ScaledObjectFailedType = "keda.scaledobject.failed.v1"
+	ScaledObjectFailedType CloudEventType = "keda.scaledobject.failed.v1"
 )
+
+var AllEventTypes = []CloudEventType{ScaledObjectFailedType, ScaledObjectReadyType}
diff --git a/apis/eventing/v1alpha1/cloudeventsource_types.go b/apis/eventing/v1alpha1/cloudeventsource_types.go
@@ -51,6 +51,9 @@ type CloudEventSourceSpec struct {
 	ClusterName string `json:"clusterName,omitempty"`
 
 	Destination Destination `json:"destination"`
+
+	// +optional
+	EventSubscription EventSubscription `json:"eventSubscription,omitempty"`
 }
 
 // CloudEventSourceStatus defines the observed state of CloudEventSource
@@ -70,13 +73,22 @@ type CloudEventHTTP struct {
 	URI string `json:"uri"`
 }
 
+// EventSubscription defines filters for events
+type EventSubscription struct {
+	// +optional
+	IncludedEventTypes []CloudEventType `json:"includedEventTypes,omitempty"`
+
+	// +optional
+	ExcludedEventTypes []CloudEventType `json:"excludedEventTypes,omitempty"`
+}
+
 func init() {
 	SchemeBuilder.Register(&CloudEventSource{}, &CloudEventSourceList{})
 }
 
 // GenerateIdentifier returns identifier for the object in for "kind.namespace.name"
-func (t *CloudEventSource) GenerateIdentifier() string {
-	return v1alpha1.GenerateIdentifier("CloudEventSource", t.Namespace, t.Name)
+func (ces *CloudEventSource) GenerateIdentifier() string {
+	return v1alpha1.GenerateIdentifier("CloudEventSource", ces.Namespace, ces.Name)
 }
 
 // GetCloudEventSourceInitializedConditions returns CloudEventSource Conditions initialized to the default -> Status: Unknown

diff --git a/apis/eventing/v1alpha1/cloudeventsource_webhook.go b/apis/eventing/v1alpha1/cloudeventsource_webhook.go
@@ -0,0 +1,97 @@
+/*
+Copyright 2024 The KEDA Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"golang.org/x/exp/slices"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+)
+
+var cloudeventsourcelog = logf.Log.WithName("cloudeventsource-validation-webhook")
+
+func (ces *CloudEventSource) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(ces).
+		Complete()
+}
+
+// +kubebuilder:webhook:path=/validate-eventing-keda-sh-v1alpha1-cloudeventsource,mutating=false,failurePolicy=ignore,sideEffects=None,groups=eventing.keda.sh,resources=cloudeventsources,verbs=create;update,versions=v1alpha1,name=vcloudeventsource.kb.io,admissionReviewVersions=v1
+
+var _ webhook.Validator = &CloudEventSource{}
+
+// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
+func (ces *CloudEventSource) ValidateCreate() (admission.Warnings, error) {
+	val, _ := json.MarshalIndent(ces, "", "  ")
+	cloudeventsourcelog.Info(fmt.Sprintf("validating cloudeventsource creation for %s", string(val)))
+	return validateSpec(&ces.Spec)
+}
+
+func (ces *CloudEventSource) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+	val, _ := json.MarshalIndent(ces, "", "  ")
+	cloudeventsourcelog.V(1).Info(fmt.Sprintf("validating cloudeventsource update for %s", string(val)))
+
+	oldCes := old.(*CloudEventSource)
+	if isCloudEventSourceRemovingFinalizer(ces.ObjectMeta, oldCes.ObjectMeta, ces.Spec, oldCes.Spec) {
+		cloudeventsourcelog.V(1).Info("finalizer removal, skipping validation")
+		return nil, nil
+	}
+	return validateSpec(&ces.Spec)
+}
+
+func (ces *CloudEventSource) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
+}
+
+func isCloudEventSourceRemovingFinalizer(om metav1.ObjectMeta, oldOm metav1.ObjectMeta, spec CloudEventSourceSpec, oldSpec CloudEventSourceSpec) bool {
+	cesSpec, _ := json.MarshalIndent(spec, "", "  ")
+	oldCesSpec, _ := json.MarshalIndent(oldSpec, "", "  ")
+	cesSpecString := string(cesSpec)
+	oldCesSpecString := string(oldCesSpec)
+
+	return len(om.Finalizers) == 0 && len(oldOm.Finalizers) == 1 && cesSpecString == oldCesSpecString
+}
+
+func validateSpec(spec *CloudEventSourceSpec) (admission.Warnings, error) {
+	if spec.EventSubscription.ExcludedEventTypes != nil && spec.EventSubscription.IncludedEventTypes != nil {
+		return nil, fmt.Errorf("setting included types and excluded types at the same time is not supported")
+	}
+
+	if spec.EventSubscription.ExcludedEventTypes != nil {
+		for _, excludedEventType := range spec.EventSubscription.ExcludedEventTypes {
+			if !slices.Contains(AllEventTypes, excludedEventType) {
+				return nil, fmt.Errorf("excludedEventType: %s in cloudeventsource spec is not supported", excludedEventType)
+			}
+		}
+	}
+
+	if spec.EventSubscription.IncludedEventTypes != nil {
+		for _, includedEventType := range spec.EventSubscription.IncludedEventTypes {
+			if !slices.Contains(AllEventTypes, includedEventType) {
+				return nil, fmt.Errorf("includedEventType: %s in cloudeventsource spec is not supported", includedEventType)
+			}
+		}
+	}
+	return nil, nil
+}