Set default Interceptor.Kind for EventListener TriggerGroups

Fixes tektoncd#1499 While `Kind` is getting defaulted properly for interceptors in `EventListener.Spec.Triggers`, it also needs to be defaulted for interceptors in `EventListener.Spec.TriggerGroups`. Signed-off-by: Andrew Bayer <[email protected]>
tekton-robot · Jan 3, 2023 · 0907174 · 0907174
1 parent a1995aa
commit 0907174
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/pkg/apis/triggers/v1beta1/event_listener_defaults.go b/pkg/apis/triggers/v1beta1/event_listener_defaults.go
@@ -47,5 +47,13 @@ func (el *EventListener) SetDefaults(ctx context.Context) {
 				}
 			}
 		}
+
+		for _, tg := range el.Spec.TriggerGroups {
+			for _, ti := range tg.Interceptors {
+				if ti != nil {
+					ti.defaultInterceptorKind()
+				}
+			}
+		}
 	}
 }
diff --git a/pkg/apis/triggers/v1beta1/event_listener_defaults_test.go b/pkg/apis/triggers/v1beta1/event_listener_defaults_test.go
@@ -188,6 +188,33 @@ func TestEventListenerSetDefaults(t *testing.T) {
 			})
 			return contexts.WithUpgradeViaDefaulting(s.ToContext(ctx))
 		},
+	}, {
+		name: "adds TriggerGroup interceptorkind when not specified",
+		in: &v1beta1.EventListener{
+			Spec: v1beta1.EventListenerSpec{
+				TriggerGroups: []v1beta1.EventListenerTriggerGroup{{
+					Interceptors: []*v1beta1.EventInterceptor{{
+						Ref: v1beta1.InterceptorRef{
+							Name: "cel",
+						},
+					}},
+				}},
+			},
+		},
+		wc: contexts.WithUpgradeViaDefaulting,
+		want: &v1beta1.EventListener{
+			Spec: v1beta1.EventListenerSpec{
+				ServiceAccountName: config.DefaultServiceAccountValue,
+				TriggerGroups: []v1beta1.EventListenerTriggerGroup{{
+					Interceptors: []*v1beta1.EventInterceptor{{
+						Ref: v1beta1.InterceptorRef{
+							Name: "cel",
+							Kind: v1beta1.ClusterInterceptorKind,
+						},
+					}},
+				}},
+			},
+		},
 	}}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {