ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-15 19:42:06 +00:00
Code Packages Projects Releases Wiki Activity

Improve parsing. (#786)

Browse Source
This commit is contained in:
Felix Fontein 2024-02-01 18:52:31 +01:00 committed by GitHub
parent c97ac2337f
commit 7b554082ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/786-docker_v2.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- "docker_compose_v2, docker_compose_v2_pull - fix parsing of pull messages for Docker Compose 2.20.0 (https://github.com/ansible-collections/community.docker/issues/785, https://github.com/ansible-collections/community.docker/pull/786)."

3
plugins/module_utils/compose_v2.py
View File

@ -66,6 +66,7 @@ DOCKER_PULL_PROGRESS_DONE = frozenset((
)) ))
DOCKER_PULL_PROGRESS_WORKING = frozenset(( DOCKER_PULL_PROGRESS_WORKING = frozenset((
'Pulling fs layer', 'Pulling fs layer',
'Waiting',
'Downloading', 'Downloading',
'Verifying Checksum', 'Verifying Checksum',
'Extracting', 'Extracting',
@ -130,7 +131,7 @@ _RE_PULL_PROGRESS = re.compile(
r'\s+' r'\s+'
r'(?P<status>%s)' r'(?P<status>%s)'
r'\s*' r'\s*'
r'(?:|\s\[[^]]+\]\s+\S+\s*)' r'(?:|\s\[[^]]+\]\s+\S+\s*|\s+[0-9.kKmMgGbB]+/[0-9.kKmMgGbB]+\s*)'
r'$' r'$'
% '|'.join(re.escape(status) for status in sorted(DOCKER_PULL_PROGRESS_DONE | DOCKER_PULL_PROGRESS_WORKING)) % '|'.join(re.escape(status) for status in sorted(DOCKER_PULL_PROGRESS_DONE | DOCKER_PULL_PROGRESS_WORKING))
) )

100
tests/unit/plugins/module_utils/test_compose_v2.py
View File

@ -75,6 +75,106 @@ EXTRA_TEST_CASES = [
], ],
[], [],
), ),
(
# https://github.com/ansible-collections/community.docker/issues/785
'2.20.0-manual-pull',
'2.20.0',
False,
'4f4fb700ef54 Waiting\n'
'238022553356 Downloading 541B/541B\n'
'972e292d3a60 Downloading 106kB/10.43MB\n'
'f2543dc9f0a9 Downloading 25.36kB/2.425MB\n'
'972e292d3a60 Downloading 5.925MB/10.43MB\n'
'f2543dc9f0a9 Downloading 2.219MB/2.425MB\n'
'f2543dc9f0a9 Extracting 32.77kB/2.425MB\n'
'4f4fb700ef54 Downloading 32B/32B\n'
'f2543dc9f0a9 Extracting 2.425MB/2.425MB\n'
'972e292d3a60 Extracting 131.1kB/10.43MB\n'
'972e292d3a60 Extracting 10.43MB/10.43MB\n'
'238022553356 Extracting 541B/541B\n'
'4f4fb700ef54 Extracting 32B/32B\n',
[
Event(
'image-layer',
'4f4fb700ef54',
'Waiting',
None,
),
Event(
'image-layer',
'238022553356',
'Downloading',
None,
),
Event(
'image-layer',
'972e292d3a60',
'Downloading',
None,
),
Event(
'image-layer',
'f2543dc9f0a9',
'Downloading',
None,
),
Event(
'image-layer',
'972e292d3a60',
'Downloading',
None,
),
Event(
'image-layer',
'f2543dc9f0a9',
'Downloading',
None,
),
Event(
'image-layer',
'f2543dc9f0a9',
'Extracting',
None,
),
Event(
'image-layer',
'4f4fb700ef54',
'Downloading',
None,
),
Event(
'image-layer',
'f2543dc9f0a9',
'Extracting',
None,
),
Event(
'image-layer',
'972e292d3a60',
'Extracting',
None,
),
Event(
'image-layer',
'972e292d3a60',
'Extracting',
None,
),
Event(
'image-layer',
'238022553356',
'Extracting',
None,
),
Event(
'image-layer',
'4f4fb700ef54',
'Extracting',
None,
),
],
[],
),
] ]
_ALL_TEST_CASES = EVENT_TEST_CASES + EXTRA_TEST_CASES _ALL_TEST_CASES = EVENT_TEST_CASES + EXTRA_TEST_CASES