ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 11:55:04 +00:00
Code Packages Projects Releases Wiki Activity

Move common utility code to plugins.module_utils.util (#390)

Browse Source 
* Move common utility code to plugins.module_utils.util.

* Also adjust plugins.

* Fix import.
This commit is contained in:
Felix Fontein
2022-06-20 18:39:13 +02:00
committed by GitHub
parent a44e0736cf
commit f41d7ac1b8
22 changed files with 495 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/modules/docker_compose.py
+4 -1
View File
@@ -510,10 +510,13 @@ from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
DockerBaseClass,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
)
AUTH_PARAM_MAPPING = {
u'docker_host': u'--host',
plugins/modules/docker_config.py
+3 -1
View File
@@ -199,9 +199,11 @@ except ImportError:
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
compare_generic,
RequestException,
)
from ansible.module_utils.common.text.converters import to_native, to_bytes
plugins/modules/docker_container.py
+3 -1
View File
@@ -1217,6 +1217,9 @@ from ansible_collections.community.docker.plugins.module_utils.version import Lo
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DifferenceTracker,
DockerBaseClass,
compare_generic,
@@ -1226,7 +1229,6 @@ from ansible_collections.community.docker.plugins.module_utils.common import (
omit_none_from_dict,
parse_healthcheck,
DOCKER_COMMON_ARGS,
RequestException,
)
try:
plugins/modules/docker_host_info.py
+6 -3
View File
@@ -203,12 +203,12 @@ disk_usage:
import traceback
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
DockerBaseClass,
RequestException,
)
from ansible.module_utils.common.text.converters import to_native
try:
from docker.errors import DockerException, APIError
@@ -216,7 +216,10 @@ except ImportError:
# Missing Docker SDK for Python handled in ansible.module_utils.docker.common
pass
from ansible_collections.community.docker.plugins.module_utils.common import clean_dict_booleans_for_docker_api
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
clean_dict_booleans_for_docker_api,
)
class DockerHostManager(DockerBaseClass):
plugins/modules/docker_image.py
+5 -3
View File
@@ -329,13 +329,15 @@ import os
import traceback
from ansible_collections.community.docker.plugins.module_utils.common import (
clean_dict_booleans_for_docker_api,
docker_version,
AnsibleDockerClient,
RequestException,
docker_version,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
clean_dict_booleans_for_docker_api,
DockerBaseClass,
is_image_name_id,
is_valid_tag,
RequestException,
)
from ansible.module_utils.common.text.converters import to_native
plugins/modules/docker_image_info.py
+3 -1
View File
@@ -176,9 +176,11 @@ except ImportError:
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
is_image_name_id,
RequestException,
)
plugins/modules/docker_image_load.py
+3 -1
View File
@@ -77,9 +77,11 @@ from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
is_image_name_id,
RequestException,
)
try:
plugins/modules/docker_login.py
+4 -2
View File
@@ -138,11 +138,13 @@ except ImportError:
pass
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
HAS_DOCKER_PY,
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DEFAULT_DOCKER_REGISTRY,
DockerBaseClass,
RequestException,
)
NEEDS_DOCKER_PYCREDS = False
plugins/modules/docker_network.py
+4 -2
View File
@@ -258,11 +258,13 @@ from ansible_collections.community.docker.plugins.module_utils.version import Lo
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
DockerBaseClass,
RequestException,
docker_version,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
DifferenceTracker,
clean_dict_booleans_for_docker_api,
RequestException,
)
try:
plugins/modules/docker_plugin.py
+4 -2
View File
@@ -129,11 +129,13 @@ except ImportError:
pass
from ansible_collections.community.docker.plugins.module_utils.common import (
DockerBaseClass,
AnsibleDockerClient,
DifferenceTracker,
RequestException
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
DifferenceTracker,
)
class TaskParameters(DockerBaseClass):
plugins/modules/docker_secret.py
+3 -1
View File
@@ -191,9 +191,11 @@ except ImportError:
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
compare_generic,
RequestException,
)
from ansible.module_utils.common.text.converters import to_native, to_bytes
plugins/modules/docker_swarm.py
+3 -1
View File
@@ -291,9 +291,11 @@ except ImportError:
from ansible_collections.community.docker.plugins.module_utils.common import (
DockerBaseClass,
DifferenceTracker,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DifferenceTracker,
)
from ansible_collections.community.docker.plugins.module_utils.swarm import AnsibleDockerSwarmClient
plugins/modules/docker_swarm_info.py
+2 -2
View File
@@ -202,10 +202,10 @@ except ImportError:
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.swarm import AnsibleDockerSwarmClient
from ansible_collections.community.docker.plugins.module_utils.common import (
from ansible_collections.community.docker.plugins.module_utils.common import RequestException
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
clean_dict_booleans_for_docker_api,
RequestException,
)
plugins/modules/docker_swarm_service.py
+3 -1
View File
@@ -941,12 +941,14 @@ from ansible_collections.community.docker.plugins.module_utils.version import Lo
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DifferenceTracker,
DockerBaseClass,
convert_duration_to_nanosecond,
parse_healthcheck,
clean_dict_booleans_for_docker_api,
RequestException,
)
from ansible.module_utils.basic import human_to_bytes
plugins/modules/docker_volume.py
+4 -2
View File
@@ -118,11 +118,13 @@ except ImportError:
pass
from ansible_collections.community.docker.plugins.module_utils.common import (
DockerBaseClass,
AnsibleDockerClient,
DifferenceTracker,
RequestException,
)
from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass,
DifferenceTracker,
)
from ansible.module_utils.six import iteritems, text_type