Skip to content
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

Jump to bottom

Copy additional information as extensions of CE in APIServerSource #3741

Merged
merged 4 commits into from
Jul 28, 2020
Merged

Copy additional information as extensions of CE in APIServerSource #3741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2f9c4b
Copy resource name as an attribute of CE
danyinggu Jul 27, 2020
78ce478
fix UT
danyinggu Jul 28, 2020
63ff2c7
fix format
danyinggu Jul 28, 2020
d7d5c86
Add kind and namespace
danyinggu Jul 28, 2020
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
15 changes: 11 additions & 4 deletions pkg/adapter/apiserver/events/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func MakeDeleteEvent(source string, obj interface{}, ref bool) (cloudevents.Even
object := obj.(*unstructured.Unstructured)
var data interface{}
var eventType string

if ref {
data = getRef(object)
eventType = sourcesv1beta1.ApiServerSourceDeleteRefEventType
Expand All @@ -93,18 +94,24 @@ func getRef(object *unstructured.Unstructured) corev1.ObjectReference {
}

func makeEvent(source, eventType string, obj *unstructured.Unstructured, data interface{}) (cloudevents.Event, error) {
resourceName := obj.GetName()
kind := obj.GetKind()
namespace := obj.GetNamespace()
subject := createSelfLink(corev1.ObjectReference{
APIVersion: obj.GetAPIVersion(),
Kind: obj.GetKind(),
Name: obj.GetName(),
Namespace: obj.GetNamespace(),
Kind: kind,
Name: resourceName,
Namespace: namespace,
})

event := cloudevents.NewEvent(cloudevents.VersionV1)
event.SetType(eventType)
event.SetSource(source)
event.SetSubject(subject)

// We copy the resource kind, name and namespace as extensions so that triggers can do the filter based on these attributes
event.SetExtension("kind", kind)
event.SetExtension("name", resourceName)
event.SetExtension("namespace", namespace)
if err := event.SetData(cloudevents.ApplicationJSON, data); err != nil {
return event, err
}
Expand Down
30 changes: 30 additions & 0 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 @@ -72,6 +72,11 @@ func TestMakeAddEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
Expand Down Expand Up @@ -108,6 +113,11 @@ func TestMakeUpdateEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
Expand Down Expand Up @@ -144,6 +154,11 @@ func TestMakeDeleteEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
Expand Down Expand Up @@ -180,6 +195,11 @@ func TestMakeAddRefEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
Expand Down Expand Up @@ -216,6 +236,11 @@ func TestMakeUpdateRefEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
Expand Down Expand Up @@ -252,6 +277,11 @@ func TestMakeDeleteRefEvent(t *testing.T) {
Source: *cloudevents.ParseURIRef("unit-test"),
Subject: simpleSubject("unit", "test"),
DataContentType: &contentType,
Extensions: map[string]interface{}{
"kind": "Pod",
"name": "unit",
"namespace": "test",
},
}.AsV1(),
},
wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
Expand Down