Improve error handling. (#1035) (#1036)

(cherry picked from commit 511cfe5) Co-authored-by: Felix Fontein <felix@fontein.de>
ansible-collections · Jan 31, 2025 · 3c59569 · 3c59569
1 parent 91cf71d
commit 3c59569
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/changelogs/fragments/1034-error-msg.yml b/changelogs/fragments/1034-error-msg.yml
@@ -0,0 +1,3 @@
+bugfixes:
+  - "vendored Docker SDK for Python - do not assume that ``KeyError`` is always for ``ApiVersion`` when querying version fails
+     (https://github.com/ansible-collections/community.docker/issues/1033, https://github.com/ansible-collections/community.docker/pull/1034)."
diff --git a/plugins/module_utils/_api/api/client.py b/plugins/module_utils/_api/api/client.py
@@ -202,15 +202,22 @@ def __init__(self, base_url=None, version=None,
 
     def _retrieve_server_version(self):
         try:
-            return self.version(api_version=False)["ApiVersion"]
+            version_result = self.version(api_version=False)
+        except Exception as e:
+            raise DockerException(
+                'Error while fetching server API version: {0}'.format(e)
+            )
+
+        try:
+            return version_result["ApiVersion"]
         except KeyError:
             raise DockerException(
                 'Invalid response from docker daemon: key "ApiVersion"'
                 ' is missing.'
             )
         except Exception as e:
             raise DockerException(
-                'Error while fetching server API version: {0}'.format(e)
+                'Error while fetching server API version: {0}. Response seems to be broken.'.format(e)
             )
 
     def _set_request_timeout(self, kwargs):