Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

podman pod info: handle return being list in Podman 5 #713

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion plugins/module_utils/podman/podman_pod_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,16 @@ def get_info(self):
# pylint: disable=unused-variable
rc, out, err = self.module.run_command(
[self.module_params['executable'], b'pod', b'inspect', self.name])
return json.loads(out) if rc == 0 else {}
if rc == 0:
info = json.loads(out)
# from podman 5 onwards, this is a list of dicts,
# before it was just a single dict when querying
# a single pod
if isinstance(info, list):
return info[0]
else:
return info
return {}

def get_ps(self):
"""Inspect pod process and gather info about it."""
Expand Down
Loading