mirror of
https://github.com/ansible-collections/community.docker.git
synced 2025-12-16 20:08:41 +00:00
docker_prune: correctly return 'changed' result (#593)
* Correctly return 'changed' status. * Extend tests. * Fix typo.
This commit is contained in:
parent
d0e61097f1
commit
08bfcf7e5f
2
changelogs/fragments/593-docker_prune-changed.yml
Normal file
2
changelogs/fragments/593-docker_prune-changed.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
bugfixes:
|
||||||
|
- "docker_prune - return correct value for ``changed``. So far the module always claimed that nothing changed (https://github.com/ansible-collections/community.docker/pull/593)."
|
||||||
@ -85,6 +85,9 @@ options:
|
|||||||
author:
|
author:
|
||||||
- "Felix Fontein (@felixfontein)"
|
- "Felix Fontein (@felixfontein)"
|
||||||
|
|
||||||
|
notes:
|
||||||
|
- The module always returned C(changed=false) before community.docker 3.5.1.
|
||||||
|
|
||||||
requirements:
|
requirements:
|
||||||
- "Docker API >= 1.25"
|
- "Docker API >= 1.25"
|
||||||
'''
|
'''
|
||||||
@ -215,6 +218,7 @@ def main():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
result = dict()
|
result = dict()
|
||||||
|
changed = False
|
||||||
|
|
||||||
if client.module.params['containers']:
|
if client.module.params['containers']:
|
||||||
filters = clean_dict_booleans_for_docker_api(client.module.params.get('containers_filters'))
|
filters = clean_dict_booleans_for_docker_api(client.module.params.get('containers_filters'))
|
||||||
@ -222,6 +226,8 @@ def main():
|
|||||||
res = client.post_to_json('/containers/prune', params=params)
|
res = client.post_to_json('/containers/prune', params=params)
|
||||||
result['containers'] = res.get('ContainersDeleted') or []
|
result['containers'] = res.get('ContainersDeleted') or []
|
||||||
result['containers_space_reclaimed'] = res['SpaceReclaimed']
|
result['containers_space_reclaimed'] = res['SpaceReclaimed']
|
||||||
|
if result['containers'] or result['containers_space_reclaimed']:
|
||||||
|
changed = True
|
||||||
|
|
||||||
if client.module.params['images']:
|
if client.module.params['images']:
|
||||||
filters = clean_dict_booleans_for_docker_api(client.module.params.get('images_filters'))
|
filters = clean_dict_booleans_for_docker_api(client.module.params.get('images_filters'))
|
||||||
@ -229,12 +235,16 @@ def main():
|
|||||||
res = client.post_to_json('/images/prune', params=params)
|
res = client.post_to_json('/images/prune', params=params)
|
||||||
result['images'] = res.get('ImagesDeleted') or []
|
result['images'] = res.get('ImagesDeleted') or []
|
||||||
result['images_space_reclaimed'] = res['SpaceReclaimed']
|
result['images_space_reclaimed'] = res['SpaceReclaimed']
|
||||||
|
if result['images'] or result['images_space_reclaimed']:
|
||||||
|
changed = True
|
||||||
|
|
||||||
if client.module.params['networks']:
|
if client.module.params['networks']:
|
||||||
filters = clean_dict_booleans_for_docker_api(client.module.params.get('networks_filters'))
|
filters = clean_dict_booleans_for_docker_api(client.module.params.get('networks_filters'))
|
||||||
params = {'filters': convert_filters(filters)}
|
params = {'filters': convert_filters(filters)}
|
||||||
res = client.post_to_json('/networks/prune', params=params)
|
res = client.post_to_json('/networks/prune', params=params)
|
||||||
result['networks'] = res.get('NetworksDeleted') or []
|
result['networks'] = res.get('NetworksDeleted') or []
|
||||||
|
if result['networks']:
|
||||||
|
changed = True
|
||||||
|
|
||||||
if client.module.params['volumes']:
|
if client.module.params['volumes']:
|
||||||
filters = clean_dict_booleans_for_docker_api(client.module.params.get('volumes_filters'))
|
filters = clean_dict_booleans_for_docker_api(client.module.params.get('volumes_filters'))
|
||||||
@ -242,11 +252,16 @@ def main():
|
|||||||
res = client.post_to_json('/volumes/prune', params=params)
|
res = client.post_to_json('/volumes/prune', params=params)
|
||||||
result['volumes'] = res.get('VolumesDeleted') or []
|
result['volumes'] = res.get('VolumesDeleted') or []
|
||||||
result['volumes_space_reclaimed'] = res['SpaceReclaimed']
|
result['volumes_space_reclaimed'] = res['SpaceReclaimed']
|
||||||
|
if result['volumes'] or result['volumes_space_reclaimed']:
|
||||||
|
changed = True
|
||||||
|
|
||||||
if client.module.params['builder_cache']:
|
if client.module.params['builder_cache']:
|
||||||
res = client.post_to_json('/build/prune')
|
res = client.post_to_json('/build/prune')
|
||||||
result['builder_cache_space_reclaimed'] = res['SpaceReclaimed']
|
result['builder_cache_space_reclaimed'] = res['SpaceReclaimed']
|
||||||
|
if result['builder_cache_space_reclaimed']:
|
||||||
|
changed = True
|
||||||
|
|
||||||
|
result['changed'] = changed
|
||||||
client.module.exit_json(**result)
|
client.module.exit_json(**result)
|
||||||
except DockerException as e:
|
except DockerException as e:
|
||||||
client.fail('An unexpected Docker error occurred: {0}'.format(to_native(e)), exception=traceback.format_exc())
|
client.fail('An unexpected Docker error occurred: {0}'.format(to_native(e)), exception=traceback.format_exc())
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
command: docker volume list
|
command: docker volume list
|
||||||
|
|
||||||
# Prune objects
|
# Prune objects
|
||||||
- docker_prune:
|
- name: Prune everything
|
||||||
|
docker_prune:
|
||||||
containers: true
|
containers: true
|
||||||
images: true
|
images: true
|
||||||
networks: true
|
networks: true
|
||||||
@ -55,6 +56,7 @@
|
|||||||
- name: General checks
|
- name: General checks
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
|
- result is changed
|
||||||
# containers
|
# containers
|
||||||
- container.container.Id in result.containers
|
- container.container.Id in result.containers
|
||||||
- "'containers_space_reclaimed' in result"
|
- "'containers_space_reclaimed' in result"
|
||||||
@ -81,6 +83,37 @@
|
|||||||
- volume.volume.Name not in result.volumes
|
- volume.volume.Name not in result.volumes
|
||||||
when: docker_api_version is version('1.42', '>=')
|
when: docker_api_version is version('1.42', '>=')
|
||||||
|
|
||||||
|
# Prune objects again
|
||||||
|
- name: Prune everything again (should have no change)
|
||||||
|
docker_prune:
|
||||||
|
containers: true
|
||||||
|
images: true
|
||||||
|
networks: true
|
||||||
|
volumes: true
|
||||||
|
builder_cache: true
|
||||||
|
register: result
|
||||||
|
|
||||||
|
# Analyze result
|
||||||
|
- name: Show results
|
||||||
|
debug:
|
||||||
|
var: result
|
||||||
|
- name: General checks
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- result is not changed
|
||||||
|
# containers
|
||||||
|
- result.containers == []
|
||||||
|
- result.containers_space_reclaimed == 0
|
||||||
|
# images
|
||||||
|
- result.images == []
|
||||||
|
- result.images_space_reclaimed == 0
|
||||||
|
# networks
|
||||||
|
- result.networks == []
|
||||||
|
# volumes
|
||||||
|
- result.volumes == []
|
||||||
|
# builder_cache
|
||||||
|
- result.builder_cache_space_reclaimed == 0
|
||||||
|
|
||||||
# Test with filters
|
# Test with filters
|
||||||
- name: Prune with filters
|
- name: Prune with filters
|
||||||
docker_prune:
|
docker_prune:
|
||||||
@ -110,6 +143,7 @@
|
|||||||
- name: Check results
|
- name: Check results
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
|
- result is changed
|
||||||
- volume.volume.Name in result.volumes
|
- volume.volume.Name in result.volumes
|
||||||
- "'volumes_space_reclaimed' in result"
|
- "'volumes_space_reclaimed' in result"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user