containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix events by fully adding the new PullError event 

Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
Matt Heon 2024-02-29 13:53:36 -05:00
parent 4c1c4c082a
commit 03f6589f34
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/events/config.go
View File

@ -41,6 +41,8 @@ type Event struct {
Type Type Type Type
// Health status of the current container // Health status of the current container
HealthStatus string `json:"health_status,omitempty"` HealthStatus string `json:"health_status,omitempty"`
// Error code for certain events involving errors.
Error error `json:"error,omitempty"`
Details Details
} }
@ -170,6 +172,8 @@ const (
Prune Status = "prune" Prune Status = "prune"
// Pull ... // Pull ...
Pull Status = "pull" Pull Status = "pull"
// PullError is an error pulling an image
PullError Status = "pull-error"
// Push ... // Push ...
Push Status = "push" Push Status = "push"
// Refresh indicates that the system refreshed the state after a // Refresh indicates that the system refreshed the state after a

2
libpod/events/events.go
View File

@ -194,6 +194,8 @@ func StringToStatus(name string) (Status, error) {
return Prune, nil return Prune, nil
case Pull.String(): case Pull.String():
return Pull, nil return Pull, nil
case PullError.String():
return PullError, nil
case Push.String(): case Push.String():
return Push, nil return Push, nil
case Refresh.String(): case Refresh.String():

6
libpod/events/journal_linux.go
View File

@ -43,6 +43,9 @@ func (e EventJournalD) Write(ee Event) error {
case Image: case Image:
m["PODMAN_NAME"] = ee.Name m["PODMAN_NAME"] = ee.Name
m["PODMAN_ID"] = ee.ID m["PODMAN_ID"] = ee.ID
if ee.Error != nil {
m["ERROR"] = ee.Error.Error()
}
case Container, Pod: case Container, Pod:
m["PODMAN_IMAGE"] = ee.Image m["PODMAN_IMAGE"] = ee.Image
m["PODMAN_NAME"] = ee.Name m["PODMAN_NAME"] = ee.Name
@ -228,6 +231,9 @@ func newEventFromJournalEntry(entry *sdjournal.JournalEntry) (*Event, error) {
newEvent.Network = entry.Fields["PODMAN_NETWORK_NAME"] newEvent.Network = entry.Fields["PODMAN_NETWORK_NAME"]
case Image: case Image:
newEvent.ID = entry.Fields["PODMAN_ID"] newEvent.ID = entry.Fields["PODMAN_ID"]
if _, ok := entry.Fields["ERROR"]; ok {
newEvent.Error = errors.New(entry.Fields["ERROR"])
}
} }
return &newEvent, nil return &newEvent, nil
} }

19
libpod/runtime.go
View File

@ -696,15 +696,16 @@ func (r *Runtime) GetConfig() (*config.Config, error) {
// libimageEventsMap translates a libimage event type to a libpod event status. // libimageEventsMap translates a libimage event type to a libpod event status.
var libimageEventsMap = map[libimage.EventType]events.Status{ var libimageEventsMap = map[libimage.EventType]events.Status{
libimage.EventTypeImagePull: events.Pull, libimage.EventTypeImagePull: events.Pull,
libimage.EventTypeImagePush: events.Push, libimage.EventTypeImagePullError: events.PullError,
libimage.EventTypeImageRemove: events.Remove, libimage.EventTypeImagePush: events.Push,
libimage.EventTypeImageLoad: events.LoadFromArchive, libimage.EventTypeImageRemove: events.Remove,
libimage.EventTypeImageSave: events.Save, libimage.EventTypeImageLoad: events.LoadFromArchive,
libimage.EventTypeImageTag: events.Tag, libimage.EventTypeImageSave: events.Save,
libimage.EventTypeImageUntag: events.Untag, libimage.EventTypeImageTag: events.Tag,
libimage.EventTypeImageMount: events.Mount, libimage.EventTypeImageUntag: events.Untag,
libimage.EventTypeImageUnmount: events.Unmount, libimage.EventTypeImageMount: events.Mount,
libimage.EventTypeImageUnmount: events.Unmount,
} }
// libimageEvents spawns a goroutine which will listen for events on // libimageEvents spawns a goroutine which will listen for events on