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.

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

Add identifier data to create uuid in events #5165

Merged
merged 1 commit into from
Oct 29, 2024
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
2 changes: 1 addition & 1 deletion cmd/gcpPublishEvent.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func runGcpPublishEvent(utils gcpPublishEventUtils) error {
}

func createNewEvent(config *gcpPublishEventOptions) ([]byte, error) {
event, err := events.NewEvent(config.EventType, config.EventSource).CreateWithJSONData(config.EventData)
event, err := events.NewEvent(config.EventType, config.EventSource, "").CreateWithJSONData(config.EventData)
if err != nil {
return []byte{}, errors.Wrap(err, "failed to create new event")
}
Expand Down
16 changes: 14 additions & 2 deletions pkg/events/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ type Event struct {
cloudEvent cloudevents.Event
eventType string
eventSource string
uuidData string
}

func NewEvent(eventType, eventSource string) Event {
func NewEvent(eventType, eventSource string, uuidString string) Event {
return Event{
eventType: eventType,
eventSource: eventSource,
uuidData: uuidString,
}
}

Expand All @@ -45,8 +47,14 @@ func (e Event) CreateWithJSONData(data string, opts ...Option) (Event, error) {

func (e Event) Create(data any, opts ...Option) Event {
e.cloudEvent = cloudevents.NewEvent("1.0")

if e.uuidData != "" {
e.cloudEvent.SetID(GetUUID(e.uuidData))
} else {
e.cloudEvent.SetID(uuid.New().String())
}

// set default values
e.cloudEvent.SetID(uuid.New().String())
e.cloudEvent.SetType(e.eventType)
e.cloudEvent.SetTime(time.Now())
e.cloudEvent.SetSource(e.eventSource)
Expand All @@ -58,6 +66,10 @@ func (e Event) Create(data any, opts ...Option) Event {
return e
}

func GetUUID(pipelineIdentifier string) string {
return uuid.NewMD5(uuid.NameSpaceOID, []byte(pipelineIdentifier)).String()
}

func (e Event) ToBytes() ([]byte, error) {
data, err := json.Marshal(e.cloudEvent)
if err != nil {
Expand Down
21 changes: 18 additions & 3 deletions pkg/events/events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func TestEventCreation(t *testing.T) {
t.Run("success", func(t *testing.T) {
// init
// test
event := NewEvent(mock.Anything, mock.Anything).Create(nil)
event := NewEvent(mock.Anything, mock.Anything, "").Create(nil)
// asserts
assert.Equal(t, mock.Anything, event.cloudEvent.Type())
assert.Equal(t, mock.Anything, event.cloudEvent.Source())
Expand All @@ -21,7 +21,7 @@ func TestEventCreation(t *testing.T) {
// init
testData := `{"testKey":"testValue"}`
// test
event, err := NewEvent(mock.Anything, mock.Anything).CreateWithJSONData(testData)
event, err := NewEvent(mock.Anything, mock.Anything, "").CreateWithJSONData(testData)
// asserts
assert.NoError(t, err)
assert.Equal(t, string(event.cloudEvent.Data()), testData)
Expand All @@ -32,10 +32,25 @@ func TestEventCreation(t *testing.T) {
testData := `{"testKey": "testValue"}`
additionalData := `{"additionalKey": "additionalValue"}`
// test
event, err := NewEvent(mock.Anything, mock.Anything).CreateWithJSONData(testData)
event, err := NewEvent(mock.Anything, mock.Anything, "").CreateWithJSONData(testData)
event.AddToCloudEventData(additionalData)
// asserts
assert.NoError(t, err)
assert.Equal(t, string(event.cloudEvent.Data()), `{"additionalKey":"additionalValue","testKey":"testValue"}`)
})
}

func TestGetUUID(t *testing.T) {
pipelineIdentifier := "pipelineIdentifier"
uuid := GetUUID(pipelineIdentifier)

if uuid == "" {
t.Fatalf("expected a UUID but got none")
}

uuid2 := GetUUID(pipelineIdentifier)
if uuid != uuid2 {
t.Fatalf("expected the same UUID but got different ones")
}

}
Loading