diff --git a/pkg/adapter/apiserver/events/events.go b/pkg/adapter/apiserver/events/events.go index 4cbec84d4d7..b2f62ecddc8 100644 --- a/pkg/adapter/apiserver/events/events.go +++ b/pkg/adapter/apiserver/events/events.go @@ -106,7 +106,7 @@ func makeEvent(source, eventType string, obj *unstructured.Unstructured, data in Namespace: obj.GetNamespace(), }) - event := cloudevents.NewEvent(cloudevents.VersionV03) + event := cloudevents.NewEvent(cloudevents.VersionV1) event.SetType(eventType) event.SetSource(source) event.SetSubject(subject) diff --git a/pkg/adapter/apiserver/events/events_test.go b/pkg/adapter/apiserver/events/events_test.go index d1d6dd0d116..f29265d502c 100644 --- a/pkg/adapter/apiserver/events/events_test.go +++ b/pkg/adapter/apiserver/events/events_test.go @@ -17,6 +17,7 @@ limitations under the License. package events_test import ( + "fmt" "strings" "testing" @@ -43,6 +44,11 @@ func simplePod(name, namespace string) *unstructured.Unstructured { } } +func simpleSubject(name, namespace string) *string { + subject := fmt.Sprintf("/apis/v1/namespaces/%s/pods/%s", namespace, name) + return &subject +} + func simpleOwnedPod(name, namespace string) *unstructured.Unstructured { return &unstructured.Unstructured{ Object: map[string]interface{}{ @@ -84,14 +90,12 @@ func TestMakeAddEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.resource.add", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`, }, @@ -122,14 +126,12 @@ func TestMakeUpdateEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.resource.update", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`, }, @@ -160,14 +162,12 @@ func TestMakeDeleteEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.resource.delete", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`, }, @@ -199,14 +199,12 @@ func TestMakeAddRefEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.add", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`, }, @@ -215,14 +213,12 @@ func TestMakeAddRefEvent(t *testing.T) { obj: simpleOwnedPod("unit", "test"), asController: true, want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.add", - ContentType: &contentType, - Source: *cloudevents.ParseURLRef("unit-test"), - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/owned", - }, - }.AsV03(), + DataContentType: &contentType, + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("owned", "test"), + }.AsV1(), }, wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`, }, @@ -254,14 +250,12 @@ func TestMakeUpdateRefEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.update", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`, }, @@ -270,14 +264,12 @@ func TestMakeUpdateRefEvent(t *testing.T) { obj: simpleOwnedPod("unit", "test"), asController: true, want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.update", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/owned", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("owned", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`, }, @@ -309,14 +301,12 @@ func TestMakeDeleteRefEvent(t *testing.T) { source: "unit-test", obj: simplePod("unit", "test"), want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.delete", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/unit", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("unit", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`, }, @@ -325,14 +315,12 @@ func TestMakeDeleteRefEvent(t *testing.T) { obj: simpleOwnedPod("unit", "test"), asController: true, want: &cloudevents.Event{ - Context: cloudevents.EventContextV02{ + Context: cloudevents.EventContextV1{ Type: "dev.knative.apiserver.ref.delete", - Source: *cloudevents.ParseURLRef("unit-test"), - ContentType: &contentType, - Extensions: map[string]interface{}{ - "subject": "/apis/v1/namespaces/test/pods/owned", - }, - }.AsV03(), + Source: *cloudevents.ParseURIRef("unit-test"), + Subject: simpleSubject("owned", "test"), + DataContentType: &contentType, + }.AsV1(), }, wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`, }, diff --git a/pkg/adapter/cronjobevents/adapter.go b/pkg/adapter/cronjobevents/adapter.go index 57f13a9bfba..68d7a437706 100644 --- a/pkg/adapter/cronjobevents/adapter.go +++ b/pkg/adapter/cronjobevents/adapter.go @@ -101,7 +101,7 @@ func (a *cronJobAdapter) Start(stopCh <-chan struct{}) error { func (a *cronJobAdapter) cronTick() { logger := logging.FromContext(context.TODO()) - event := cloudevents.NewEvent(cloudevents.VersionV03) + event := cloudevents.NewEvent(cloudevents.VersionV1) event.SetType(sourcesv1alpha1.CronJobEventType) event.SetSource(sourcesv1alpha1.CronJobEventSource(a.Namespace, a.Name)) event.SetData(message(a.Data))