Skip to content

Commit

Permalink
Fix list tags failure in podman_search (#875)
Browse files Browse the repository at this point in the history
Fix #874
Signed-off-by: Sagi Shnaidman <[email protected]>
  • Loading branch information
sshnaidm authored Nov 5, 2024
1 parent 4c84135 commit a77ca6a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
10 changes: 6 additions & 4 deletions plugins/modules/podman_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ def search_images(module, executable, term, limit, list_tags):
command.extend(['--list-tags'])

rc, out, err = module.run_command(command)

if rc != 0 and list_tags and out == "" and "fetching tags list" in err:
return out, err
if rc != 0:
module.fail_json(msg="Unable to gather info for '{0}': {1}".format(term, err))
return out
return out, err


def main():
Expand All @@ -110,7 +111,7 @@ def main():
list_tags = module.params.get('list_tags')
executable = module.get_bin_path(executable, required=True)

result_str = search_images(module, executable, term, limit, list_tags)
result_str, errors = search_images(module, executable, term, limit, list_tags)
if result_str == "":
results = []
else:
Expand All @@ -121,7 +122,8 @@ def main():

results = dict(
changed=False,
images=results
images=results,
stderr=errors,
)

module.exit_json(**results)
Expand Down
12 changes: 12 additions & 0 deletions tests/integration/targets/podman_search/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
that:
- info_0.images | length == 0

- name: Search for an invalid image with tags
containers.podman.podman_search:
term: registry.fedoraproject.org/invalidtermnope
executable: "{{ test_executable | default('podman') }}"
list_tags: true
register: info_0_1

- name: Check results for no matching images
assert:
that:
- info_0_1.images | length == 0

- name: Search for matching images
containers.podman.podman_search:
term: etcd
Expand Down

0 comments on commit a77ca6a

Please sign in to comment.