Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions test/conformance/helpers/broker_data_plane_test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,16 @@ func BrokerV1Beta1ConsumerDataPlaneTestHelper(
}

transformMsg := []byte(`{"msg":"Transformed!"}`)
transformPod := resources.EventTransformationPod(
recordevents.DeployEventRecordOrFail(
ctx,
client,
transformerName,
"reply-check-type",
"reply-check-source",
transformMsg,
recordevents.ReplyWithTransformedEvent(
"reply-check-type",
"reply-check-source",
string(transformMsg),
),
)
client.CreatePodOrFail(transformPod, testlib.WithService(transformerName))
client.WaitForAllTestResourcesReadyOrFail(ctx)

trigger := client.CreateTriggerOrFailV1Beta1(
triggerName,
Expand Down
15 changes: 9 additions & 6 deletions test/conformance/helpers/broker_tracing_test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,18 @@ func setupBrokerTracing(ctx context.Context, brokerClass string) SetupTracingTes
resources.WithSubscriberServiceRefForTriggerV1Beta1(loggerPodName),
)

// Create a transformer (EventTransfrmer) Pod that replies with the same event as the input,
// Create a transformer Pod (recordevents with transform reply) that replies with the same event as the input,
// except the reply's event's type is changed to bar.
eventTransformerPod := resources.EventTransformationPod(
eventTransformerPod := recordevents.DeployEventRecordOrFail(
ctx,
client,
"transformer",
etLogger,
senderName,
[]byte(eventBody),
recordevents.ReplyWithTransformedEvent(
etLogger,
senderName,
eventBody,
),
)
client.CreatePodOrFail(eventTransformerPod, testlib.WithService(eventTransformerPod.Name))

// Create a Trigger that receives events (type=foo) and sends them to the transformer Pod.
transformerTrigger := client.CreateTriggerOrFailV1Beta1(
Expand Down
13 changes: 8 additions & 5 deletions test/conformance/helpers/channel_tracing_test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,16 @@ func setupChannelTracingWithReply(
recordEventsPod := recordevents.DeployEventRecordOrFail(ctx, client, recordEventsPodName)

// Create the subscriber, a Pod that mutates the event.
transformerPod := resources.EventTransformationPod(
transformerPod := recordevents.DeployEventRecordOrFail(
ctx,
client,
"transformer",
"mutated",
eventSource,
nil,
recordevents.ReplyWithTransformedEvent(
"mutated",
eventSource,
"",
),
)
client.CreatePodOrFail(transformerPod, testlib.WithService(transformerPod.Name))

// Create the Subscription linking the Channel to the mutator.
client.CreateSubscriptionOrFail(
Expand Down
13 changes: 8 additions & 5 deletions test/e2e/helpers/broker_channel_flow_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,16 @@ func BrokerChannelFlowWithTransformation(
}

// create the transformation service for trigger1
transformationPod := resources.EventTransformationPod(
recordevents.DeployEventRecordOrFail(
ctx,
client,
transformationPodName,
transformedEventType,
transformedEventSource,
[]byte(transformedBody),
recordevents.ReplyWithTransformedEvent(
transformedEventType,
transformedEventSource,
transformedBody,
),
)
client.CreatePodOrFail(transformationPod, testlib.WithService(transformationPodName))

// create trigger1 to receive the original event, and do event transformation
if triggerVersion == "v1" {
Expand Down
13 changes: 8 additions & 5 deletions test/e2e/helpers/broker_event_transformation_test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,16 @@ func EventTransformationForTriggerTestHelper(
client.WaitForResourceReadyOrFail(brokerName, testlib.BrokerTypeMeta)

// create the transformation service
transformationPod := resources.EventTransformationPod(
recordevents.DeployEventRecordOrFail(
ctx,
client,
transformationPodName,
transformedEventType,
transformedEventSource,
[]byte(transformedBody),
recordevents.ReplyWithTransformedEvent(
transformedEventType,
transformedEventSource,
transformedBody,
),
)
client.CreatePodOrFail(transformationPod, testlib.WithService(transformationPodName))

// create trigger1 for event transformation
if triggerVersion == "v1" {
Expand Down
6 changes: 3 additions & 3 deletions test/lib/recordevents/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func DeployEventRecordOrFail(ctx context.Context, client *testlib.Client, name s
))
client.CreateRoleBindingOrFail(name, "Role", name, name, client.Namespace)

eventRecordPod := EventRecordPod(name, name)
eventRecordPod := eventRecordPod(name, name)
client.CreatePodOrFail(eventRecordPod, append(options, testlib.WithService(name))...)
err := pkgtest.WaitForPodRunning(ctx, client.Kube, name, client.Namespace)
if err != nil {
Expand All @@ -100,8 +100,8 @@ func DeployEventRecordOrFail(ctx context.Context, client *testlib.Client, name s
return eventRecordPod
}

// EventRecordPod creates a Pod that stores received events for test retrieval.
func EventRecordPod(name string, serviceAccountName string) *corev1.Pod {
// eventRecordPod creates a Pod that stores received events for test retrieval.
func eventRecordPod(name string, serviceAccountName string) *corev1.Pod {
return recordEventsPod("recordevents", name, serviceAccountName)
}

Expand Down
27 changes: 0 additions & 27 deletions test/lib/resources/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,6 @@ type PodOption func(*corev1.Pod)
// Option enables further configuration of a Role.
type RoleOption func(*rbacv1.Role)

// EventTransformationPod creates a Pod that transforms events received receiving as arg a cloudevents sdk2 Event
func EventTransformationPod(name string, newEventType string, newEventSource string, newEventData []byte) *corev1.Pod {
const imageName = "transformevents"
return &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Labels: map[string]string{"e2etest": string(uuid.NewUUID())},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{
Name: imageName,
Image: pkgTest.ImagePath(imageName),
ImagePullPolicy: corev1.PullIfNotPresent,
Args: []string{
"-event-type",
newEventType,
"-event-source",
newEventSource,
"-event-data",
string(newEventData),
},
}},
RestartPolicy: corev1.RestartPolicyAlways,
},
}
}

// HelloWorldPod creates a Pod that logs "Hello, World!".
func HelloWorldPod(name string, options ...PodOption) *corev1.Pod {
const imageName = "print"
Expand Down