Revert "event source was lost when converting cloud native events to …

…events. (#39)" This reverts commit ab7b206.
redhat-cne · Mar 24, 2022 · 5d80083 · 5d80083
1 parent ab7b206
commit 5d80083
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/pkg/event/event_ce.go b/pkg/event/event_ce.go
@@ -29,7 +29,6 @@ func (e *Event) NewCloudEvent(ps *pubsub.PubSub) (*cloudevent.Event, error) {
 	ce.SetTime(e.GetTime())
 	ce.SetType(e.Type)
 	ce.SetDataContentType(cloudevent.ApplicationJSON)
-	ce.SetSubject(e.Source)   // subject is set to source of the event object
 	ce.SetSource(ps.Resource) // bus address
 	ce.SetSpecVersion(cloudevent.VersionV03)
 	ce.SetID(uuid.New().String())
@@ -51,9 +50,7 @@ func (e *Event) GetCloudNativeEvents(ce *cloudevent.Event) (err error) {
 	e.SetDataContentType(ApplicationJSON)
 	e.SetTime(ce.Time())
 	e.SetType(ce.Type())
-	e.SetSource(ce.Subject())
+	e.SetSource(ce.Source())
 	e.SetData(data)
-	e.SetID(ce.ID())
-
 	return
 }
diff --git a/pkg/event/event_ce_test.go b/pkg/event/event_ce_test.go
@@ -79,7 +79,6 @@ func TestEvent_NewCloudEvent(t *testing.T) {
 				e.SetType(_type)
 				e.SetSource(_source)
 				e.SetData(data)
-				e.SetID(id)
 				return &e
 			}(),
 			cnePubsub: &pubsub,
@@ -90,7 +89,6 @@ func TestEvent_NewCloudEvent(t *testing.T) {
 				_ = e.SetData(ce.ApplicationJSON, data)
 				e.SetTime(now.Time)
 				e.SetSource(pubsub.GetResource())
-				e.SetSubject(_source)
 				e.SetID(id)
 				return &e
 			}(),
@@ -126,7 +124,6 @@ func TestEvent_GetCloudNativeEvents(t *testing.T) {
 				_ = e.SetData(ce.ApplicationJSON, data)
 				e.SetTime(now.Time)
 				e.SetSource(pubsub.GetResource())
-				e.SetSubject(_source)
 				e.SetID(id)
 				return &e
 			}(),
@@ -135,9 +132,8 @@ func TestEvent_GetCloudNativeEvents(t *testing.T) {
 				e.SetDataContentType(cneevent.ApplicationJSON)
 				e.SetTime(now.Time)
 				e.SetType(_type)
-				e.SetSource(_source)
+				e.SetSource(pubsub.GetResource())
 				e.SetData(data)
-				e.SetID(id)
 				return &e
 			}(),
 		},

diff --git a/pkg/event/redfish/event_ce_test.go b/pkg/event/redfish/event_ce_test.go
@@ -37,7 +37,6 @@ var (
 	uriLocation = "http://localhost:8089/api/cloudNotifications/v1/subscriptions/da42fb86-819e-47c5-84a3-5512d5a3c732"
 	endPointURI = "http://localhost:9089/event"
 	resource    = "/cluster/node/nodename/redfish/event"
-	_source     = "/cluster/node/nodename/redfish/event/fan"
 	_type       = string(redfish.Alert)
 	version     = "v1"
 	id          = uuid.New().String()
@@ -99,9 +98,8 @@ func TestEvent_NewCloudEvent(t *testing.T) {
 				e.SetDataContentType(cneevent.ApplicationJSON)
 				e.SetTime(now.Time)
 				e.SetType(_type)
-				e.SetSource(_source)
+				e.SetSource(pubsub.GetResource())
 				e.SetData(data)
-				e.SetID(id)
 				return &e
 			}(),
 			cnePubsub: &pubsub,
@@ -112,7 +110,6 @@ func TestEvent_NewCloudEvent(t *testing.T) {
 				_ = e.SetData(ce.ApplicationJSON, data)
 				e.SetTime(now.Time)
 				e.SetSource(pubsub.GetResource())
-				e.SetSubject(_source)
 				e.SetID(id)
 				return &e
 			}(),
@@ -148,7 +145,6 @@ func TestEvent_GetCloudNativeEvents(t *testing.T) {
 				_ = e.SetData(ce.ApplicationJSON, data)
 				e.SetTime(now.Time)
 				e.SetSource(pubsub.GetResource())
-				e.SetSubject(_source)
 				e.SetID(id)
 				return &e
 			}(),
@@ -157,9 +153,8 @@ func TestEvent_GetCloudNativeEvents(t *testing.T) {
 				e.SetDataContentType(cneevent.ApplicationJSON)
 				e.SetTime(now.Time)
 				e.SetType(_type)
-				e.SetSource(_source)
+				e.SetSource(pubsub.GetResource())
 				e.SetData(data)
-				e.SetID(id)
 				return &e
 			}(),
 		},

diff --git a/v1/event/event.go b/v1/event/event.go
@@ -111,7 +111,6 @@ func GetCloudNativeEvents(ce cloudevents.Event) (e event.Event, err error) {
 	e.SetTime(ce.Time())
 	e.SetType(ce.Type())
 	e.SetSource(ce.Source())
-	e.SetID(ce.ID())
 	e.SetData(data)
 	return
 }