diff --git a/.isort.cfg b/.isort.cfg index 9c5f2eb4..bf8cf046 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -5,6 +5,3 @@ [isort] profile=black lines_after_imports = 2 - -[settings] -known_third_party=docker diff --git a/plugins/action/docker_container_copy_into.py b/plugins/action/docker_container_copy_into.py index f424dfbc..96c6afbb 100644 --- a/plugins/action/docker_container_copy_into.py +++ b/plugins/action/docker_container_copy_into.py @@ -9,6 +9,7 @@ import base64 from ansible import constants as C from ansible.plugins.action import ActionBase from ansible.utils.vars import merge_hash + from ansible_collections.community.docker.plugins.module_utils._scramble import ( unscramble, ) diff --git a/plugins/connection/docker.py b/plugins/connection/docker.py index cf96fb2e..807098c3 100644 --- a/plugins/connection/docker.py +++ b/plugins/connection/docker.py @@ -125,6 +125,7 @@ from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.plugins.connection import BUFSIZE, ConnectionBase from ansible.utils.display import Display + from ansible_collections.community.docker.plugins.module_utils._version import ( LooseVersion, ) diff --git a/plugins/connection/docker_api.py b/plugins/connection/docker_api.py index 282447e8..20d9bfda 100644 --- a/plugins/connection/docker_api.py +++ b/plugins/connection/docker_api.py @@ -112,6 +112,7 @@ from ansible.errors import AnsibleConnectionFailure, AnsibleFileNotFound from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.plugins.connection import ConnectionBase from ansible.utils.display import Display + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/plugins/inventory/docker_containers.py b/plugins/inventory/docker_containers.py index b84e0fc4..1aead1de 100644 --- a/plugins/inventory/docker_containers.py +++ b/plugins/inventory/docker_containers.py @@ -172,6 +172,11 @@ import re from ansible.errors import AnsibleError from ansible.plugins.inventory import BaseInventoryPlugin, Constructable +from ansible_collections.community.library_inventory_filtering_v1.plugins.plugin_utils.inventory_filter import ( + filter_host, + parse_filters, +) + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, @@ -188,10 +193,6 @@ from ansible_collections.community.docker.plugins.plugin_utils._common_api impor from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( make_unsafe, ) -from ansible_collections.community.library_inventory_filtering_v1.plugins.plugin_utils.inventory_filter import ( - filter_host, - parse_filters, -) MIN_DOCKER_API = None diff --git a/plugins/inventory/docker_machine.py b/plugins/inventory/docker_machine.py index 52768885..41230fef 100644 --- a/plugins/inventory/docker_machine.py +++ b/plugins/inventory/docker_machine.py @@ -107,14 +107,15 @@ from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_native, to_text from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructable from ansible.utils.display import Display -from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( - make_unsafe, -) from ansible_collections.community.library_inventory_filtering_v1.plugins.plugin_utils.inventory_filter import ( filter_host, parse_filters, ) +from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( + make_unsafe, +) + display = Display() diff --git a/plugins/inventory/docker_swarm.py b/plugins/inventory/docker_swarm.py index 36c59c7b..9a43f8d7 100644 --- a/plugins/inventory/docker_swarm.py +++ b/plugins/inventory/docker_swarm.py @@ -151,6 +151,11 @@ keyed_groups: from ansible.errors import AnsibleError from ansible.parsing.utils.addresses import parse_address from ansible.plugins.inventory import BaseInventoryPlugin, Constructable +from ansible_collections.community.library_inventory_filtering_v1.plugins.plugin_utils.inventory_filter import ( + filter_host, + parse_filters, +) + from ansible_collections.community.docker.plugins.module_utils._common import ( get_connect_params, ) @@ -160,10 +165,6 @@ from ansible_collections.community.docker.plugins.module_utils._util import ( from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( make_unsafe, ) -from ansible_collections.community.library_inventory_filtering_v1.plugins.plugin_utils.inventory_filter import ( - filter_host, - parse_filters, -) try: diff --git a/plugins/module_utils/_common.py b/plugins/module_utils/_common.py index 6de55807..b0bbdd1d 100644 --- a/plugins/module_utils/_common.py +++ b/plugins/module_utils/_common.py @@ -17,6 +17,7 @@ from collections.abc import Mapping, Sequence from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE, BOOLEANS_TRUE + from ansible_collections.community.docker.plugins.module_utils._util import ( DEFAULT_DOCKER_HOST, DEFAULT_TIMEOUT_SECONDS, diff --git a/plugins/module_utils/_common_api.py b/plugins/module_utils/_common_api.py index 7294e085..22753221 100644 --- a/plugins/module_utils/_common_api.py +++ b/plugins/module_utils/_common_api.py @@ -15,6 +15,7 @@ from collections.abc import Mapping, Sequence from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE, BOOLEANS_TRUE + from ansible_collections.community.docker.plugins.module_utils._version import ( LooseVersion, ) diff --git a/plugins/module_utils/_common_cli.py b/plugins/module_utils/_common_cli.py index 5d143976..d3fdfe24 100644 --- a/plugins/module_utils/_common_cli.py +++ b/plugins/module_utils/_common_cli.py @@ -14,6 +14,7 @@ import shlex from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._api.auth import ( resolve_repository_name, ) diff --git a/plugins/module_utils/_compose_v2.py b/plugins/module_utils/_compose_v2.py index 0f972498..f18b2eae 100644 --- a/plugins/module_utils/_compose_v2.py +++ b/plugins/module_utils/_compose_v2.py @@ -19,6 +19,7 @@ from shlex import quote from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._logfmt import ( InvalidLogFmt as _InvalidLogFmt, ) diff --git a/plugins/module_utils/_copy.py b/plugins/module_utils/_copy.py index ae3e8939..2641b63f 100644 --- a/plugins/module_utils/_copy.py +++ b/plugins/module_utils/_copy.py @@ -18,6 +18,7 @@ import stat import tarfile from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, NotFound, diff --git a/plugins/module_utils/_module_container/base.py b/plugins/module_utils/_module_container/base.py index 0565b84b..6b917f23 100644 --- a/plugins/module_utils/_module_container/base.py +++ b/plugins/module_utils/_module_container/base.py @@ -16,6 +16,7 @@ from functools import partial from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.utils.utils import ( parse_env_file, ) diff --git a/plugins/module_utils/_module_container/docker_api.py b/plugins/module_utils/_module_container/docker_api.py index 37858783..756f5e6a 100644 --- a/plugins/module_utils/_module_container/docker_api.py +++ b/plugins/module_utils/_module_container/docker_api.py @@ -13,6 +13,7 @@ import traceback from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/plugins/module_utils/_module_container/module.py b/plugins/module_utils/_module_container/module.py index cc81cbe8..0e9ef972 100644 --- a/plugins/module_utils/_module_container/module.py +++ b/plugins/module_utils/_module_container/module.py @@ -12,6 +12,7 @@ import re from time import sleep from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.docker.plugins.module_utils._api.utils.utils import ( parse_repository_tag, ) diff --git a/plugins/modules/docker_compose_v2.py b/plugins/modules/docker_compose_v2.py index 393297a2..e4d748d9 100644 --- a/plugins/modules/docker_compose_v2.py +++ b/plugins/modules/docker_compose_v2.py @@ -439,6 +439,7 @@ actions: import traceback from ansible.module_utils.common.validation import check_type_int + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_compose_v2_exec.py b/plugins/modules/docker_compose_v2_exec.py index 977d69e9..79156740 100644 --- a/plugins/modules/docker_compose_v2_exec.py +++ b/plugins/modules/docker_compose_v2_exec.py @@ -168,6 +168,7 @@ import shlex import traceback from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_compose_v2_run.py b/plugins/modules/docker_compose_v2_run.py index 4586839c..82fff5fe 100644 --- a/plugins/modules/docker_compose_v2_run.py +++ b/plugins/modules/docker_compose_v2_run.py @@ -241,6 +241,7 @@ import shlex import traceback from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_config.py b/plugins/modules/docker_config.py index 5ad8cef7..1af51533 100644 --- a/plugins/modules/docker_config.py +++ b/plugins/modules/docker_config.py @@ -207,6 +207,7 @@ except ImportError: pass from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.docker.plugins.module_utils._common import ( AnsibleDockerClient, RequestException, diff --git a/plugins/modules/docker_container_copy_into.py b/plugins/modules/docker_container_copy_into.py index d493d677..86159d88 100644 --- a/plugins/modules/docker_container_copy_into.py +++ b/plugins/modules/docker_container_copy_into.py @@ -172,6 +172,7 @@ import traceback from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.common.validation import check_type_int + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/plugins/modules/docker_container_exec.py b/plugins/modules/docker_container_exec.py index cd68f8f8..c697f79f 100644 --- a/plugins/modules/docker_container_exec.py +++ b/plugins/modules/docker_container_exec.py @@ -168,6 +168,7 @@ import shlex import traceback from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/plugins/modules/docker_context_info.py b/plugins/modules/docker_context_info.py index 832bc439..496c8e81 100644 --- a/plugins/modules/docker_context_info.py +++ b/plugins/modules/docker_context_info.py @@ -176,6 +176,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.docker.plugins.module_utils._api.context.api import ( ContextAPI, ) diff --git a/plugins/modules/docker_image.py b/plugins/modules/docker_image.py index 2c2c84cc..353f407c 100644 --- a/plugins/modules/docker_image.py +++ b/plugins/modules/docker_image.py @@ -370,6 +370,7 @@ import traceback from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.auth import ( get_config_header, resolve_repository_name, diff --git a/plugins/modules/docker_image_build.py b/plugins/modules/docker_image_build.py index 804cb21d..9172e82c 100644 --- a/plugins/modules/docker_image_build.py +++ b/plugins/modules/docker_image_build.py @@ -285,6 +285,7 @@ import traceback from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.utils.utils import ( parse_repository_tag, ) diff --git a/plugins/modules/docker_image_tag.py b/plugins/modules/docker_image_tag.py index 15b1ca3c..131b8d97 100644 --- a/plugins/modules/docker_image_tag.py +++ b/plugins/modules/docker_image_tag.py @@ -103,6 +103,7 @@ tagged_images: import traceback from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( DockerException, ) diff --git a/plugins/modules/docker_login.py b/plugins/modules/docker_login.py index 0bc5c103..e1e1c2d2 100644 --- a/plugins/modules/docker_login.py +++ b/plugins/modules/docker_login.py @@ -122,6 +122,7 @@ import os import traceback from ansible.module_utils.common.text.converters import to_bytes, to_text + from ansible_collections.community.docker.plugins.module_utils._api import auth from ansible_collections.community.docker.plugins.module_utils._api.auth import ( decode_auth, diff --git a/plugins/modules/docker_network.py b/plugins/modules/docker_network.py index 8b15fd61..8f988ba4 100644 --- a/plugins/modules/docker_network.py +++ b/plugins/modules/docker_network.py @@ -286,6 +286,7 @@ import time import traceback from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( DockerException, ) diff --git a/plugins/modules/docker_node.py b/plugins/modules/docker_node.py index a8086e85..456f2cc0 100644 --- a/plugins/modules/docker_node.py +++ b/plugins/modules/docker_node.py @@ -143,6 +143,7 @@ except ImportError: pass from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._common import ( RequestException, ) diff --git a/plugins/modules/docker_plugin.py b/plugins/modules/docker_plugin.py index 583703e5..b7bcea0c 100644 --- a/plugins/modules/docker_plugin.py +++ b/plugins/modules/docker_plugin.py @@ -131,6 +131,7 @@ actions: import traceback from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._api import auth from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, diff --git a/plugins/modules/docker_prune.py b/plugins/modules/docker_prune.py index 6ec06d95..a3ae8818 100644 --- a/plugins/modules/docker_prune.py +++ b/plugins/modules/docker_prune.py @@ -231,6 +231,7 @@ builder_cache_caches_deleted: import traceback from ansible.module_utils.common.text.formatters import human_to_bytes + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( DockerException, ) diff --git a/plugins/modules/docker_secret.py b/plugins/modules/docker_secret.py index 27e36929..d4e20f11 100644 --- a/plugins/modules/docker_secret.py +++ b/plugins/modules/docker_secret.py @@ -199,6 +199,7 @@ except ImportError: pass from ansible.module_utils.common.text.converters import to_bytes + from ansible_collections.community.docker.plugins.module_utils._common import ( AnsibleDockerClient, RequestException, diff --git a/plugins/modules/docker_stack.py b/plugins/modules/docker_stack.py index 7f94e7be..07da50c9 100644 --- a/plugins/modules/docker_stack.py +++ b/plugins/modules/docker_stack.py @@ -161,6 +161,7 @@ import traceback from time import sleep from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_stack_info.py b/plugins/modules/docker_stack_info.py index eb7921b0..8ae6f09f 100644 --- a/plugins/modules/docker_stack_info.py +++ b/plugins/modules/docker_stack_info.py @@ -78,6 +78,7 @@ import json import traceback from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_stack_task_info.py b/plugins/modules/docker_stack_task_info.py index 759f51ee..e9fb91f1 100644 --- a/plugins/modules/docker_stack_task_info.py +++ b/plugins/modules/docker_stack_task_info.py @@ -86,6 +86,7 @@ import json import traceback from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._common_cli import ( AnsibleModuleDockerClient, DockerException, diff --git a/plugins/modules/docker_swarm_service.py b/plugins/modules/docker_swarm_service.py index 053126d6..90889390 100644 --- a/plugins/modules/docker_swarm_service.py +++ b/plugins/modules/docker_swarm_service.py @@ -856,6 +856,7 @@ import traceback from ansible.module_utils.basic import human_to_bytes from ansible.module_utils.common.text.converters import to_text + from ansible_collections.community.docker.plugins.module_utils._common import ( AnsibleDockerClient, RequestException, diff --git a/plugins/modules/docker_volume.py b/plugins/modules/docker_volume.py index c642cbc8..4803d061 100644 --- a/plugins/modules/docker_volume.py +++ b/plugins/modules/docker_volume.py @@ -120,6 +120,7 @@ volume: import traceback from ansible.module_utils.common.text.converters import to_native + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/plugins/plugin_utils/_common.py b/plugins/plugin_utils/_common.py index fa50d771..9700ed00 100644 --- a/plugins/plugin_utils/_common.py +++ b/plugins/plugin_utils/_common.py @@ -9,6 +9,7 @@ from __future__ import annotations from ansible.errors import AnsibleConnectionFailure from ansible.utils.display import Display + from ansible_collections.community.docker.plugins.module_utils._common import ( AnsibleDockerClientBase, ) diff --git a/plugins/plugin_utils/_common_api.py b/plugins/plugin_utils/_common_api.py index 46a8abbc..1f40b5f7 100644 --- a/plugins/plugin_utils/_common_api.py +++ b/plugins/plugin_utils/_common_api.py @@ -9,6 +9,7 @@ from __future__ import annotations from ansible.errors import AnsibleConnectionFailure from ansible.utils.display import Display + from ansible_collections.community.docker.plugins.module_utils._common_api import ( AnsibleDockerClientBase, ) diff --git a/tests/unit/plugins/inventory/test_docker_containers.py b/tests/unit/plugins/inventory/test_docker_containers.py index 91a77e9c..2ed7f63f 100644 --- a/tests/unit/plugins/inventory/test_docker_containers.py +++ b/tests/unit/plugins/inventory/test_docker_containers.py @@ -8,9 +8,6 @@ import pytest from ansible.inventory.data import InventoryData from ansible.parsing.dataloader import DataLoader from ansible.template import Templar -from ansible_collections.community.docker.plugins.inventory.docker_containers import ( - InventoryModule, -) from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( create_autospec, ) @@ -18,6 +15,10 @@ from ansible_collections.community.internal_test_tools.tests.unit.utils.trust im make_trusted, ) +from ansible_collections.community.docker.plugins.inventory.docker_containers import ( + InventoryModule, +) + @pytest.fixture(scope="module") def templar(): diff --git a/tests/unit/plugins/module_utils/_api/api/test_client.py b/tests/unit/plugins/module_utils/_api/api/test_client.py index 89df1d72..2f77b2c0 100644 --- a/tests/unit/plugins/module_utils/_api/api/test_client.py +++ b/tests/unit/plugins/module_utils/_api/api/test_client.py @@ -25,6 +25,8 @@ from socketserver import ThreadingTCPServer import pytest import requests +from requests.packages import urllib3 + from ansible_collections.community.docker.plugins.module_utils._api import ( constants, errors, @@ -35,7 +37,6 @@ from ansible_collections.community.docker.plugins.module_utils._api.api.client i from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.constants import ( DEFAULT_DOCKER_API_VERSION, ) -from requests.packages import urllib3 from .. import fake_api diff --git a/tests/unit/plugins/module_utils/_api/test_auth.py b/tests/unit/plugins/module_utils/_api/test_auth.py index 8d2518ea..363d51e2 100644 --- a/tests/unit/plugins/module_utils/_api/test_auth.py +++ b/tests/unit/plugins/module_utils/_api/test_auth.py @@ -18,6 +18,7 @@ import tempfile import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api import auth, errors from ansible_collections.community.docker.plugins.module_utils._api.credentials.errors import ( CredentialsNotFound, diff --git a/tests/unit/plugins/module_utils/_api/test_context.py b/tests/unit/plugins/module_utils/_api/test_context.py index 78348369..bc1cc13e 100644 --- a/tests/unit/plugins/module_utils/_api/test_context.py +++ b/tests/unit/plugins/module_utils/_api/test_context.py @@ -11,6 +11,7 @@ from __future__ import annotations import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api import errors from ansible_collections.community.docker.plugins.module_utils._api.constants import ( DEFAULT_NPIPE, diff --git a/tests/unit/plugins/module_utils/_api/test_errors.py b/tests/unit/plugins/module_utils/_api/test_errors.py index 1d76ea4d..cb9afd17 100644 --- a/tests/unit/plugins/module_utils/_api/test_errors.py +++ b/tests/unit/plugins/module_utils/_api/test_errors.py @@ -11,6 +11,7 @@ from __future__ import annotations import unittest import requests + from ansible_collections.community.docker.plugins.module_utils._api.errors import ( APIError, DockerException, diff --git a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py index 27759c6d..bce24eba 100644 --- a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py +++ b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py @@ -11,6 +11,7 @@ from __future__ import annotations import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api.transport import ( ssladapter, ) diff --git a/tests/unit/plugins/module_utils/_api/utils/test_build.py b/tests/unit/plugins/module_utils/_api/utils/test_build.py index 8df7f327..eb537d35 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_build.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_build.py @@ -17,6 +17,7 @@ import tempfile import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api.constants import ( IS_WINDOWS_PLATFORM, ) diff --git a/tests/unit/plugins/module_utils/_api/utils/test_config.py b/tests/unit/plugins/module_utils/_api/utils/test_config.py index b4bf1cba..6b400694 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_config.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_config.py @@ -14,9 +14,10 @@ import shutil import tempfile import unittest -from ansible_collections.community.docker.plugins.module_utils._api.utils import config from pytest import fixture, mark +from ansible_collections.community.docker.plugins.module_utils._api.utils import config + try: from unittest import mock diff --git a/tests/unit/plugins/module_utils/_api/utils/test_ports.py b/tests/unit/plugins/module_utils/_api/utils/test_ports.py index a4b1aca0..3bce6125 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_ports.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_ports.py @@ -11,6 +11,7 @@ from __future__ import annotations import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api.utils.ports import ( build_port_bindings, split_port, diff --git a/tests/unit/plugins/module_utils/_api/utils/test_utils.py b/tests/unit/plugins/module_utils/_api/utils/test_utils.py index 52f9b1b0..9344d60e 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_utils.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_utils.py @@ -17,6 +17,7 @@ import tempfile import unittest import pytest + from ansible_collections.community.docker.plugins.module_utils._api.api.client import ( APIClient, ) diff --git a/tests/unit/plugins/module_utils/test__compose_v2.py b/tests/unit/plugins/module_utils/test__compose_v2.py index f1c56ebc..4d855364 100644 --- a/tests/unit/plugins/module_utils/test__compose_v2.py +++ b/tests/unit/plugins/module_utils/test__compose_v2.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._compose_v2 import ( Event, parse_events, diff --git a/tests/unit/plugins/module_utils/test__copy.py b/tests/unit/plugins/module_utils/test__copy.py index 9de4ed96..8b9feb27 100644 --- a/tests/unit/plugins/module_utils/test__copy.py +++ b/tests/unit/plugins/module_utils/test__copy.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._copy import ( _stream_generator_to_fileobj, ) diff --git a/tests/unit/plugins/module_utils/test__image_archive.py b/tests/unit/plugins/module_utils/test__image_archive.py index b9c93aeb..ce55153b 100644 --- a/tests/unit/plugins/module_utils/test__image_archive.py +++ b/tests/unit/plugins/module_utils/test__image_archive.py @@ -7,6 +7,7 @@ from __future__ import annotations import tarfile import pytest + from ansible_collections.community.docker.plugins.module_utils._image_archive import ( ImageArchiveInvalidException, api_image_id, diff --git a/tests/unit/plugins/module_utils/test__logfmt.py b/tests/unit/plugins/module_utils/test__logfmt.py index 3a3e9c39..9e2a89a7 100644 --- a/tests/unit/plugins/module_utils/test__logfmt.py +++ b/tests/unit/plugins/module_utils/test__logfmt.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._logfmt import ( InvalidLogFmt, parse_line, diff --git a/tests/unit/plugins/module_utils/test__scramble.py b/tests/unit/plugins/module_utils/test__scramble.py index 5704ca25..29446a10 100644 --- a/tests/unit/plugins/module_utils/test__scramble.py +++ b/tests/unit/plugins/module_utils/test__scramble.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._scramble import ( scramble, unscramble, diff --git a/tests/unit/plugins/module_utils/test__util.py b/tests/unit/plugins/module_utils/test__util.py index 7846c628..0390e411 100644 --- a/tests/unit/plugins/module_utils/test__util.py +++ b/tests/unit/plugins/module_utils/test__util.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._util import ( compare_dict_allow_more_present, compare_generic, diff --git a/tests/unit/plugins/modules/test_docker_container_copy_into.py b/tests/unit/plugins/modules/test_docker_container_copy_into.py index baaf9eae..f722f4e9 100644 --- a/tests/unit/plugins/modules/test_docker_container_copy_into.py +++ b/tests/unit/plugins/modules/test_docker_container_copy_into.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.modules.docker_container_copy_into import ( parse_modern, parse_octal_string_only, diff --git a/tests/unit/plugins/modules/test_docker_image.py b/tests/unit/plugins/modules/test_docker_image.py index e92dc397..e4523f4c 100644 --- a/tests/unit/plugins/modules/test_docker_image.py +++ b/tests/unit/plugins/modules/test_docker_image.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.module_utils._image_archive import ( api_image_id, ) diff --git a/tests/unit/plugins/modules/test_docker_image_build.py b/tests/unit/plugins/modules/test_docker_image_build.py index 3ad794b5..cddea0f6 100644 --- a/tests/unit/plugins/modules/test_docker_image_build.py +++ b/tests/unit/plugins/modules/test_docker_image_build.py @@ -5,6 +5,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.modules.docker_image_build import ( _quote_csv, ) diff --git a/tests/unit/plugins/modules/test_docker_network.py b/tests/unit/plugins/modules/test_docker_network.py index d24d736a..3875a294 100644 --- a/tests/unit/plugins/modules/test_docker_network.py +++ b/tests/unit/plugins/modules/test_docker_network.py @@ -7,6 +7,7 @@ from __future__ import annotations import pytest + from ansible_collections.community.docker.plugins.modules.docker_network import ( validate_cidr, ) diff --git a/tests/unit/plugins/plugin_utils/test__unsafe.py b/tests/unit/plugins/plugin_utils/test__unsafe.py index 2c0469de..e2de9f8a 100644 --- a/tests/unit/plugins/plugin_utils/test__unsafe.py +++ b/tests/unit/plugins/plugin_utils/test__unsafe.py @@ -5,9 +5,6 @@ from __future__ import annotations import pytest -from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( - make_unsafe, -) from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( SUPPORTS_DATA_TAGGING, ) @@ -21,6 +18,10 @@ from ansible_collections.community.internal_test_tools.tests.unit.utils.trust im make_untrusted as _make_untrusted, ) +from ansible_collections.community.docker.plugins.plugin_utils._unsafe import ( + make_unsafe, +) + TEST_MAKE_UNSAFE = [ (