Skip to content

fix(nats): derive CloudEvents subject from metadata instead of hardcoded TODO #6269

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

Open
TRIVENI206 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix(nats): derive CloudEvents subject from metadata instead of hardcoded TODO #6269

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed656cf
fix(nats): derive CloudEvents subject from metadata instead of hardco…
TRIVENI206 Apr 3, 2026
a83bf92
fix(nats): derive CloudEvents subject from entity_id
TRIVENI206 Apr 6, 2026
8064d40
Merge branch 'main' into fix-nats-subject
TRIVENI206 Apr 6, 2026
de4b3e3
refactor: extract shared label filtering to internal/labels (#6222)
Gitjay11 Apr 6, 2026
bc5344d
Duplicate repo name (#6276)
DharunMR Apr 6, 2026
e875b00
Feat : Added a flag to ruletype subcommand (#6287)
DharunMR Apr 7, 2026
2b9b45b
Auto-generated cli documentation update - 2026-04-06 23:59:11 (#6296)
github-actions[bot] Apr 7, 2026
f1c2b69
fix: address lint and test issues
TRIVENI206 Apr 7, 2026
a1912a8
fix: revert unintended changes from bad merge
TRIVENI206 Apr 9, 2026
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
10 changes: 9 additions & 1 deletion internal/events/nats/natschannel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,15 @@ func sendEvent(
event.SetID(msg.UUID)
event.SetType(eventType)
event.SetSource("minder") // The system which generated the event. The Minder URL would be nice here.
event.SetSubject("TODO") // This *should* represent the entity, but we don't have a standard field for it yet.
subject := ""

if val, ok := msg.Metadata["entity_id"]; ok && val != "" {

@evankanderson evankanderson Apr 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You don't need to check for presence if you're already checking that val is non-zero-valued.

Suggested change
if val, ok := msg.Metadata["entity_id"]; ok && val != "" {
if val := msg.Metadata["entity_id"]; val != "" {

subject = val
} else {
subject = "minder"
}

event.SetSubject(subject)
Comment on lines +209 to +217

@evankanderson evankanderson Apr 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is a stupid little Go trick, but you can use the default-zero return value from map lookup combined with cmp.Or (return first non-zero value) to write this as:

Suggested change
subject := ""
if val, ok := msg.Metadata["entity_id"]; ok && val != "" {
subject = val
} else {
subject = "minder"
}
event.SetSubject(subject)
event.SetSubject(cmp.Or(msg.Metadata["entity_id"], "minder"))


// All our current payloads are encoded JSON; we need to unmarshal
payload := map[string]any{}
Expand Down
Loading