mirror of
https://github.com/containers/podman.git
synced 2025-10-16 18:53:19 +08:00
9ee96a9569
Commit 03f6589f3 added basic support for pull-error event from libimage but it contains several problems: 1. storing the error as error type prevents it from being unmarshalled, thus change it to a string 2. the error was never propagated from the libimage event to the podman event struct 3. the error message was not wired into the cli and API This commit fixes these problems. Fixes #21458 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
100 lines
2.6 KiB
Go
100 lines
2.6 KiB
Go
package entities
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
|
|
libpodEvents "github.com/containers/podman/v5/libpod/events"
|
|
types "github.com/containers/podman/v5/pkg/domain/entities/types"
|
|
dockerEvents "github.com/docker/docker/api/types/events"
|
|
)
|
|
|
|
type Event = types.Event
|
|
|
|
// ConvertToLibpodEvent converts an entities event to a libpod one.
|
|
func ConvertToLibpodEvent(e Event) *libpodEvents.Event {
|
|
var exitCode int
|
|
if ec, ok := e.Actor.Attributes["containerExitCode"]; ok {
|
|
var err error
|
|
exitCode, err = strconv.Atoi(ec)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
}
|
|
status, err := libpodEvents.StringToStatus(string(e.Action))
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
t, err := libpodEvents.StringToType(string(e.Type))
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
image := e.Actor.Attributes["image"]
|
|
name := e.Actor.Attributes["name"]
|
|
network := e.Actor.Attributes["network"]
|
|
podID := e.Actor.Attributes["podId"]
|
|
errorString := e.Actor.Attributes["error"]
|
|
details := e.Actor.Attributes
|
|
delete(details, "image")
|
|
delete(details, "name")
|
|
delete(details, "network")
|
|
delete(details, "podId")
|
|
delete(details, "error")
|
|
delete(details, "containerExitCode")
|
|
return &libpodEvents.Event{
|
|
ContainerExitCode: &exitCode,
|
|
ID: e.Actor.ID,
|
|
Image: image,
|
|
Name: name,
|
|
Network: network,
|
|
Status: status,
|
|
Time: time.Unix(0, e.TimeNano),
|
|
Type: t,
|
|
HealthStatus: e.HealthStatus,
|
|
Error: errorString,
|
|
Details: libpodEvents.Details{
|
|
PodID: podID,
|
|
Attributes: details,
|
|
},
|
|
}
|
|
}
|
|
|
|
// ConvertToEntitiesEvent converts a libpod event to an entities one.
|
|
func ConvertToEntitiesEvent(e libpodEvents.Event) *types.Event {
|
|
attributes := e.Details.Attributes
|
|
if attributes == nil {
|
|
attributes = make(map[string]string)
|
|
}
|
|
attributes["image"] = e.Image
|
|
attributes["name"] = e.Name
|
|
if e.ContainerExitCode != nil {
|
|
attributes["containerExitCode"] = strconv.Itoa(*e.ContainerExitCode)
|
|
}
|
|
attributes["podId"] = e.PodID
|
|
if e.Network != "" {
|
|
attributes["network"] = e.Network
|
|
}
|
|
if e.Error != "" {
|
|
attributes["error"] = e.Error
|
|
}
|
|
message := dockerEvents.Message{
|
|
// Compatibility with clients that still look for deprecated API elements
|
|
Status: e.Status.String(),
|
|
ID: e.ID,
|
|
From: e.Image,
|
|
Type: dockerEvents.Type(e.Type.String()),
|
|
Action: dockerEvents.Action(e.Status.String()),
|
|
Actor: dockerEvents.Actor{
|
|
ID: e.ID,
|
|
Attributes: attributes,
|
|
},
|
|
Scope: "local",
|
|
Time: e.Time.Unix(),
|
|
TimeNano: e.Time.UnixNano(),
|
|
}
|
|
return &types.Event{
|
|
Message: message,
|
|
HealthStatus: e.HealthStatus,
|
|
}
|
|
}
|