mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-07 12:37:17 +00:00
[PR #11222/c7f6a28d backport][stable-12] Add basic typing for module_utils (#11243)
Add basic typing for module_utils (#11222) * Add basic typing for module_utils. * Apply some suggestions. * Make pass again. * Add more types as suggested. * Normalize extra imports. * Add more type hints. * Improve typing. * Add changelog fragment. * Reduce changelog. * Apply suggestions from code review. * Fix typo. * Cleanup. * Improve types and make type checking happy. * Let's see whether older Pythons barf on this. * Revert "Let's see whether older Pythons barf on this." This reverts commit9973af3dbe. * Add noqa. --------- (cherry picked from commitc7f6a28d89) Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
a2c7f9f89a
commit
377a599372
56 changed files with 725 additions and 469 deletions
|
|
@ -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."""
|
||||
|
|
|
|||
|
|
@ -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."""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue