Skip to content
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

Jump to bottom

Use refs instead of name to refer to Bindings #757

Merged
merged 1 commit into from
Sep 21, 2020
Merged

Use refs instead of name to refer to Bindings #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions pkg/apis/triggers/v1alpha1/event_listener_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,45 +50,45 @@ func Test_EventListenerValidate(t *testing.T) {
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "TriggerBinding", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "TriggerBinding", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener with ClusterTriggerBinding",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "ClusterTriggerBinding", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "ClusterTriggerBinding", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener with multiple TriggerBindings",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb1", "ClusterTriggerBinding", "tb1", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb2", "TriggerBinding", "tb2", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb3", "", "tb3", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb1", "ClusterTriggerBinding", "", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb2", "TriggerBinding", "", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb3", "", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener No Interceptor",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener Interceptor",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerTriggerInterceptor("svc", "v1", "Service", "namespace"),
))),
}, {
name: "Valid EventListener Interceptor With Header",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerTriggerInterceptor("svc", "v1", "Service", "namespace",
bldr.EventInterceptorParam("Valid-Header-Key", "valid value"),
),
Expand All @@ -98,7 +98,7 @@ func Test_EventListenerValidate(t *testing.T) {
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerTriggerInterceptor("svc", "v1", "Service", "namespace",
bldr.EventInterceptorParam("Valid-Header-Key1", "valid value1"),
bldr.EventInterceptorParam("Valid-Header-Key1", "valid value2"),
Expand All @@ -110,26 +110,26 @@ func Test_EventListenerValidate(t *testing.T) {
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerTriggerInterceptor("svc", "v1", "Service", "namespace"),
),
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener with CEL interceptor",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerCELInterceptor("body.value == 'test'"),
))),
}, {
name: "Valid EventListener with no trigger name",
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
))),
}, {
name: "Valid EventListener with embedded bindings",
Expand All @@ -143,7 +143,7 @@ func Test_EventListenerValidate(t *testing.T) {
el: bldr.EventListener("name", "namespace",
bldr.EventListenerSpec(
bldr.EventListenerTrigger("tt", "v1alpha1",
bldr.EventListenerTriggerBinding("tb", "", "tb", "v1alpha1"),
bldr.EventListenerTriggerBinding("tb", "", "", "v1alpha1"),
bldr.EventListenerCELInterceptor("", bldr.EventListenerCELOverlay("body.value", "'testing'")),
))),
}}
Expand Down
26 changes: 13 additions & 13 deletions pkg/apis/triggers/v1alpha1/trigger_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,38 @@ func Test_TriggerValidate(t *testing.T) {
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "TriggerBinding", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "TriggerBinding", "", "v1alpha1"),
)),
}, {
name: "Valid Trigger with ClusterTriggerBinding",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "ClusterTriggerBinding", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "ClusterTriggerBinding", "", "v1alpha1"),
)),
}, {
name: "Valid Trigger with multiple TriggerBindings",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "ClusterTriggerBinding", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "TriggerBinding", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb3", "", "tb3", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "ClusterTriggerBinding", "", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "TriggerBinding", "", "v1alpha1"),
bldr.TriggerSpecBinding("tb3", "", "", "v1alpha1"),
)),
}, {
name: "Valid Trigger Interceptor",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
bldr.TriggerSpecInterceptor("svc", "v1", "Service", "namespace"),
)),
}, {
name: "Valid Trigger Interceptor With Header",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
bldr.TriggerSpecInterceptor("svc", "v1", "Service", "namespace",
bldr.TriggerSpecInterceptorParam("Valid-Header-Key", "valid value"),
),
Expand All @@ -81,30 +81,30 @@ func Test_TriggerValidate(t *testing.T) {
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
bldr.TriggerSpecInterceptor("svc", "v1", "Service", "namespace",
bldr.TriggerSpecInterceptorParam("Valid-Header-Key1", "valid value1"),
bldr.TriggerSpecInterceptorParam("Valid-Header-Key1", "valid value2"),
bldr.TriggerSpecInterceptorParam("Valid-Header-Key2", "valid value"),
),
)),
}, {
name: "Valid Trigger with CTR interceptor",
name: "Valid Trigger with CEL interceptor",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
bldr.TriggerSpecCELInterceptor("body.value == 'test'"),
)),
}, {
name: "Valid Trigger with no trigger name",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
)),
}, {
name: "Valid Trigger with embedded bindings",
name: "Valid Trigger with old embedded bindings",
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
Expand All @@ -115,7 +115,7 @@ func Test_TriggerValidate(t *testing.T) {
tr: bldr.Trigger("name", "namespace",
bldr.TriggerSpec(
bldr.TriggerSpecTemplate("tt", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "tb", "v1alpha1"),
bldr.TriggerSpecBinding("tb", "", "", "v1alpha1"),
bldr.TriggerSpecCELInterceptor("", bldr.TriggerSpecCELOverlay("body.value", "'testing'")),
)),
}}
Expand Down
10 changes: 5 additions & 5 deletions pkg/sink/sink_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ func TestHandleEventWithInterceptors(t *testing.T) {
},
Spec: triggersv1.EventListenerSpec{
Triggers: []triggersv1.EventListenerTrigger{{
Bindings: []*triggersv1.EventListenerBinding{{Name: "tb", Kind: "TriggerBinding"}},
Bindings: []*triggersv1.EventListenerBinding{{Ref: "tb", Kind: "TriggerBinding"}},
Template: &triggersv1.EventListenerTemplate{Name: "tt"},
Interceptors: []*triggersv1.EventInterceptor{{
GitHub: &triggersv1.GitHubInterceptor{
Expand Down Expand Up @@ -533,7 +533,7 @@ func TestHandleEventPassesURLThrough(t *testing.T) {
},
Spec: triggersv1.EventListenerSpec{
Triggers: []triggersv1.EventListenerTrigger{{
Bindings: []*triggersv1.EventListenerBinding{{Name: "tb", Kind: "TriggerBinding"}},
Bindings: []*triggersv1.EventListenerBinding{{Ref: "tb", Kind: "TriggerBinding"}},
Template: &triggersv1.EventListenerTemplate{Name: "tt"},
Interceptors: []*triggersv1.EventInterceptor{{
CEL: &triggersv1.CELInterceptor{
Expand Down Expand Up @@ -647,7 +647,7 @@ func TestHandleEventWithWebhookInterceptors(t *testing.T) {
var triggers []triggersv1.EventListenerTrigger
for i := 0; i < numTriggers; i++ {
trigger := triggersv1.EventListenerTrigger{
Bindings: []*triggersv1.EventListenerBinding{{Name: "tb", Kind: "TriggerBinding"}},
Bindings: []*triggersv1.EventListenerBinding{{Ref: "tb", Kind: "TriggerBinding"}},
Template: &triggersv1.EventListenerTemplate{Name: "tt"},
Interceptors: []*triggersv1.EventInterceptor{{
Webhook: &triggersv1.WebhookInterceptor{
Expand Down Expand Up @@ -990,7 +990,7 @@ func TestHandleEventWithInterceptorsAndTriggerAuth(t *testing.T) {
Spec: triggersv1.EventListenerSpec{
Triggers: []triggersv1.EventListenerTrigger{{
ServiceAccountName: testCase.userVal,
Bindings: []*triggersv1.EventListenerBinding{{Name: "tb", Kind: "TriggerBinding"}},
Bindings: []*triggersv1.EventListenerBinding{{Ref: "tb", Kind: "TriggerBinding"}},
Template: &triggersv1.EventListenerTemplate{Name: "tt"},
Interceptors: []*triggersv1.EventInterceptor{{
GitHub: &triggersv1.GitHubInterceptor{
Expand Down Expand Up @@ -1078,7 +1078,7 @@ func TestHandleEventWithBitbucketInterceptors(t *testing.T) {
Spec: triggersv1.EventListenerSpec{
Triggers: []triggersv1.EventListenerTrigger{{
ServiceAccountName: userWithPermissions,
Bindings: []*triggersv1.EventListenerBinding{{Name: "tb", Kind: "TriggerBinding"}},
Bindings: []*triggersv1.EventListenerBinding{{Ref: "tb", Kind: "TriggerBinding"}},
Template: &triggersv1.EventListenerTemplate{Name: "tt"},
Interceptors: []*triggersv1.EventInterceptor{{
Bitbucket: &triggersv1.BitbucketInterceptor{
Expand Down
1 change: 0 additions & 1 deletion test/eventlistener_scale_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func TestEventListenerScale(t *testing.T) {
for i := 0; i < 1000; i++ {
trigger := triggersv1.EventListenerTrigger{
Bindings: []*triggersv1.EventListenerBinding{{
Name: "my-triggerbinding",
Kind: triggersv1.NamespacedTriggerBindingKind,
Ref: "tb1",
APIVersion: "v1alpha1",
Expand Down