This commit is contained in:
Felix Fontein
2025-10-10 21:19:28 +02:00
parent f7e976f3da
commit 892e9d9cbd
59 changed files with 77 additions and 22 deletions
-3
View File
@@ -5,6 +5,3 @@
[isort]
profile=black
lines_after_imports = 2
[settings]
known_third_party=docker
@@ -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,
)
+1
View File
@@ -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,
)
+1
View File
@@ -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,
+5 -4
View File
@@ -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
+4 -3
View File
@@ -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()
+5 -4
View File
@@ -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:
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
)
+1
View File
@@ -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,
)
+1
View File
@@ -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,
@@ -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,
)
@@ -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,
@@ -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,
)
+1
View File
@@ -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,
@@ -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,
+1
View File
@@ -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,
+1
View File
@@ -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,
@@ -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,
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
)
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
)
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
+1
View File
@@ -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,
+1
View File
@@ -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,
@@ -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,
+1
View File
@@ -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,
+1
View File
@@ -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,
+1
View File
@@ -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,
)
+1
View File
@@ -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,
)
@@ -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():
@@ -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
@@ -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,
@@ -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,
@@ -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,
@@ -11,6 +11,7 @@ from __future__ import annotations
import unittest
import pytest
from ansible_collections.community.docker.plugins.module_utils._api.transport import (
ssladapter,
)
@@ -17,6 +17,7 @@ import tempfile
import unittest
import pytest
from ansible_collections.community.docker.plugins.module_utils._api.constants import (
IS_WINDOWS_PLATFORM,
)
@@ -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
@@ -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,
@@ -17,6 +17,7 @@ import tempfile
import unittest
import pytest
from ansible_collections.community.docker.plugins.module_utils._api.api.client import (
APIClient,
)
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.module_utils._compose_v2 import (
Event,
parse_events,
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.module_utils._copy import (
_stream_generator_to_fileobj,
)
@@ -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,
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.module_utils._logfmt import (
InvalidLogFmt,
parse_line,
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.module_utils._scramble import (
scramble,
unscramble,
@@ -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,
@@ -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,
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.module_utils._image_archive import (
api_image_id,
)
@@ -5,6 +5,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.modules.docker_image_build import (
_quote_csv,
)
@@ -7,6 +7,7 @@
from __future__ import annotations
import pytest
from ansible_collections.community.docker.plugins.modules.docker_network import (
validate_cidr,
)
@@ -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 = [
(