not compiling ... temporary

Author: odacremolbap

config/500-core-controller.yaml

@@ -69,7 +69,7 @@ spec:
         - name: REDISBROKER_REDIS_IMAGE
           value: redis/redis-stack-server:latest
         - name: REDISBROKER_BROKER_IMAGE
-          value: pmercado/redis-broker:v0.1.0
+          value: gcr.io/triggermesh/redis-broker:dev
 
         securityContext:
           runAsNonRoot: true

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/stretchr/testify v1.8.0
-	github.com/triggermesh/brokers v0.0.0-20220926134808-88d6a8629e30
+	github.com/triggermesh/brokers v0.0.0-20221018093436-f87a18b58712
 	go.uber.org/zap v1.22.0
 	k8s.io/api v0.24.4
 	k8s.io/apimachinery v0.24.4

go.sum

@@ -506,6 +506,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/triggermesh/brokers v0.0.0-20220926134808-88d6a8629e30 h1:EjHSGHBT/7hp01nmYd0vNGpIo7vOl1Lm2NRxmc8XQ4k=
 github.com/triggermesh/brokers v0.0.0-20220926134808-88d6a8629e30/go.mod h1:64gU9A1hlgsU6/51B3h7eDsg7KI4BvuzAE9uJ8h6V9U=
+github.com/triggermesh/brokers v0.0.0-20221018093436-f87a18b58712 h1:ARMQw1DtiJwfXI8Dx9pxgzSZti+iOw2znopgmmqOunI=
+github.com/triggermesh/brokers v0.0.0-20221018093436-f87a18b58712/go.mod h1:qcsxTLxVIa1R0XLm1g/0eMf8RpMI7EYlHiEU3gP+llg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=

pkg/apis/eventing/v1alpha1/deepcopy_generated.go

@@ -8,7 +8,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
-	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	"knative.dev/pkg/kmeta"
@@ -43,6 +42,55 @@ var (
 	_ duckv1.KRShaped = (*Trigger)(nil)
 )
 
+type Filter struct {
+	// All evaluates to true if all the nested expressions evaluate to true.
+	// It must contain at least one filter expression.
+	//
+	// +optional
+	All []Filter `json:"all,omitempty"`
+
+	// Any evaluates to true if at least one of the nested expressions evaluates
+	// to true. It must contain at least one filter expression.
+	//
+	// +optional
+	Any []Filter `json:"any,omitempty"`
+
+	// Not evaluates to true if the nested expression evaluates to false.
+	//
+	// +optional
+	Not *Filter `json:"not,omitempty"`
+
+	// Exact evaluates to true if the value of the matching CloudEvents
+	// attribute matches exactly the String value specified (case-sensitive).
+	// Exact must contain exactly one property, where the key is the name of the
+	// CloudEvents attribute to be matched, and its value is the String value to
+	// use in the comparison. The attribute name and value specified in the filter
+	// expression cannot be empty strings.
+	//
+	// +optional
+	Exact map[string]string `json:"exact,omitempty"`
+
+	// Prefix evaluates to true if the value of the matching CloudEvents
+	// attribute starts with the String value specified (case-sensitive). Prefix
+	// must contain exactly one property, where the key is the name of the
+	// CloudEvents attribute to be matched, and its value is the String value to
+	// use in the comparison. The attribute name and value specified in the filter
+	// expression cannot be empty strings.
+	//
+	// +optional
+	Prefix map[string]string `json:"prefix,omitempty"`
+
+	// Suffix evaluates to true if the value of the matching CloudEvents
+	// attribute ends with the String value specified (case-sensitive). Suffix
+	// must contain exactly one property, where the key is the name of the
+	// CloudEvents attribute to be matched, and its value is the String value to
+	// use in the comparison. The attribute name and value specified in the filter
+	// expression cannot be empty strings.
+	//
+	// +optional
+	Suffix map[string]string `json:"suffix,omitempty"`
+}
+
 // TriggerSpec defines the desired state of Trigger
 type TriggerSpec struct {
 	// Broker is the broker that this trigger receives events from.
@@ -60,7 +108,7 @@ type TriggerSpec struct {
 	// Trigger objects.
 	//
 	// +optional
-	Filters []eventingv1.SubscriptionsAPIFilter `json:"filters,omitempty"`
+	Filters []Filter `json:"filters,omitempty"`
 
 	// Target is the addressable that receives events from the Broker that pass
 	// the Filter. It is required.

pkg/apis/eventing/v1alpha1/trigger_types.go

@@ -0,0 +1,121 @@
+// Copyright 2022 TriggerMesh Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+import (
+	"context"
+	"regexp"
+
+	"knative.dev/pkg/apis"
+)
+
+var (
+	// Only allow lowercase alphanumeric, starting with letters.
+	validAttributeName = regexp.MustCompile(`^[a-z][a-z0-9]*$`)
+)
+
+// Validate the Trigger.
+func (t *Trigger) Validate(ctx context.Context) *apis.FieldError {
+	errs := t.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec")
+	return errs
+}
+
+// Validate the TriggerSpec.
+func (ts *TriggerSpec) Validate(ctx context.Context) (errs *apis.FieldError) {
+
+	errs = ts.Broker.Validate(ctx).ViaField("broker")
+
+	return errs.Also(
+		ValidateSubscriptionAPIFiltersList(ctx, ts.Filters).ViaField("filters"),
+	).Also(
+		ts.Target.Validate(ctx).ViaField("target"),
+	).Also(
+		ts.Delivery.Validate(ctx).ViaField("delivery"),
+	)
+}
+
+func ValidateSubscriptionAPIFiltersList(ctx context.Context, filters []Filter) (errs *apis.FieldError) {
+	for i, f := range filters {
+		f := f
+		errs = errs.Also(ValidateSubscriptionAPIFilter(ctx, &f)).ViaIndex(i)
+	}
+	return errs
+}
+
+func ValidateAttributesNames(attrs map[string]string) (errs *apis.FieldError) {
+	for attr := range attrs {
+		if !validAttributeName.MatchString(attr) {
+			errs = errs.Also(apis.ErrInvalidKeyName(attr, apis.CurrentField, "Attribute name must start with a letter and can only contain lowercase alphanumeric").ViaKey(attr))
+		}
+	}
+	return errs
+}
+
+func ValidateOneOf(filter *Filter) (err *apis.FieldError) {
+	if filter != nil && hasMultipleDialects(filter) {
+		return apis.ErrGeneric("multiple dialects found, filters can have only one dialect set")
+	}
+	return nil
+}
+
+func hasMultipleDialects(filter *Filter) bool {
+	dialectFound := false
+	if len(filter.Exact) > 0 {
+		dialectFound = true
+	}
+	if len(filter.Prefix) > 0 {
+		if dialectFound {
+			return true
+		} else {
+			dialectFound = true
+		}
+	}
+	if len(filter.Suffix) > 0 {
+		if dialectFound {
+			return true
+		} else {
+			dialectFound = true
+		}
+	}
+	if len(filter.All) > 0 {
+		if dialectFound {
+			return true
+		} else {
+			dialectFound = true
+		}
+	}
+	if len(filter.Any) > 0 {
+		if dialectFound {
+			return true
+		} else {
+			dialectFound = true
+		}
+	}
+	if filter.Not != nil && dialectFound {
+		return true
+	}
+	return false
+}
+
+func ValidateSubscriptionAPIFilter(ctx context.Context, filter *Filter) (errs *apis.FieldError) {
+	if filter == nil {
+		return nil
+	}
+	errs = errs.Also(
+		ValidateOneOf(filter),
+	).Also(
+		ValidateAttributesNames(filter.Exact).ViaField("exact"),
+	).Also(
+		ValidateAttributesNames(filter.Prefix).ViaField("prefix"),
+	).Also(
+		ValidateAttributesNames(filter.Suffix).ViaField("suffix"),
+	).Also(
+		ValidateSubscriptionAPIFiltersList(ctx, filter.All).ViaField("all"),
+	).Also(
+		ValidateSubscriptionAPIFiltersList(ctx, filter.Any).ViaField("any"),
+	).Also(
+		ValidateSubscriptionAPIFilter(ctx, filter.Not).ViaField("not"),
+	)
+	return errs
+}

pkg/apis/eventing/v1alpha1/trigger_validation.go

@@ -84,7 +84,7 @@ func buildBrokerDeployment(rb *eventingv1alpha1.RedisBroker, redis *corev1.Servi
 			resources.PodSpecAddVolume(v),
 			resources.PodSpecAddContainer(
 				resources.NewContainer("broker", image,
-					resources.ContainerAddArgs("start --redis.address "+redisService+" --config-path "+configMountedPath),
+					resources.ContainerAddArgs("start --redis.address "+redisService+" --broker-config-path "+configMountedPath),
 					resources.ContainerAddVolumeMount(vm),
 				),
 			),

pkg/reconciler/redisbroker/reconcile_broker.go

@@ -6,7 +6,7 @@ import (
 	"go.uber.org/zap"
 	"sigs.k8s.io/yaml"
 
-	"github.com/triggermesh/brokers/pkg/config"
+	"github.com/triggermesh/brokers/pkg/config/broker"
 	corev1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -103,7 +103,7 @@ func (r *secretReconciler) buildConfigSecret(ctx context.Context, rb *eventingv1
 			"Failed to list triggers: %w", err)
 	}
 
-	cfg := &config.Config{}
+	cfg := &broker.Config{}
 	for _, t := range triggers {
 		// Generate secret even if the trigger is not ready, as long as one of the URIs for target
 		// or DLS exist.
@@ -120,19 +120,19 @@ func (r *secretReconciler) buildConfigSecret(ctx context.Context, rb *eventingv1
 			targetURI = "http://"
 		}
 
-		do := &config.DeliveryOptions{}
+		do := &broker.DeliveryOptions{}
 		if t.Spec.Delivery != nil {
 			do.Retry = t.Spec.Delivery.Retry
 			do.BackoffDelay = t.Spec.Delivery.BackoffDelay
 
 			if t.Spec.Delivery.BackoffPolicy != nil {
-				var bop config.BackoffPolicyType
+				var bop broker.BackoffPolicyType
 				switch *t.Spec.Delivery.BackoffPolicy {
 				case duckv1.BackoffPolicyLinear:
-					bop = config.BackoffPolicyLinear
+					bop = broker.BackoffPolicyLinear
 
 				case duckv1.BackoffPolicyExponential:
-					bop = config.BackoffPolicyLinear
+					bop = broker.BackoffPolicyLinear
 				}
 				do.BackoffPolicy = &bop
 			}
@@ -143,19 +143,16 @@ func (r *secretReconciler) buildConfigSecret(ctx context.Context, rb *eventingv1
 			}
 		}
 
-		trg := config.Trigger{
-			Name:    t.Name,
+		trg := broker.Trigger{
 			Filters: t.Spec.Filters,
-			Targets: []config.Target{
-				{
-					URL:             targetURI,
-					DeliveryOptions: do,
-				},
+			Target: broker.Target{
+				URL:             targetURI,
+				DeliveryOptions: do,
 			},
 		}
 
 		// Add Trigger data to config
-		cfg.Triggers = append(cfg.Triggers, trg)
+		cfg.Triggers[t.Name] = trg
 	}
 
 	// add user/password