summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-13 17:17:28 -0400
committerGitHub <noreply@github.com>2021-09-13 17:17:28 -0400
commitb603c7a4b91d30b33ce987740156f46804f24074 (patch)
tree5f11103c2381f2f6ab0eb07c5d27d37009914729
parent473f958e137eb9d8a3a3ef44cf3c17513243c18d (diff)
parent3c77a98e4582dd1ddd1820506068b03575109dfe (diff)
downloadpodman-b603c7a4b91d30b33ce987740156f46804f24074.tar.gz
podman-b603c7a4b91d30b33ce987740156f46804f24074.tar.bz2
podman-b603c7a4b91d30b33ce987740156f46804f24074.zip
Merge pull request #11529 from n1hility/fix-oldfields
Add deprecated event fields for 1.22+ clients that still expect them
-rw-r--r--pkg/domain/entities/events.go4
-rw-r--r--test/apiv2/python/rest_api/test_v2_0_0_system.py8
2 files changed, 12 insertions, 0 deletions
diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go
index 5e7cc9ad1..73a375b94 100644
--- a/pkg/domain/entities/events.go
+++ b/pkg/domain/entities/events.go
@@ -60,6 +60,10 @@ func ConvertToEntitiesEvent(e libpodEvents.Event) *Event {
attributes["name"] = e.Name
attributes["containerExitCode"] = strconv.Itoa(e.ContainerExitCode)
return &Event{dockerEvents.Message{
+ // Compatibility with clients that still look for deprecated API elements
+ Status: e.Status.String(),
+ ID: e.ID,
+ From: e.Image,
Type: e.Type.String(),
Action: e.Status.String(),
Actor: dockerEvents.Actor{
diff --git a/test/apiv2/python/rest_api/test_v2_0_0_system.py b/test/apiv2/python/rest_api/test_v2_0_0_system.py
index 2d3935c9c..8171abb84 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_system.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_system.py
@@ -29,6 +29,14 @@ class SystemTestCase(APITestCase):
obj = json.loads(line)
# Actor.ID is uppercase for compatibility
self.assertIn("ID", obj["Actor"])
+ # Verify 1.22+ deprecated variants are present if current originals are
+ if (obj["Actor"]["ID"]):
+ self.assertEqual(obj["Actor"]["ID"], obj["id"])
+ if (obj["Action"]):
+ self.assertEqual(obj["Action"], obj["status"])
+ if (obj["Actor"].get("Attributes") and obj["Actor"]["Attributes"].get("image")):
+ self.assertEqual(obj["Actor"]["Attributes"]["image"], obj["from"])
+
def test_ping(self):
required_headers = (