feat: add Status and ID as event attributes #3232
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkg/cmd/system/events.go
Outdated
| log.G(ctx).WithError(err).Warn("cannot marshal Any into JSON") | ||
| } | ||
|
|
||
| id := "unknown" |
There was a problem hiding this comment.
should we initialize as "" which is default for golang
There was a problem hiding this comment.
because i think the clients might expect something like null to verify if the ID exist or not
There was a problem hiding this comment.
Got it. Changed the default value to be "".
CodeChanning
force-pushed
the
events_attr
branch
from
6c2b20b to
9ea709e
Compare
|
@AkihiroSuda PTAL when you get the chance |
AkihiroSuda
reviewed
Jul 23, 2024
pkg/cmd/system/events.go
Outdated
| } | ||
|
|
||
| id := "" | ||
| _, ok := data["container_id"] |
There was a problem hiding this comment.
This should be skipped when json.Unmarshal returned an error?
There was a problem hiding this comment.
Yes, it should. I added an else statement, so now this will only run if json.Unmarshal doesn't return an error.
CodeChanning
force-pushed
the
events_attr
branch
2 times, most recently
from
265bfbd to
7456760
Compare
Signed-off-by: CodeChanning <[email protected]>
CodeChanning
force-pushed
the
events_attr
branch
from
7456760 to
fea8219
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding Status and ID as attributes
Makes
nerdctl events --format=jsonoutput more docker compatible by adding some missing attributes in nerdctlExample
docker events --format jsonoutput:(src: docker events doc)
Example
nerdctl events --format jsonoutput after change:(includes both status and id in output)