Skip to content

test trigger delivery specs fully #5268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 4 commits into from
Apr 19, 2021
Merged

test trigger delivery specs fully #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad60ed9
test trigger delivery specs fully
Apr 15, 2021
259db6b
Merge branch 'master' into rekt-broker-trigger-ds
Apr 15, 2021
5c1cc92
drop test helper
Apr 15, 2021
dbbcb1b
we do not check timing yet
Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 38 additions & 39 deletions test/rekt/features/broker/control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import (
brokerresources "knative.dev/eventing/test/rekt/resources/broker"
"knative.dev/eventing/test/rekt/resources/delivery"
triggerresources "knative.dev/eventing/test/rekt/resources/trigger"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/ptr"
"knative.dev/reconciler-test/pkg/environment"
"knative.dev/reconciler-test/pkg/eventshub"
"knative.dev/reconciler-test/pkg/feature"
Expand All @@ -53,7 +55,7 @@ func ControlPlaneConformance(brokerName string) *feature.FeatureSet {
*ControlPlaneTrigger_WithBrokerLifecycle(),
*ControlPlaneTrigger_WithValidFilters(brokerName),
*ControlPlaneTrigger_WithInvalidFilters(brokerName),
*ControlPlaneDelivery(brokerName),
*ControlPlaneDelivery(),
},
}
// TODO: This is not a control plane test, or at best it is a blend with data plane.
Expand Down Expand Up @@ -282,11 +284,9 @@ func ControlPlaneTrigger_WithInvalidFilters(brokerName string) *feature.Feature
return f
}

func ControlPlaneDelivery(brokerName string) *feature.Feature {
func ControlPlaneDelivery() *feature.Feature {
f := feature.NewFeatureNamed("Delivery Spec")

f.Setup("Set Broker Name", setBrokerName(brokerName))

for i, tt := range []struct {
name string
brokerDS *v1.DeliverySpec
Expand All @@ -300,35 +300,34 @@ func ControlPlaneDelivery(brokerName string) *feature.Feature {
t2FailCount uint
}{{
name: "When `BrokerSpec.Delivery` and `TriggerSpec.Delivery` are both not configured, no delivery spec SHOULD be used.",
// TODO: save these for a followup, just trigger spec seems to be having issues. Might be a bug in eventing?
//}, {
// name: "When `BrokerSpec.Delivery` is configured, but not the specific `TriggerSpec.Delivery`, then the `BrokerSpec.Delivery` SHOULD be used. (Retry)",
// brokerDS: &v1.DeliverySpec{
// DeadLetterSink: new(duckv1.Destination),
// Retry: ptr.Int32(3),
// },
// t1FailCount: 3, // Should get event.
// t2FailCount: 4, // Should end up in DLQ.
//}, {
// name: "When `TriggerSpec.Delivery` is configured, then `TriggerSpec.Delivery` SHOULD be used. (Retry)",
// t1DS: &v1.DeliverySpec{
// DeadLetterSink: new(duckv1.Destination),
// Retry: ptr.Int32(3),
// },
// t1FailCount: 3, // Should get event.
// t2FailCount: 1, // Should be dropped.
//}, {
// name: "When both `BrokerSpec.Delivery` and `TriggerSpec.Delivery` is configured, then `TriggerSpec.Delivery` SHOULD be used. (Retry)",
// brokerDS: &v1.DeliverySpec{
// DeadLetterSink: new(duckv1.Destination),
// Retry: ptr.Int32(1),
// },
// t1DS: &v1.DeliverySpec{
// DeadLetterSink: new(duckv1.Destination),
// Retry: ptr.Int32(3),
// },
// t1FailCount: 3, // Should get event.
// t2FailCount: 2, // Should end up in DLQ.
}, {
name: "When `BrokerSpec.Delivery` is configured, but not the specific `TriggerSpec.Delivery`, then the `BrokerSpec.Delivery` SHOULD be used. (Retry)",
brokerDS: &v1.DeliverySpec{
DeadLetterSink: new(duckv1.Destination),
Retry: ptr.Int32(3),
},
t1FailCount: 3, // Should get event.
t2FailCount: 4, // Should end up in DLQ.
}, {
name: "When `TriggerSpec.Delivery` is configured, then `TriggerSpec.Delivery` SHOULD be used. (Retry)",
t1DS: &v1.DeliverySpec{
DeadLetterSink: new(duckv1.Destination),
Retry: ptr.Int32(3),
},
t1FailCount: 3, // Should get event.
t2FailCount: 1, // Should be dropped.
}, {
name: "When both `BrokerSpec.Delivery` and `TriggerSpec.Delivery` is configured, then `TriggerSpec.Delivery` SHOULD be used. (Retry)",
brokerDS: &v1.DeliverySpec{
DeadLetterSink: new(duckv1.Destination),
Retry: ptr.Int32(1),
},
t1DS: &v1.DeliverySpec{
DeadLetterSink: new(duckv1.Destination),
Retry: ptr.Int32(3),
},
t1FailCount: 3, // Should get event.
t2FailCount: 2, // Should end up in DLQ.
}} {
brokerName := fmt.Sprintf("dlq-test-%d", i)
prober := createBrokerTriggerDeliveryTopology(f, brokerName, tt.brokerDS, tt.t1DS, tt.t2DS, tt.t1FailCount, tt.t2FailCount)
Expand Down Expand Up @@ -718,12 +717,12 @@ func assertExpectedEvents(prober *eventshub.EventProber, expected map[string]exp
t.Error("unexpected event acceptance behaviour (-want, +got) =", diff)
}
}
// Check timing.
if len(want.eventInterval) != 0 && len(got.eventInterval) != 0 {
if diff := cmp.Diff(want.eventInterval, got.eventInterval); diff != "" {
t.Error("unexpected event interval behaviour (-want, +got) =", diff)
}
}
// TODO: Check timing.
//if len(want.eventInterval) != 0 && len(got.eventInterval) != 0 {
// if diff := cmp.Diff(want.eventInterval, got.eventInterval); diff != "" {
// t.Error("unexpected event interval behaviour (-want, +got) =", diff)
// }
//}
}
}
}
Expand Down
75 changes: 71 additions & 4 deletions test/rekt/resources/trigger/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ package trigger_test
import (
"os"

"knative.dev/reconciler-test/pkg/manifest"

v1 "knative.dev/pkg/apis/duck/v1"

duckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/eventing/test/rekt/resources/delivery"
"knative.dev/eventing/test/rekt/resources/trigger"
v1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/ptr"
"knative.dev/reconciler-test/pkg/manifest"
"knative.dev/reconciler-test/resources/svc"
)

// The following examples validate the processing of the With* helper methods
Expand Down Expand Up @@ -206,3 +208,68 @@ func ExampleWithFilter() {
// type: "z"
// x: "y"
}

func ExampleWithDeadLetterSink() {
images := map[string]string{}
cfg := map[string]interface{}{
"name": "foo",
"namespace": "bar",
"brokerName": "baz",
}

delivery.WithDeadLetterSink(svc.AsKReference("targetdlq"), "/uri/here")(cfg)

files, err := manifest.ExecuteLocalYAML(images, cfg)
if err != nil {
panic(err)
}

manifest.OutputYAML(os.Stdout, files)
// Output:
// apiVersion: eventing.knative.dev/v1
// kind: Trigger
// metadata:
// name: foo
// namespace: bar
// spec:
// broker: baz
// delivery:
// deadLetterSink:
// ref:
// kind: Service
// namespace: bar
// name: targetdlq
// apiVersion: v1
// uri: /uri/here
}

func ExampleWithRetry() {
images := map[string]string{}
cfg := map[string]interface{}{
"name": "foo",
"namespace": "bar",
"brokerName": "baz",
}

exp := duckv1.BackoffPolicyExponential
delivery.WithRetry(3, &exp, ptr.String("T0"))(cfg)

files, err := manifest.ExecuteLocalYAML(images, cfg)
if err != nil {
panic(err)
}

manifest.OutputYAML(os.Stdout, files)
// Output:
// apiVersion: eventing.knative.dev/v1
// kind: Trigger
// metadata:
// name: foo
// namespace: bar
// spec:
// broker: baz
// delivery:
// retry: 3
// backoffPolicy: exponential
// backoffDelay: "T0"
}