diff --git a/plugins/modules/lxd_storage_pool_info.py b/plugins/modules/lxd_storage_pool_info.py index a3ed200088..d615d79a8a 100644 --- a/plugins/modules/lxd_storage_pool_info.py +++ b/plugins/modules/lxd_storage_pool_info.py @@ -183,6 +183,7 @@ logs: """ import os +import typing as t from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule @@ -246,19 +247,16 @@ class LXDStoragePoolInfo: self.trust_password = self.module.params["trust_password"] - def _fail_from_lxd_exception(self, exception: LXDClientException) -> None: + def _fail_from_lxd_exception(self, exception: LXDClientException) -> t.NoReturn: """Build failure parameters from LXDClientException and fail. :param exception: The LXDClientException instance :type exception: LXDClientException """ - fail_params = { - "msg": exception.msg, - "changed": False, - } + fail_params = {} if self.client.debug and "logs" in exception.kwargs: fail_params["logs"] = exception.kwargs["logs"] - self.module.fail_json(**fail_params) + self.module.fail_json(msg=exception.msg, changed=False, **fail_params) def _build_url(self, endpoint: str) -> str: """Build URL with project parameter if specified.""" diff --git a/plugins/modules/lxd_storage_volume_info.py b/plugins/modules/lxd_storage_volume_info.py index e4abcef995..d243eaa0a7 100644 --- a/plugins/modules/lxd_storage_volume_info.py +++ b/plugins/modules/lxd_storage_volume_info.py @@ -188,6 +188,7 @@ logs: """ import os +import typing as t from urllib.parse import quote, urlencode from ansible.module_utils.basic import AnsibleModule @@ -252,19 +253,16 @@ class LXDStorageVolumeInfo: self.trust_password = self.module.params["trust_password"] - def _fail_from_lxd_exception(self, exception: LXDClientException) -> None: + def _fail_from_lxd_exception(self, exception: LXDClientException) -> t.NoReturn: """Build failure parameters from LXDClientException and fail. :param exception: The LXDClientException instance :type exception: LXDClientException """ - fail_params = { - "msg": exception.msg, - "changed": False, - } + fail_params = {} if self.client.debug and "logs" in exception.kwargs: fail_params["logs"] = exception.kwargs["logs"] - self.module.fail_json(**fail_params) + self.module.fail_json(msg=exception.msg, changed=False, **fail_params) def _build_url(self, endpoint: str) -> str: """Build URL with project parameter if specified."""