Skip to content

Cloudevent 1.0 - Part1: Updating source to produce 1.0 payload #2259

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

Merged
knative-prow-robot merged 2 commits into from
Dec 4, 2019
Merged

Cloudevent 1.0 - Part1: Updating source to produce 1.0 payload #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beef69f
Cloudevent 1.0 - Part1: Updating source to produce 1.0 payload
matzew Dec 4, 2019
7e449fd
updating to directly use V1
matzew Dec 4, 2019
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
2 changes: 1 addition & 1 deletion pkg/adapter/apiserver/events/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
114 changes: 51 additions & 63 deletions pkg/adapter/apiserver/events/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package events_test

import (
"fmt"
"strings"
"testing"

Expand All @@ -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{}{
Expand Down Expand Up @@ -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(),
Copy link
Copy Markdown
Contributor

@lionelvillard lionelvillard Dec 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you want to use EventContextV1 ?

Copy link
Copy Markdown
Contributor

@lionelvillard lionelvillard Dec 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or EventContext

},
wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
},
Expand Down Expand Up @@ -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"}}`,
},
Expand Down Expand Up @@ -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"}}`,
},
Expand Down Expand Up @@ -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"}`,
},
Expand All @@ -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"}`,
},
Expand Down Expand Up @@ -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"}`,
},
Expand All @@ -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"}`,
},
Expand Down Expand Up @@ -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"}`,
},
Expand All @@ -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"}`,
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/adapter/cronjobevents/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down