Skip to content

Commit

Permalink
Add unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
@creydr
creydr committed Sep 26, 2023
1 parent c8f5519 commit e4fefda
Show file tree
Hide file tree
Showing 3 changed files with 161 additions and 10 deletions.
1 change: 1 addition & 0 deletions pkg/reconciler/broker/trigger/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription/fake"
_ "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake"
)

func TestNew(t *testing.T) {
Expand Down
142 changes: 132 additions & 10 deletions pkg/reconciler/broker/trigger/trigger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,19 @@ import (
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/eventing/pkg/apis/eventing"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
v1 "knative.dev/eventing/pkg/apis/eventing/v1"
"knative.dev/eventing/pkg/apis/feature"
messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
"knative.dev/eventing/pkg/apis/sources/v1beta2"
"knative.dev/eventing/pkg/auth"
fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
"knative.dev/eventing/pkg/client/injection/ducks/duck/v1/channelable"
"knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger"
"knative.dev/eventing/pkg/duck"
"knative.dev/eventing/pkg/eventingtls"
"knative.dev/eventing/pkg/eventingtls/eventingtlstesting"
"knative.dev/eventing/pkg/reconciler/broker/resources"
fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake"

_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
. "knative.dev/pkg/reconciler/testing"
Expand Down Expand Up @@ -273,7 +276,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerSubscribedUnknown("SubscriptionNotConfigured", "Subscription has not yet been reconciled."),
WithTriggerStatusSubscriberURI(subscriberURI)),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
}, {
Name: "Creates subscription with retry from trigger",
Expand Down Expand Up @@ -306,7 +310,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerSubscribedUnknown("SubscriptionNotConfigured", "Subscription has not yet been reconciled."),
WithTriggerStatusSubscriberURI(subscriberURI)),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
}, {
Name: "Creates subscription with dls from trigger",
Expand Down Expand Up @@ -340,7 +345,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscribedUnknown("SubscriptionNotConfigured", "Subscription has not yet been reconciled."),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerStatusDeadLetterSinkURI(duckv1.Addressable{URL: dlsURL}),
WithTriggerDeadLetterSinkResolvedSucceeded()),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
}, {
Name: "TLS: Creates subscription with dls from trigger",
Expand Down Expand Up @@ -395,6 +401,7 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusDeadLetterSinkURI(duckv1.Addressable{URL: dlsURL}),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerDeadLetterSinkCACerts(string(eventingtlstesting.CA)),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -456,6 +463,7 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusDeadLetterSinkURI(duckv1.Addressable{URL: dlsURL}),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerDeadLetterSinkCACerts(string(eventingtlstesting.CA)),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -517,6 +525,7 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusDeadLetterSinkURI(duckv1.Addressable{URL: dlsURL}),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerDeadLetterSinkCACerts(string(eventingtlstesting.CA)),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -574,6 +583,7 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusDeadLetterSinkURI(duckv1.Addressable{URL: dlsURL}),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerDeadLetterSinkCACerts(string(eventingtlstesting.CA)),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -604,7 +614,8 @@ func TestReconcile(t *testing.T) {
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberURI(subscriberURI),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions")),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions"),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "InternalError", "inducing failure for create subscriptions"),
Expand Down Expand Up @@ -633,7 +644,8 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions")),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions"),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantCreates: []runtime.Object{
makeFilterSubscription(testNS),
Expand All @@ -659,7 +671,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerNotSubscribed("NotSubscribed", `trigger "test-trigger" does not own subscription "test-broker-test-trigger-test-trigger-uid"`),
WithTriggerStatusSubscriberURI(subscriberURI)),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "InternalError", `trigger "test-trigger" does not own subscription "test-broker-test-trigger-test-trigger-uid"`),
Expand All @@ -686,7 +699,8 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady()),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantDeletes: []clientgotesting.DeleteActionImpl{{
ActionImpl: clientgotesting.ActionImpl{
Expand Down Expand Up @@ -722,7 +736,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for delete subscriptions")),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for delete subscriptions"),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantDeletes: []clientgotesting.DeleteActionImpl{{
ActionImpl: clientgotesting.ActionImpl{
Expand Down Expand Up @@ -759,7 +774,8 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions")),
WithTriggerNotSubscribed("NotSubscribed", "inducing failure for create subscriptions"),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "SubscriptionCreateFailed", `Create Trigger's subscription failed: inducing failure for create subscriptions`),
Expand Down Expand Up @@ -797,6 +813,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
Expand Down Expand Up @@ -825,6 +842,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
Expand Down Expand Up @@ -853,6 +871,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
Expand Down Expand Up @@ -935,6 +954,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerStatusDeadLetterSinkURI(brokerDLS),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
Expand Down Expand Up @@ -1034,6 +1054,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerStatusDeadLetterSinkURI(brokerDLS),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -1095,6 +1116,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerStatusDeadLetterSinkURI(brokerDLS),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -1158,6 +1180,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerStatusDeadLetterSinkURI(brokerDLS),
WithTriggerDeadLetterSinkResolvedSucceeded(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -1225,6 +1248,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand All @@ -1250,6 +1274,7 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -1279,6 +1304,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyFailed("DependencyDoesNotExist", `Dependency does not exist: pingsources.sources.knative.dev "test-ping-source" not found`),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantErr: true,
Expand Down Expand Up @@ -1308,6 +1334,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyFailed("NotFound", ""),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
}, {
Expand Down Expand Up @@ -1336,6 +1363,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyUnknown("", ""),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
},
Expand Down Expand Up @@ -1364,7 +1392,8 @@ func TestReconcile(t *testing.T) {
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyUnknown("GenerationNotEqual", fmt.Sprintf("The dependency's metadata.generation, %q, is not equal to its status.observedGeneration, %q.", currentGeneration, outdatedGeneration))),
WithTriggerDependencyUnknown("GenerationNotEqual", fmt.Sprintf("The dependency's metadata.generation, %q, is not equal to its status.observedGeneration, %q.", currentGeneration, outdatedGeneration)),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled()),
}},
},
{
Expand Down Expand Up @@ -1393,6 +1422,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
},
Expand All @@ -1419,6 +1449,7 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
Expand Down Expand Up @@ -1448,12 +1479,83 @@ func TestReconcile(t *testing.T) {
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerDependencyReady(),
WithTriggerOIDCServiceAccountResolvedSucceededBecauseOIDCFeatureDisabled(),
),
}},
WantCreates: []runtime.Object{
makeFilterSubscription(subscriberNameNamespace),
},
},
{
Name: "OIDC: creates OIDC service account",
Key: testKey,
Ctx: feature.ToContext(context.Background(), feature.Flags{
feature.OIDCAuthentication: feature.Enabled,
}),
Objects: allBrokerObjectsReadyPlus([]runtime.Object{
makeReadySubscription(testNS),
NewTrigger(triggerName, testNS, brokerName,
WithTriggerUID(triggerUID),
WithTriggerSubscriberURI(subscriberURI),
WithInitTriggerConditions,
)}...),
WantErr: false,
WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
Object: NewTrigger(triggerName, testNS, brokerName,
WithTriggerUID(triggerUID),
WithTriggerSubscriberURI(subscriberURI),
WithTriggerBrokerReady(),
// The first reconciliation will initialize the status conditions.
WithInitTriggerConditions,
WithTriggerDependencyReady(),
WithTriggerSubscribed(),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerOIDCServiceAccountResolvedSucceeded(),
WithTriggerOIDCServiceAccountName(makeTriggerOIDCServiceAccount().Name),
),
}},
WantCreates: []runtime.Object{
makeTriggerOIDCServiceAccount(),
},
},
{
Name: "OIDC: Trigger not ready on invalid OIDC service account",
Key: testKey,
Ctx: feature.ToContext(context.Background(), feature.Flags{
feature.OIDCAuthentication: feature.Enabled,
}),
Objects: allBrokerObjectsReadyPlus([]runtime.Object{
makeReadySubscription(testNS),
makeTriggerOIDCServiceAccountWithoutOwnerRef(),
NewTrigger(triggerName, testNS, brokerName,
WithTriggerUID(triggerUID),
WithTriggerSubscriberURI(subscriberURI),
WithInitTriggerConditions,
)}...),
WantErr: true,
WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
Object: NewTrigger(triggerName, testNS, brokerName,
WithTriggerUID(triggerUID),
WithTriggerSubscriberURI(subscriberURI),
WithTriggerBrokerReady(),
// The first reconciliation will initialize the status conditions.
WithInitTriggerConditions,
WithTriggerDependencyUnknown("", ""),
WithTriggerSubscribed(),
WithTriggerStatusSubscriberURI(subscriberURI),
WithTriggerSubscriberResolvedSucceeded(),
WithTriggerDeadLetterSinkNotConfigured(),
WithTriggerOIDCServiceAccountResolvedFailed("Unable to resolve service account for OIDC authentication", fmt.Sprintf("Trigger %q does not own service account %q", triggerName, makeTriggerOIDCServiceAccountWithoutOwnerRef().Name)),
WithTriggerOIDCServiceAccountName(makeTriggerOIDCServiceAccountWithoutOwnerRef().Name),
WithTriggerSubscribedUnknown("", ""),
),
}},
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "InternalError", fmt.Sprintf("Trigger %q does not own service account %q", triggerName, makeTriggerOIDCServiceAccountWithoutOwnerRef().Name)),
},
},
}

logger := logtesting.TestLogger(t)
Expand All @@ -1466,6 +1568,7 @@ func TestReconcile(t *testing.T) {
r := &Reconciler{
eventingClientSet: fakeeventingclient.Get(ctx),
dynamicClientSet: fakedynamicclient.Get(ctx),
kubeclient: fakekubeclient.Get(ctx),
subscriptionLister: listers.GetSubscriptionLister(),
triggerLister: listers.GetTriggerLister(),
secretLister: listers.GetSecretLister(),
Expand Down Expand Up @@ -1813,3 +1916,22 @@ func makeDLSServiceAsUnstructured() *unstructured.Unstructured {
},
}
}

func makeTriggerOIDCServiceAccount() *corev1.ServiceAccount {
return auth.GetOIDCServiceAccountForResource(v1.SchemeGroupVersion.WithKind("Trigger"), metav1.ObjectMeta{
Name: triggerName,
Namespace: testNS,
UID: triggerUID,
})
}

func makeTriggerOIDCServiceAccountWithoutOwnerRef() *corev1.ServiceAccount {
sa := auth.GetOIDCServiceAccountForResource(v1.SchemeGroupVersion.WithKind("Trigger"), metav1.ObjectMeta{
Name: triggerName,
Namespace: testNS,
UID: triggerUID,
})
sa.OwnerReferences = nil

return sa
}
Loading

0 comments on commit e4fefda

Please sign in to comment.