ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 03:52:05 +00:00
Code Packages Projects Releases Wiki Activity

Improve image layer event parsing for Compose 5+.

Browse Source
This commit is contained in:
Felix Fontein 2025-12-06 16:57:31 +01:00
parent 0e017c93a8
commit 00094afaa6
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/module_utils/_compose_v2.py
View File

@ -494,7 +494,17 @@ def parse_json_events(
# {"dry-run":true,"id":"ansible-docker-test-dc713f1f-container ==> ==>","text":"naming to ansible-docker-test-dc713f1f-image"} # {"dry-run":true,"id":"ansible-docker-test-dc713f1f-container ==> ==>","text":"naming to ansible-docker-test-dc713f1f-image"}
# (The longer form happens since Docker Compose 2.39.0) # (The longer form happens since Docker Compose 2.39.0)
continue continue
if isinstance(resource_id, str) and " " in resource_id: if (
status in ("Working", "Done")
and isinstance(line_data.get("parent_id"), str)
and line_data["parent_id"].startswith("Image ")
):
# Compose 5.0.0+:
# {"id":"63a26ae4e8a8","parent_id":"Image ghcr.io/ansible-collections/simple-1:tag","status":"Working"}
# {"id":"63a26ae4e8a8","parent_id":"Image ghcr.io/ansible-collections/simple-1:tag","status":"Done","percent":100}
resource_type = ResourceType.IMAGE_LAYER
resource_id = line_data["parent_id"][len("Image ") :]
elif isinstance(resource_id, str) and " " in resource_id:
resource_type_str, resource_id = resource_id.split(" ", 1) resource_type_str, resource_id = resource_id.split(" ", 1)
try: try:
resource_type = ResourceType.from_docker_compose_event( resource_type = ResourceType.from_docker_compose_event(

61
tests/unit/plugins/module_utils/test__compose_v2.py
View File

@ -494,64 +494,55 @@ JSON_TEST_CASES: list[tuple[str, str, str, list[Event], list[str]]] = [
"Working", "Working",
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8", "ghcr.io/ansible-collections/simple-1:tag",
"Working", "Working",
None, None,
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8", "ghcr.io/ansible-collections/simple-1:tag",
"Working", "Working",
"[> ] 6.89kB/599.9kB", "[> ] 6.89kB/599.9kB",
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8", "ghcr.io/ansible-collections/simple-1:tag",
"Working", "Working",
"[==================================================>] 599.9kB/599.9kB", "[==================================================>] 599.9kB/599.9kB",
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8", "ghcr.io/ansible-collections/simple-1:tag",
"Working", "Working",
None, None,
), ),
Event( Event(
"unknown", "image-layer", "ghcr.io/ansible-collections/simple-1:tag", "Done", None
"63a26ae4e8a8",
"Done",
None,
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8", "ghcr.io/ansible-collections/simple-1:tag",
"Working", "Working",
"[==> ] 32.77kB/599.9kB", "[==> ] 32.77kB/599.9kB",
), ),
Event( Event(
"unknown", "image-layer",
"63a26ae4e8a8",
"Working",
"[==================================================>] 599.9kB/599.9kB",
),
Event(
"unknown",
"63a26ae4e8a8",
"Working",
"[==================================================>] 599.9kB/599.9kB",
),
Event(
"unknown",
"63a26ae4e8a8",
"Done",
None,
),
Event(
"image",
"ghcr.io/ansible-collections/simple-1:tag", "ghcr.io/ansible-collections/simple-1:tag",
"Pulled", "Working",
"Done", "[==================================================>] 599.9kB/599.9kB",
),
Event(
"image-layer",
"ghcr.io/ansible-collections/simple-1:tag",
"Working",
"[==================================================>] 599.9kB/599.9kB",
),
Event(
"image-layer", "ghcr.io/ansible-collections/simple-1:tag", "Done", None
),
Event(
"image", "ghcr.io/ansible-collections/simple-1:tag", "Pulled", "Done"
), ),
], ],
[], [],