diff --git a/.github/workflows/vendor.yml b/.github/workflows/vendor.yml index 83f7717..d13fcdd 100644 --- a/.github/workflows/vendor.yml +++ b/.github/workflows/vendor.yml @@ -4,11 +4,11 @@ on: push: branches: [main, stable-1] paths: - - plugins/module_utils/vendor/** + - plugins/module_utils/_vendor/** - scripts/vendor.py pull_request: paths: - - plugins/module_utils/vendor/** + - plugins/module_utils/_vendor/** - scripts/vendor.py jobs: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 63d1451..3a7a67b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks -exclude: ^plugins/module_utils/vendor/hcloud/.*$ +exclude: ^plugins/module_utils/_vendor/hcloud/.*$ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 diff --git a/Makefile b/Makefile index 0c37dff..2f6d012 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ clean: sanity: ansible-test sanity --color --truncate 0 -v \ - --exclude plugins/module_utils/vendor/ \ + --exclude plugins/module_utils/_vendor/ \ --exclude scripts/ \ --exclude tests/utils/ \ --docker default \ diff --git a/plugins/filter/all.py b/plugins/filter/all.py index d76ea2e..463cb06 100644 --- a/plugins/filter/all.py +++ b/plugins/filter/all.py @@ -5,7 +5,7 @@ from typing import Literal from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_native -from ..module_utils.vendor.hcloud.exp.zone import format_txt_record +from ..module_utils._vendor.hcloud.exp.zone import format_txt_record # pylint: disable=unused-argument diff --git a/plugins/inventory/hcloud.py b/plugins/inventory/hcloud.py index 93603f3..4a1a2a5 100644 --- a/plugins/inventory/hcloud.py +++ b/plugins/inventory/hcloud.py @@ -202,16 +202,16 @@ from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, Constructa from ansible.utils.display import Display from ansible.utils.vars import combine_vars -from ..module_utils.client import ( +from ..module_utils._client import ( Client, ClientException, client_check_required_lib, client_get_by_name_or_id, ) -from ..module_utils.vendor.hcloud import APIException -from ..module_utils.vendor.hcloud.networks import Network -from ..module_utils.vendor.hcloud.servers import Server -from ..module_utils.version import version +from ..module_utils._vendor.hcloud import APIException +from ..module_utils._vendor.hcloud.networks import Network +from ..module_utils._vendor.hcloud.servers import Server +from ..module_utils._version import version if sys.version_info >= (3, 11): # The typed dicts are only used to help development and we prefer not requiring diff --git a/plugins/module_utils/hcloud.py b/plugins/module_utils/_base.py similarity index 96% rename from plugins/module_utils/hcloud.py rename to plugins/module_utils/_base.py index dc9d652..70d1cb0 100644 --- a/plugins/module_utils/hcloud.py +++ b/plugins/module_utils/_base.py @@ -16,15 +16,19 @@ from ansible.module_utils.common.validation import ( check_required_one_of, ) -from .client import ClientException, client_check_required_lib, client_get_by_name_or_id -from .vendor.hcloud import ( +from ._client import ( + ClientException, + client_check_required_lib, + client_get_by_name_or_id, +) +from ._vendor.hcloud import ( APIException, Client, HCloudException, exponential_backoff_function, ) -from .vendor.hcloud.actions import ActionException -from .version import version +from ._vendor.hcloud.actions import ActionException +from ._version import version class AnsibleModule(AnsibleModuleBase): diff --git a/plugins/module_utils/client.py b/plugins/module_utils/_client.py similarity index 98% rename from plugins/module_utils/client.py rename to plugins/module_utils/_client.py index 4ccf051..b9f931f 100644 --- a/plugins/module_utils/client.py +++ b/plugins/module_utils/_client.py @@ -6,7 +6,7 @@ from contextlib import contextmanager from ansible.module_utils.basic import missing_required_lib -from .vendor.hcloud import APIException, Client as ClientBase +from ._vendor.hcloud import APIException, Client as ClientBase HAS_REQUESTS = True HAS_DATEUTIL = True diff --git a/plugins/module_utils/deprecation.py b/plugins/module_utils/_deprecation.py similarity index 97% rename from plugins/module_utils/deprecation.py rename to plugins/module_utils/_deprecation.py index 34fa935..5dc461a 100644 --- a/plugins/module_utils/deprecation.py +++ b/plugins/module_utils/_deprecation.py @@ -5,8 +5,8 @@ from datetime import datetime, timezone from ansible.module_utils.basic import AnsibleModule -from .vendor.hcloud.locations import BoundLocation -from .vendor.hcloud.server_types import BoundServerType, ServerTypeLocation +from ._vendor.hcloud.locations import BoundLocation +from ._vendor.hcloud.server_types import BoundServerType, ServerTypeLocation DEPRECATED_EXISTING_SERVERS = """ Existing servers of that type will continue to work as before and no action is \ diff --git a/plugins/module_utils/experimental.py b/plugins/module_utils/_experimental.py similarity index 97% rename from plugins/module_utils/experimental.py rename to plugins/module_utils/_experimental.py index 28a9198..a0ea1a9 100644 --- a/plugins/module_utils/experimental.py +++ b/plugins/module_utils/_experimental.py @@ -2,7 +2,7 @@ from __future__ import annotations -from .hcloud import AnsibleModule +from ._base import AnsibleModule def experimental_warning_function(product: str, maturity: str, url: str): diff --git a/plugins/module_utils/floating_ip.py b/plugins/module_utils/_floating_ip.py similarity index 88% rename from plugins/module_utils/floating_ip.py rename to plugins/module_utils/_floating_ip.py index 8385a80..281d915 100644 --- a/plugins/module_utils/floating_ip.py +++ b/plugins/module_utils/_floating_ip.py @@ -1,6 +1,6 @@ from __future__ import annotations -from ..module_utils.vendor.hcloud.floating_ips import ( +from ._vendor.hcloud.floating_ips import ( BoundFloatingIP, ) diff --git a/plugins/module_utils/ipaddress.py b/plugins/module_utils/_ipaddress.py similarity index 100% rename from plugins/module_utils/ipaddress.py rename to plugins/module_utils/_ipaddress.py diff --git a/plugins/module_utils/primary_ip.py b/plugins/module_utils/_primary_ip.py similarity index 90% rename from plugins/module_utils/primary_ip.py rename to plugins/module_utils/_primary_ip.py index 7172711..1713920 100644 --- a/plugins/module_utils/primary_ip.py +++ b/plugins/module_utils/_primary_ip.py @@ -1,6 +1,6 @@ from __future__ import annotations -from ..module_utils.vendor.hcloud.primary_ips import ( +from ._vendor.hcloud.primary_ips import ( BoundPrimaryIP, ) diff --git a/plugins/module_utils/ssh.py b/plugins/module_utils/_ssh.py similarity index 100% rename from plugins/module_utils/ssh.py rename to plugins/module_utils/_ssh.py diff --git a/plugins/module_utils/storage_box.py b/plugins/module_utils/_storage_box.py similarity index 94% rename from plugins/module_utils/storage_box.py rename to plugins/module_utils/_storage_box.py index 5e307bc..eaed4e8 100644 --- a/plugins/module_utils/storage_box.py +++ b/plugins/module_utils/_storage_box.py @@ -1,7 +1,7 @@ from __future__ import annotations -from ..module_utils.client import client_resource_not_found -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ._client import client_resource_not_found +from ._vendor.hcloud.storage_boxes import ( BoundStorageBox, StorageBoxesClient, ) diff --git a/plugins/module_utils/storage_box_snapshot.py b/plugins/module_utils/_storage_box_snapshot.py similarity index 89% rename from plugins/module_utils/storage_box_snapshot.py rename to plugins/module_utils/_storage_box_snapshot.py index 4fe10c1..a76c136 100644 --- a/plugins/module_utils/storage_box_snapshot.py +++ b/plugins/module_utils/_storage_box_snapshot.py @@ -1,6 +1,6 @@ from __future__ import annotations -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ._vendor.hcloud.storage_boxes import ( BoundStorageBoxSnapshot, ) diff --git a/plugins/module_utils/storage_box_subaccount.py b/plugins/module_utils/_storage_box_subaccount.py similarity index 95% rename from plugins/module_utils/storage_box_subaccount.py rename to plugins/module_utils/_storage_box_subaccount.py index b4175fd..0d1cfcb 100644 --- a/plugins/module_utils/storage_box_subaccount.py +++ b/plugins/module_utils/_storage_box_subaccount.py @@ -1,6 +1,6 @@ from __future__ import annotations -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ._vendor.hcloud.storage_boxes import ( BoundStorageBox, BoundStorageBoxSubaccount, ) diff --git a/plugins/module_utils/vendor/__init__.py b/plugins/module_utils/_vendor/__init__.py similarity index 100% rename from plugins/module_utils/vendor/__init__.py rename to plugins/module_utils/_vendor/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/__init__.py b/plugins/module_utils/_vendor/hcloud/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/__init__.py rename to plugins/module_utils/_vendor/hcloud/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/_client.py b/plugins/module_utils/_vendor/hcloud/_client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/_client.py rename to plugins/module_utils/_vendor/hcloud/_client.py diff --git a/plugins/module_utils/vendor/hcloud/_exceptions.py b/plugins/module_utils/_vendor/hcloud/_exceptions.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/_exceptions.py rename to plugins/module_utils/_vendor/hcloud/_exceptions.py diff --git a/plugins/module_utils/vendor/hcloud/_version.py b/plugins/module_utils/_vendor/hcloud/_version.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/_version.py rename to plugins/module_utils/_vendor/hcloud/_version.py diff --git a/plugins/module_utils/vendor/hcloud/actions/__init__.py b/plugins/module_utils/_vendor/hcloud/actions/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/actions/__init__.py rename to plugins/module_utils/_vendor/hcloud/actions/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/actions/client.py b/plugins/module_utils/_vendor/hcloud/actions/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/actions/client.py rename to plugins/module_utils/_vendor/hcloud/actions/client.py diff --git a/plugins/module_utils/vendor/hcloud/actions/domain.py b/plugins/module_utils/_vendor/hcloud/actions/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/actions/domain.py rename to plugins/module_utils/_vendor/hcloud/actions/domain.py diff --git a/plugins/module_utils/vendor/hcloud/certificates/__init__.py b/plugins/module_utils/_vendor/hcloud/certificates/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/certificates/__init__.py rename to plugins/module_utils/_vendor/hcloud/certificates/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/certificates/client.py b/plugins/module_utils/_vendor/hcloud/certificates/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/certificates/client.py rename to plugins/module_utils/_vendor/hcloud/certificates/client.py diff --git a/plugins/module_utils/vendor/hcloud/certificates/domain.py b/plugins/module_utils/_vendor/hcloud/certificates/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/certificates/domain.py rename to plugins/module_utils/_vendor/hcloud/certificates/domain.py diff --git a/plugins/module_utils/vendor/hcloud/core/__init__.py b/plugins/module_utils/_vendor/hcloud/core/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/core/__init__.py rename to plugins/module_utils/_vendor/hcloud/core/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/core/client.py b/plugins/module_utils/_vendor/hcloud/core/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/core/client.py rename to plugins/module_utils/_vendor/hcloud/core/client.py diff --git a/plugins/module_utils/vendor/hcloud/core/domain.py b/plugins/module_utils/_vendor/hcloud/core/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/core/domain.py rename to plugins/module_utils/_vendor/hcloud/core/domain.py diff --git a/plugins/module_utils/vendor/hcloud/datacenters/__init__.py b/plugins/module_utils/_vendor/hcloud/datacenters/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/datacenters/__init__.py rename to plugins/module_utils/_vendor/hcloud/datacenters/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/datacenters/client.py b/plugins/module_utils/_vendor/hcloud/datacenters/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/datacenters/client.py rename to plugins/module_utils/_vendor/hcloud/datacenters/client.py diff --git a/plugins/module_utils/vendor/hcloud/datacenters/domain.py b/plugins/module_utils/_vendor/hcloud/datacenters/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/datacenters/domain.py rename to plugins/module_utils/_vendor/hcloud/datacenters/domain.py diff --git a/plugins/module_utils/vendor/hcloud/deprecation/__init__.py b/plugins/module_utils/_vendor/hcloud/deprecation/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/deprecation/__init__.py rename to plugins/module_utils/_vendor/hcloud/deprecation/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/deprecation/domain.py b/plugins/module_utils/_vendor/hcloud/deprecation/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/deprecation/domain.py rename to plugins/module_utils/_vendor/hcloud/deprecation/domain.py diff --git a/plugins/module_utils/vendor/hcloud/exp/__init__.py b/plugins/module_utils/_vendor/hcloud/exp/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/exp/__init__.py rename to plugins/module_utils/_vendor/hcloud/exp/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/exp/zone.py b/plugins/module_utils/_vendor/hcloud/exp/zone.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/exp/zone.py rename to plugins/module_utils/_vendor/hcloud/exp/zone.py diff --git a/plugins/module_utils/vendor/hcloud/firewalls/__init__.py b/plugins/module_utils/_vendor/hcloud/firewalls/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/firewalls/__init__.py rename to plugins/module_utils/_vendor/hcloud/firewalls/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/firewalls/client.py b/plugins/module_utils/_vendor/hcloud/firewalls/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/firewalls/client.py rename to plugins/module_utils/_vendor/hcloud/firewalls/client.py diff --git a/plugins/module_utils/vendor/hcloud/firewalls/domain.py b/plugins/module_utils/_vendor/hcloud/firewalls/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/firewalls/domain.py rename to plugins/module_utils/_vendor/hcloud/firewalls/domain.py diff --git a/plugins/module_utils/vendor/hcloud/floating_ips/__init__.py b/plugins/module_utils/_vendor/hcloud/floating_ips/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/floating_ips/__init__.py rename to plugins/module_utils/_vendor/hcloud/floating_ips/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/floating_ips/client.py b/plugins/module_utils/_vendor/hcloud/floating_ips/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/floating_ips/client.py rename to plugins/module_utils/_vendor/hcloud/floating_ips/client.py diff --git a/plugins/module_utils/vendor/hcloud/floating_ips/domain.py b/plugins/module_utils/_vendor/hcloud/floating_ips/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/floating_ips/domain.py rename to plugins/module_utils/_vendor/hcloud/floating_ips/domain.py diff --git a/plugins/module_utils/vendor/hcloud/helpers/__init__.py b/plugins/module_utils/_vendor/hcloud/helpers/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/helpers/__init__.py rename to plugins/module_utils/_vendor/hcloud/helpers/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/helpers/labels.py b/plugins/module_utils/_vendor/hcloud/helpers/labels.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/helpers/labels.py rename to plugins/module_utils/_vendor/hcloud/helpers/labels.py diff --git a/plugins/module_utils/vendor/hcloud/images/__init__.py b/plugins/module_utils/_vendor/hcloud/images/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/images/__init__.py rename to plugins/module_utils/_vendor/hcloud/images/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/images/client.py b/plugins/module_utils/_vendor/hcloud/images/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/images/client.py rename to plugins/module_utils/_vendor/hcloud/images/client.py diff --git a/plugins/module_utils/vendor/hcloud/images/domain.py b/plugins/module_utils/_vendor/hcloud/images/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/images/domain.py rename to plugins/module_utils/_vendor/hcloud/images/domain.py diff --git a/plugins/module_utils/vendor/hcloud/isos/__init__.py b/plugins/module_utils/_vendor/hcloud/isos/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/isos/__init__.py rename to plugins/module_utils/_vendor/hcloud/isos/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/isos/client.py b/plugins/module_utils/_vendor/hcloud/isos/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/isos/client.py rename to plugins/module_utils/_vendor/hcloud/isos/client.py diff --git a/plugins/module_utils/vendor/hcloud/isos/domain.py b/plugins/module_utils/_vendor/hcloud/isos/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/isos/domain.py rename to plugins/module_utils/_vendor/hcloud/isos/domain.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancer_types/__init__.py b/plugins/module_utils/_vendor/hcloud/load_balancer_types/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancer_types/__init__.py rename to plugins/module_utils/_vendor/hcloud/load_balancer_types/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancer_types/client.py b/plugins/module_utils/_vendor/hcloud/load_balancer_types/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancer_types/client.py rename to plugins/module_utils/_vendor/hcloud/load_balancer_types/client.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancer_types/domain.py b/plugins/module_utils/_vendor/hcloud/load_balancer_types/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancer_types/domain.py rename to plugins/module_utils/_vendor/hcloud/load_balancer_types/domain.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancers/__init__.py b/plugins/module_utils/_vendor/hcloud/load_balancers/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancers/__init__.py rename to plugins/module_utils/_vendor/hcloud/load_balancers/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancers/client.py b/plugins/module_utils/_vendor/hcloud/load_balancers/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancers/client.py rename to plugins/module_utils/_vendor/hcloud/load_balancers/client.py diff --git a/plugins/module_utils/vendor/hcloud/load_balancers/domain.py b/plugins/module_utils/_vendor/hcloud/load_balancers/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/load_balancers/domain.py rename to plugins/module_utils/_vendor/hcloud/load_balancers/domain.py diff --git a/plugins/module_utils/vendor/hcloud/locations/__init__.py b/plugins/module_utils/_vendor/hcloud/locations/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/locations/__init__.py rename to plugins/module_utils/_vendor/hcloud/locations/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/locations/client.py b/plugins/module_utils/_vendor/hcloud/locations/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/locations/client.py rename to plugins/module_utils/_vendor/hcloud/locations/client.py diff --git a/plugins/module_utils/vendor/hcloud/locations/domain.py b/plugins/module_utils/_vendor/hcloud/locations/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/locations/domain.py rename to plugins/module_utils/_vendor/hcloud/locations/domain.py diff --git a/plugins/module_utils/vendor/hcloud/metrics/__init__.py b/plugins/module_utils/_vendor/hcloud/metrics/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/metrics/__init__.py rename to plugins/module_utils/_vendor/hcloud/metrics/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/metrics/domain.py b/plugins/module_utils/_vendor/hcloud/metrics/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/metrics/domain.py rename to plugins/module_utils/_vendor/hcloud/metrics/domain.py diff --git a/plugins/module_utils/vendor/hcloud/networks/__init__.py b/plugins/module_utils/_vendor/hcloud/networks/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/networks/__init__.py rename to plugins/module_utils/_vendor/hcloud/networks/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/networks/client.py b/plugins/module_utils/_vendor/hcloud/networks/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/networks/client.py rename to plugins/module_utils/_vendor/hcloud/networks/client.py diff --git a/plugins/module_utils/vendor/hcloud/networks/domain.py b/plugins/module_utils/_vendor/hcloud/networks/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/networks/domain.py rename to plugins/module_utils/_vendor/hcloud/networks/domain.py diff --git a/plugins/module_utils/vendor/hcloud/placement_groups/__init__.py b/plugins/module_utils/_vendor/hcloud/placement_groups/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/placement_groups/__init__.py rename to plugins/module_utils/_vendor/hcloud/placement_groups/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/placement_groups/client.py b/plugins/module_utils/_vendor/hcloud/placement_groups/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/placement_groups/client.py rename to plugins/module_utils/_vendor/hcloud/placement_groups/client.py diff --git a/plugins/module_utils/vendor/hcloud/placement_groups/domain.py b/plugins/module_utils/_vendor/hcloud/placement_groups/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/placement_groups/domain.py rename to plugins/module_utils/_vendor/hcloud/placement_groups/domain.py diff --git a/plugins/module_utils/vendor/hcloud/primary_ips/__init__.py b/plugins/module_utils/_vendor/hcloud/primary_ips/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/primary_ips/__init__.py rename to plugins/module_utils/_vendor/hcloud/primary_ips/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/primary_ips/client.py b/plugins/module_utils/_vendor/hcloud/primary_ips/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/primary_ips/client.py rename to plugins/module_utils/_vendor/hcloud/primary_ips/client.py diff --git a/plugins/module_utils/vendor/hcloud/primary_ips/domain.py b/plugins/module_utils/_vendor/hcloud/primary_ips/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/primary_ips/domain.py rename to plugins/module_utils/_vendor/hcloud/primary_ips/domain.py diff --git a/plugins/module_utils/vendor/hcloud/py.typed b/plugins/module_utils/_vendor/hcloud/py.typed similarity index 100% rename from plugins/module_utils/vendor/hcloud/py.typed rename to plugins/module_utils/_vendor/hcloud/py.typed diff --git a/plugins/module_utils/vendor/hcloud/rdns/__init__.py b/plugins/module_utils/_vendor/hcloud/rdns/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/rdns/__init__.py rename to plugins/module_utils/_vendor/hcloud/rdns/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/rdns/domain.py b/plugins/module_utils/_vendor/hcloud/rdns/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/rdns/domain.py rename to plugins/module_utils/_vendor/hcloud/rdns/domain.py diff --git a/plugins/module_utils/vendor/hcloud/server_types/__init__.py b/plugins/module_utils/_vendor/hcloud/server_types/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/server_types/__init__.py rename to plugins/module_utils/_vendor/hcloud/server_types/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/server_types/client.py b/plugins/module_utils/_vendor/hcloud/server_types/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/server_types/client.py rename to plugins/module_utils/_vendor/hcloud/server_types/client.py diff --git a/plugins/module_utils/vendor/hcloud/server_types/domain.py b/plugins/module_utils/_vendor/hcloud/server_types/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/server_types/domain.py rename to plugins/module_utils/_vendor/hcloud/server_types/domain.py diff --git a/plugins/module_utils/vendor/hcloud/servers/__init__.py b/plugins/module_utils/_vendor/hcloud/servers/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/servers/__init__.py rename to plugins/module_utils/_vendor/hcloud/servers/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/servers/client.py b/plugins/module_utils/_vendor/hcloud/servers/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/servers/client.py rename to plugins/module_utils/_vendor/hcloud/servers/client.py diff --git a/plugins/module_utils/vendor/hcloud/servers/domain.py b/plugins/module_utils/_vendor/hcloud/servers/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/servers/domain.py rename to plugins/module_utils/_vendor/hcloud/servers/domain.py diff --git a/plugins/module_utils/vendor/hcloud/ssh_keys/__init__.py b/plugins/module_utils/_vendor/hcloud/ssh_keys/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/ssh_keys/__init__.py rename to plugins/module_utils/_vendor/hcloud/ssh_keys/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/ssh_keys/client.py b/plugins/module_utils/_vendor/hcloud/ssh_keys/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/ssh_keys/client.py rename to plugins/module_utils/_vendor/hcloud/ssh_keys/client.py diff --git a/plugins/module_utils/vendor/hcloud/ssh_keys/domain.py b/plugins/module_utils/_vendor/hcloud/ssh_keys/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/ssh_keys/domain.py rename to plugins/module_utils/_vendor/hcloud/ssh_keys/domain.py diff --git a/plugins/module_utils/vendor/hcloud/storage_box_types/__init__.py b/plugins/module_utils/_vendor/hcloud/storage_box_types/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_box_types/__init__.py rename to plugins/module_utils/_vendor/hcloud/storage_box_types/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/storage_box_types/client.py b/plugins/module_utils/_vendor/hcloud/storage_box_types/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_box_types/client.py rename to plugins/module_utils/_vendor/hcloud/storage_box_types/client.py diff --git a/plugins/module_utils/vendor/hcloud/storage_box_types/domain.py b/plugins/module_utils/_vendor/hcloud/storage_box_types/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_box_types/domain.py rename to plugins/module_utils/_vendor/hcloud/storage_box_types/domain.py diff --git a/plugins/module_utils/vendor/hcloud/storage_boxes/__init__.py b/plugins/module_utils/_vendor/hcloud/storage_boxes/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_boxes/__init__.py rename to plugins/module_utils/_vendor/hcloud/storage_boxes/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/storage_boxes/client.py b/plugins/module_utils/_vendor/hcloud/storage_boxes/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_boxes/client.py rename to plugins/module_utils/_vendor/hcloud/storage_boxes/client.py diff --git a/plugins/module_utils/vendor/hcloud/storage_boxes/domain.py b/plugins/module_utils/_vendor/hcloud/storage_boxes/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/storage_boxes/domain.py rename to plugins/module_utils/_vendor/hcloud/storage_boxes/domain.py diff --git a/plugins/module_utils/vendor/hcloud/volumes/__init__.py b/plugins/module_utils/_vendor/hcloud/volumes/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/volumes/__init__.py rename to plugins/module_utils/_vendor/hcloud/volumes/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/volumes/client.py b/plugins/module_utils/_vendor/hcloud/volumes/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/volumes/client.py rename to plugins/module_utils/_vendor/hcloud/volumes/client.py diff --git a/plugins/module_utils/vendor/hcloud/volumes/domain.py b/plugins/module_utils/_vendor/hcloud/volumes/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/volumes/domain.py rename to plugins/module_utils/_vendor/hcloud/volumes/domain.py diff --git a/plugins/module_utils/vendor/hcloud/zones/__init__.py b/plugins/module_utils/_vendor/hcloud/zones/__init__.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/zones/__init__.py rename to plugins/module_utils/_vendor/hcloud/zones/__init__.py diff --git a/plugins/module_utils/vendor/hcloud/zones/client.py b/plugins/module_utils/_vendor/hcloud/zones/client.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/zones/client.py rename to plugins/module_utils/_vendor/hcloud/zones/client.py diff --git a/plugins/module_utils/vendor/hcloud/zones/domain.py b/plugins/module_utils/_vendor/hcloud/zones/domain.py similarity index 100% rename from plugins/module_utils/vendor/hcloud/zones/domain.py rename to plugins/module_utils/_vendor/hcloud/zones/domain.py diff --git a/plugins/module_utils/version.py b/plugins/module_utils/_version.py similarity index 100% rename from plugins/module_utils/version.py rename to plugins/module_utils/_version.py diff --git a/plugins/modules/certificate.py b/plugins/modules/certificate.py index 1d9b5a5..0adb2ed 100644 --- a/plugins/modules/certificate.py +++ b/plugins/modules/certificate.py @@ -147,9 +147,9 @@ hcloud_certificate: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.certificates import BoundCertificate +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.certificates import BoundCertificate class AnsibleHCloudCertificate(AnsibleHCloud): diff --git a/plugins/modules/certificate_info.py b/plugins/modules/certificate_info.py index b6927ed..3ed8e44 100644 --- a/plugins/modules/certificate_info.py +++ b/plugins/modules/certificate_info.py @@ -88,9 +88,9 @@ hcloud_certificate_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.certificates import BoundCertificate +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.certificates import BoundCertificate class AnsibleHCloudCertificateInfo(AnsibleHCloud): diff --git a/plugins/modules/datacenter_info.py b/plugins/modules/datacenter_info.py index f0a17f3..c795312 100644 --- a/plugins/modules/datacenter_info.py +++ b/plugins/modules/datacenter_info.py @@ -119,9 +119,9 @@ hcloud_datacenter_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.datacenters import BoundDatacenter +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.datacenters import BoundDatacenter class AnsibleHCloudDatacenterInfo(AnsibleHCloud): diff --git a/plugins/modules/firewall.py b/plugins/modules/firewall.py index bf11c28..b2c68cb 100644 --- a/plugins/modules/firewall.py +++ b/plugins/modules/firewall.py @@ -220,10 +220,10 @@ import time from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.ipaddress import normalize_ip -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.firewalls import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._ipaddress import normalize_ip +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.firewalls import ( BoundFirewall, FirewallResource, FirewallRule, diff --git a/plugins/modules/firewall_info.py b/plugins/modules/firewall_info.py index ed4e448..5175e62 100644 --- a/plugins/modules/firewall_info.py +++ b/plugins/modules/firewall_info.py @@ -143,9 +143,9 @@ hcloud_firewall_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.firewalls import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.firewalls import ( BoundFirewall, FirewallResource, FirewallRule, diff --git a/plugins/modules/firewall_resource.py b/plugins/modules/firewall_resource.py index beb66a3..f9567a7 100644 --- a/plugins/modules/firewall_resource.py +++ b/plugins/modules/firewall_resource.py @@ -104,14 +104,14 @@ hcloud_firewall_resource: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.firewalls import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.firewalls import ( BoundFirewall, FirewallResource, FirewallResourceLabelSelector, ) -from ..module_utils.vendor.hcloud.servers import BoundServer +from ..module_utils._vendor.hcloud.servers import BoundServer class AnsibleHCloudFirewallResource(AnsibleHCloud): diff --git a/plugins/modules/floating_ip.py b/plugins/modules/floating_ip.py index 4fbbdd2..3ceab2c 100644 --- a/plugins/modules/floating_ip.py +++ b/plugins/modules/floating_ip.py @@ -160,10 +160,10 @@ hcloud_floating_ip: mylabel: 123 """ -from ..module_utils import floating_ip -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.floating_ips import BoundFloatingIP +from ..module_utils import _floating_ip +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.floating_ips import BoundFloatingIP class AnsibleFloatingIP(AnsibleHCloud): @@ -174,7 +174,7 @@ class AnsibleFloatingIP(AnsibleHCloud): def _prepare_result(self): if self.floating_ip is None: return {} - return floating_ip.prepare_result(self.floating_ip) + return _floating_ip.prepare_result(self.floating_ip) def _get(self): if (value := self.module.params.get("id")) is not None: diff --git a/plugins/modules/floating_ip_info.py b/plugins/modules/floating_ip_info.py index d4ed03d..752f794 100644 --- a/plugins/modules/floating_ip_info.py +++ b/plugins/modules/floating_ip_info.py @@ -101,9 +101,9 @@ hcloud_floating_ip_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.floating_ips import BoundFloatingIP +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.floating_ips import BoundFloatingIP class AnsibleHCloudFloatingIPInfo(AnsibleHCloud): diff --git a/plugins/modules/image_info.py b/plugins/modules/image_info.py index 6384c72..a0e541c 100644 --- a/plugins/modules/image_info.py +++ b/plugins/modules/image_info.py @@ -113,9 +113,9 @@ hcloud_image_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.images import BoundImage +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.images import BoundImage class AnsibleHCloudImageInfo(AnsibleHCloud): diff --git a/plugins/modules/iso_info.py b/plugins/modules/iso_info.py index 66b3861..18a884d 100644 --- a/plugins/modules/iso_info.py +++ b/plugins/modules/iso_info.py @@ -123,9 +123,9 @@ hcloud_iso_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.isos import BoundIso +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.isos import BoundIso class AnsibleHCloudIsoInfo(AnsibleHCloud): diff --git a/plugins/modules/load_balancer.py b/plugins/modules/load_balancer.py index 2a5a958..45b7812 100644 --- a/plugins/modules/load_balancer.py +++ b/plugins/modules/load_balancer.py @@ -149,9 +149,9 @@ hcloud_load_balancer: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.load_balancers import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.load_balancers import ( BoundLoadBalancer, LoadBalancerAlgorithm, ) diff --git a/plugins/modules/load_balancer_info.py b/plugins/modules/load_balancer_info.py index 9d240e8..fd1c57b 100644 --- a/plugins/modules/load_balancer_info.py +++ b/plugins/modules/load_balancer_info.py @@ -273,9 +273,9 @@ hcloud_load_balancer_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.load_balancers import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.load_balancers import ( BoundLoadBalancer, LoadBalancerService, LoadBalancerTarget, diff --git a/plugins/modules/load_balancer_network.py b/plugins/modules/load_balancer_network.py index a9d4f44..fed12af 100644 --- a/plugins/modules/load_balancer_network.py +++ b/plugins/modules/load_balancer_network.py @@ -105,10 +105,10 @@ from time import sleep from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.load_balancers import BoundLoadBalancer, PrivateNet -from ..module_utils.vendor.hcloud.networks import BoundNetwork +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.load_balancers import BoundLoadBalancer, PrivateNet +from ..module_utils._vendor.hcloud.networks import BoundNetwork class AnsibleHCloudLoadBalancerNetwork(AnsibleHCloud): diff --git a/plugins/modules/load_balancer_service.py b/plugins/modules/load_balancer_service.py index f055d2c..2c1f7ab 100644 --- a/plugins/modules/load_balancer_service.py +++ b/plugins/modules/load_balancer_service.py @@ -280,10 +280,10 @@ hcloud_load_balancer_service: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.certificates import BoundCertificate -from ..module_utils.vendor.hcloud.load_balancers import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.certificates import BoundCertificate +from ..module_utils._vendor.hcloud.load_balancers import ( BoundLoadBalancer, LoadBalancerHealtCheckHttp, LoadBalancerHealthCheck, diff --git a/plugins/modules/load_balancer_target.py b/plugins/modules/load_balancer_target.py index 7c3a287..a7aa668 100644 --- a/plugins/modules/load_balancer_target.py +++ b/plugins/modules/load_balancer_target.py @@ -135,15 +135,15 @@ hcloud_load_balancer_target: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.load_balancers import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.load_balancers import ( BoundLoadBalancer, LoadBalancerTarget, LoadBalancerTargetIP, LoadBalancerTargetLabelSelector, ) -from ..module_utils.vendor.hcloud.servers import BoundServer +from ..module_utils._vendor.hcloud.servers import BoundServer class AnsibleHCloudLoadBalancerTarget(AnsibleHCloud): diff --git a/plugins/modules/load_balancer_type_info.py b/plugins/modules/load_balancer_type_info.py index a7b3d55..c893052 100644 --- a/plugins/modules/load_balancer_type_info.py +++ b/plugins/modules/load_balancer_type_info.py @@ -89,9 +89,9 @@ hcloud_load_balancer_type_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.load_balancer_types import BoundLoadBalancerType +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.load_balancer_types import BoundLoadBalancerType class AnsibleHCloudLoadBalancerTypeInfo(AnsibleHCloud): diff --git a/plugins/modules/location_info.py b/plugins/modules/location_info.py index a29bec7..96570ba 100644 --- a/plugins/modules/location_info.py +++ b/plugins/modules/location_info.py @@ -79,9 +79,9 @@ hcloud_location_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.locations import BoundLocation +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.locations import BoundLocation class AnsibleHCloudLocationInfo(AnsibleHCloud): diff --git a/plugins/modules/network.py b/plugins/modules/network.py index b4f9114..c796fb5 100644 --- a/plugins/modules/network.py +++ b/plugins/modules/network.py @@ -116,9 +116,9 @@ hcloud_network: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.networks import BoundNetwork +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.networks import BoundNetwork class AnsibleHCloudNetwork(AnsibleHCloud): diff --git a/plugins/modules/network_info.py b/plugins/modules/network_info.py index 2f0289e..2ebdc61 100644 --- a/plugins/modules/network_info.py +++ b/plugins/modules/network_info.py @@ -191,9 +191,9 @@ hcloud_network_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.networks import BoundNetwork +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.networks import BoundNetwork class AnsibleHCloudNetworkInfo(AnsibleHCloud): diff --git a/plugins/modules/placement_group.py b/plugins/modules/placement_group.py index 1137e34..f4ba853 100644 --- a/plugins/modules/placement_group.py +++ b/plugins/modules/placement_group.py @@ -108,9 +108,9 @@ hcloud_placement_group: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.placement_groups import BoundPlacementGroup +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.placement_groups import BoundPlacementGroup class AnsibleHCloudPlacementGroup(AnsibleHCloud): diff --git a/plugins/modules/primary_ip.py b/plugins/modules/primary_ip.py index 9ad81f6..833b83d 100644 --- a/plugins/modules/primary_ip.py +++ b/plugins/modules/primary_ip.py @@ -188,13 +188,13 @@ hcloud_primary_ip: from typing import TYPE_CHECKING -from ..module_utils import primary_ip -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.primary_ips import BoundPrimaryIP +from ..module_utils import _primary_ip +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.primary_ips import BoundPrimaryIP if TYPE_CHECKING: - from ..module_utils.vendor.hcloud.servers import BoundServer + from ..module_utils._vendor.hcloud.servers import BoundServer class AnsiblePrimaryIP(AnsibleHCloud): @@ -205,7 +205,7 @@ class AnsiblePrimaryIP(AnsibleHCloud): def _prepare_result(self): if self.primary_ip is None: return {} - return primary_ip.prepare_result(self.primary_ip) + return _primary_ip.prepare_result(self.primary_ip) def _get(self): if (value := self.module.params.get("id")) is not None: diff --git a/plugins/modules/primary_ip_info.py b/plugins/modules/primary_ip_info.py index b2ecb8f..4f35bc7 100644 --- a/plugins/modules/primary_ip_info.py +++ b/plugins/modules/primary_ip_info.py @@ -136,9 +136,9 @@ hcloud_primary_ip_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.primary_ips import BoundPrimaryIP +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.primary_ips import BoundPrimaryIP class AnsibleHCloudPrimaryIPInfo(AnsibleHCloud): diff --git a/plugins/modules/rdns.py b/plugins/modules/rdns.py index b224b8b..5fa63d7 100644 --- a/plugins/modules/rdns.py +++ b/plugins/modules/rdns.py @@ -137,12 +137,12 @@ from typing import Any from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.floating_ips import BoundFloatingIP -from ..module_utils.vendor.hcloud.load_balancers import BoundLoadBalancer -from ..module_utils.vendor.hcloud.primary_ips import BoundPrimaryIP -from ..module_utils.vendor.hcloud.servers import BoundServer +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.floating_ips import BoundFloatingIP +from ..module_utils._vendor.hcloud.load_balancers import BoundLoadBalancer +from ..module_utils._vendor.hcloud.primary_ips import BoundPrimaryIP +from ..module_utils._vendor.hcloud.servers import BoundServer class AnsibleHCloudReverseDNS(AnsibleHCloud): diff --git a/plugins/modules/route.py b/plugins/modules/route.py index 0929f07..39497f9 100644 --- a/plugins/modules/route.py +++ b/plugins/modules/route.py @@ -87,9 +87,9 @@ hcloud_route: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.networks import BoundNetwork, NetworkRoute +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.networks import BoundNetwork, NetworkRoute class AnsibleHCloudRoute(AnsibleHCloud): diff --git a/plugins/modules/server.py b/plugins/modules/server.py index c3ef644..4ff1853 100644 --- a/plugins/modules/server.py +++ b/plugins/modules/server.py @@ -353,23 +353,23 @@ from typing import TYPE_CHECKING, Literal from ansible.module_utils.basic import AnsibleModule -from ..module_utils.deprecation import deprecated_server_type_warning -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.firewalls import FirewallResource -from ..module_utils.vendor.hcloud.servers import ( +from ..module_utils._base import AnsibleHCloud +from ..module_utils._deprecation import deprecated_server_type_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.firewalls import FirewallResource +from ..module_utils._vendor.hcloud.servers import ( BoundServer, Server, ServerCreatePublicNetwork, ) if TYPE_CHECKING: - from ..module_utils.vendor.hcloud.actions import BoundAction - from ..module_utils.vendor.hcloud.firewalls import BoundFirewall - from ..module_utils.vendor.hcloud.networks import BoundNetwork - from ..module_utils.vendor.hcloud.placement_groups import BoundPlacementGroup - from ..module_utils.vendor.hcloud.primary_ips import PrimaryIP - from ..module_utils.vendor.hcloud.server_types import ServerType + from ..module_utils._vendor.hcloud.actions import BoundAction + from ..module_utils._vendor.hcloud.firewalls import BoundFirewall + from ..module_utils._vendor.hcloud.networks import BoundNetwork + from ..module_utils._vendor.hcloud.placement_groups import BoundPlacementGroup + from ..module_utils._vendor.hcloud.primary_ips import PrimaryIP + from ..module_utils._vendor.hcloud.server_types import ServerType class AnsibleHCloudServer(AnsibleHCloud): diff --git a/plugins/modules/server_info.py b/plugins/modules/server_info.py index 8e97d6e..4c253d4 100644 --- a/plugins/modules/server_info.py +++ b/plugins/modules/server_info.py @@ -152,9 +152,9 @@ hcloud_server_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.servers import BoundServer +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.servers import BoundServer class AnsibleHCloudServerInfo(AnsibleHCloud): diff --git a/plugins/modules/server_network.py b/plugins/modules/server_network.py index aa33dbd..f87cabf 100644 --- a/plugins/modules/server_network.py +++ b/plugins/modules/server_network.py @@ -125,10 +125,10 @@ from ipaddress import ip_address, ip_network from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.networks import BoundNetwork -from ..module_utils.vendor.hcloud.servers import BoundServer, PrivateNet +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.networks import BoundNetwork +from ..module_utils._vendor.hcloud.servers import BoundServer, PrivateNet class AnsibleHCloudServerNetwork(AnsibleHCloud): diff --git a/plugins/modules/server_type_info.py b/plugins/modules/server_type_info.py index 0a5835f..0b04054 100644 --- a/plugins/modules/server_type_info.py +++ b/plugins/modules/server_type_info.py @@ -167,9 +167,9 @@ hcloud_server_type_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.server_types import BoundServerType +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.server_types import BoundServerType class AnsibleHCloudServerTypeInfo(AnsibleHCloud): diff --git a/plugins/modules/ssh_key.py b/plugins/modules/ssh_key.py index b860b21..618eb88 100644 --- a/plugins/modules/ssh_key.py +++ b/plugins/modules/ssh_key.py @@ -119,10 +119,10 @@ hcloud_ssh_key: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.ssh import ssh_public_key_md5_fingerprint -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.ssh_keys import BoundSSHKey +from ..module_utils._base import AnsibleHCloud +from ..module_utils._ssh import ssh_public_key_md5_fingerprint +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.ssh_keys import BoundSSHKey class AnsibleHCloudSSHKey(AnsibleHCloud): diff --git a/plugins/modules/ssh_key_info.py b/plugins/modules/ssh_key_info.py index 8e3d666..2ec9768 100644 --- a/plugins/modules/ssh_key_info.py +++ b/plugins/modules/ssh_key_info.py @@ -80,9 +80,9 @@ hcloud_ssh_key_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.ssh_keys import BoundSSHKey +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.ssh_keys import BoundSSHKey class AnsibleHCloudSSHKeyInfo(AnsibleHCloud): diff --git a/plugins/modules/storage_box.py b/plugins/modules/storage_box.py index cf8f84d..24e1822 100644 --- a/plugins/modules/storage_box.py +++ b/plugins/modules/storage_box.py @@ -343,14 +343,14 @@ hcloud_storage_box: sample: 10485760 """ -from ..module_utils import storage_box -from ..module_utils.client import client_resource_not_found -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.locations import Location -from ..module_utils.vendor.hcloud.storage_box_types import StorageBoxType -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._client import client_resource_not_found +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.locations import Location +from ..module_utils._vendor.hcloud.storage_box_types import StorageBoxType +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, StorageBoxAccessSettings, StorageBoxSnapshot, @@ -369,7 +369,7 @@ class AnsibleStorageBox(AnsibleHCloud): def _prepare_result(self): if self.storage_box is not None: - return storage_box.prepare_result(self.storage_box) + return _storage_box.prepare_result(self.storage_box) return {} def _fetch(self): diff --git a/plugins/modules/storage_box_info.py b/plugins/modules/storage_box_info.py index ac8dd4a..e2dd824 100644 --- a/plugins/modules/storage_box_info.py +++ b/plugins/modules/storage_box_info.py @@ -185,11 +185,11 @@ hcloud_storage_box_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils import storage_box -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box +from ..module_utils._base import AnsibleHCloud +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, ) @@ -207,7 +207,7 @@ class AnsibleStorageBox(AnsibleHCloud): result = [] for o in self.storage_box or []: if o is not None: - result.append(storage_box.prepare_result(o)) + result.append(_storage_box.prepare_result(o)) return result diff --git a/plugins/modules/storage_box_snapshot.py b/plugins/modules/storage_box_snapshot.py index c470fbc..451849f 100644 --- a/plugins/modules/storage_box_snapshot.py +++ b/plugins/modules/storage_box_snapshot.py @@ -140,11 +140,11 @@ hcloud_storage_box_snapshot: sample: "2025-12-03T13:47:47Z" """ -from ..module_utils import storage_box, storage_box_snapshot -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box, _storage_box_snapshot +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, BoundStorageBoxSnapshot, ) @@ -163,10 +163,10 @@ class AnsibleStorageBoxSnapshot(AnsibleHCloud): def _prepare_result(self): if self.storage_box_snapshot is None: return {} - return storage_box_snapshot.prepare_result(self.storage_box_snapshot) + return _storage_box_snapshot.prepare_result(self.storage_box_snapshot) def _fetch(self): - self.storage_box = storage_box.get(self.client.storage_boxes, self.module.params.get("storage_box")) + self.storage_box = _storage_box.get(self.client.storage_boxes, self.module.params.get("storage_box")) if (value := self.module.params.get("id")) is not None: self.storage_box_snapshot = self.storage_box.get_snapshot_by_id(value) diff --git a/plugins/modules/storage_box_snapshot_info.py b/plugins/modules/storage_box_snapshot_info.py index f12cd29..83dc61b 100644 --- a/plugins/modules/storage_box_snapshot_info.py +++ b/plugins/modules/storage_box_snapshot_info.py @@ -134,11 +134,11 @@ hcloud_storage_box_snapshot_info: sample: "2025-12-03T13:47:47Z" """ -from ..module_utils import storage_box, storage_box_snapshot -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box, _storage_box_snapshot +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, BoundStorageBoxSnapshot, ) @@ -159,12 +159,12 @@ class AnsibleStorageBoxSnapshotInfo(AnsibleHCloud): for o in self.storage_box_snapshots or []: if o is not None: - result.append(storage_box_snapshot.prepare_result(o)) + result.append(_storage_box_snapshot.prepare_result(o)) return result def fetch(self): try: - self.storage_box = storage_box.get( + self.storage_box = _storage_box.get( self.client.storage_boxes, self.module.params.get("storage_box"), ) diff --git a/plugins/modules/storage_box_subaccount.py b/plugins/modules/storage_box_subaccount.py index 930bd1d..06476a5 100644 --- a/plugins/modules/storage_box_subaccount.py +++ b/plugins/modules/storage_box_subaccount.py @@ -227,13 +227,13 @@ hcloud_storage_box_subaccount: import string -from ..module_utils import storage_box, storage_box_subaccount -from ..module_utils.client import client_resource_not_found -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud, AnsibleModule -from ..module_utils.storage_box_subaccount import NAME_LABEL_KEY -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box, _storage_box_subaccount +from ..module_utils._base import AnsibleHCloud, AnsibleModule +from ..module_utils._client import client_resource_not_found +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._storage_box_subaccount import NAME_LABEL_KEY +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, BoundStorageBoxSubaccount, StorageBoxSubaccountAccessSettings, @@ -254,15 +254,15 @@ class AnsibleStorageBoxSubaccount(AnsibleHCloud): def _prepare_result(self): if self.storage_box_subaccount is None: return {} - return storage_box_subaccount.prepare_result(self.storage_box_subaccount, self.storage_box_subaccount_name) + return _storage_box_subaccount.prepare_result(self.storage_box_subaccount, self.storage_box_subaccount_name) def _fetch(self): - self.storage_box = storage_box.get(self.client.storage_boxes, self.module.params.get("storage_box")) + self.storage_box = _storage_box.get(self.client.storage_boxes, self.module.params.get("storage_box")) if (value := self.module.params.get("id")) is not None: self.storage_box_subaccount = self.storage_box.get_subaccount_by_id(value) elif (value := self.module.params.get("name")) is not None: - self.storage_box_subaccount = storage_box_subaccount.get_by_name(self.storage_box, value) + self.storage_box_subaccount = _storage_box_subaccount.get_by_name(self.storage_box, value) # Workaround the missing name property # Get the name of the resource from the labels diff --git a/plugins/modules/storage_box_subaccount_info.py b/plugins/modules/storage_box_subaccount_info.py index b821946..4384ee0 100644 --- a/plugins/modules/storage_box_subaccount_info.py +++ b/plugins/modules/storage_box_subaccount_info.py @@ -158,12 +158,12 @@ hcloud_storage_box_subaccount_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils import storage_box, storage_box_subaccount -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.storage_box_subaccount import NAME_LABEL_KEY -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_boxes import ( +from ..module_utils import _storage_box, _storage_box_subaccount +from ..module_utils._base import AnsibleHCloud +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._storage_box_subaccount import NAME_LABEL_KEY +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_boxes import ( BoundStorageBox, BoundStorageBoxSubaccount, ) @@ -188,12 +188,12 @@ class AnsibleStorageBoxSubaccountInfo(AnsibleHCloud): # Get the name of the resource from the labels name = o.labels.pop(NAME_LABEL_KEY) - result.append(storage_box_subaccount.prepare_result(o, name)) + result.append(_storage_box_subaccount.prepare_result(o, name)) return result def fetch(self): try: - self.storage_box = storage_box.get( + self.storage_box = _storage_box.get( self.client.storage_boxes, self.module.params.get("storage_box"), ) @@ -201,7 +201,7 @@ class AnsibleStorageBoxSubaccountInfo(AnsibleHCloud): if (value := self.module.params.get("id")) is not None: self.storage_box_subaccounts = [self.storage_box.get_subaccount_by_id(value)] elif (value := self.module.params.get("name")) is not None: - self.storage_box_subaccounts = [storage_box_subaccount.get_by_name(self.storage_box, value)] + self.storage_box_subaccounts = [_storage_box_subaccount.get_by_name(self.storage_box, value)] else: params = {} if (value := self.module.params.get("label_selector")) is not None: diff --git a/plugins/modules/storage_box_type_info.py b/plugins/modules/storage_box_type_info.py index 1a1e78c..be53c5f 100644 --- a/plugins/modules/storage_box_type_info.py +++ b/plugins/modules/storage_box_type_info.py @@ -110,10 +110,10 @@ hcloud_storage_box_type_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.experimental import storage_box_experimental_warning -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.storage_box_types import BoundStorageBoxType +from ..module_utils._base import AnsibleHCloud +from ..module_utils._experimental import storage_box_experimental_warning +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.storage_box_types import BoundStorageBoxType class AnsibleStorageBoxTypeInfo(AnsibleHCloud): diff --git a/plugins/modules/subnetwork.py b/plugins/modules/subnetwork.py index 4efc774..606f778 100644 --- a/plugins/modules/subnetwork.py +++ b/plugins/modules/subnetwork.py @@ -124,9 +124,9 @@ hcloud_subnetwork: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.networks import BoundNetwork, NetworkSubnet +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.networks import BoundNetwork, NetworkSubnet class AnsibleHCloudSubnetwork(AnsibleHCloud): diff --git a/plugins/modules/volume.py b/plugins/modules/volume.py index dc789a4..d8277f4 100644 --- a/plugins/modules/volume.py +++ b/plugins/modules/volume.py @@ -161,9 +161,9 @@ hcloud_volume: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.volumes import BoundVolume +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.volumes import BoundVolume class AnsibleHCloudVolume(AnsibleHCloud): diff --git a/plugins/modules/volume_attachment.py b/plugins/modules/volume_attachment.py index 14bd7c6..fc54e11 100644 --- a/plugins/modules/volume_attachment.py +++ b/plugins/modules/volume_attachment.py @@ -84,10 +84,10 @@ hcloud_volume_attachment: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.servers import BoundServer -from ..module_utils.vendor.hcloud.volumes import BoundVolume +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.servers import BoundServer +from ..module_utils._vendor.hcloud.volumes import BoundVolume class AnsibleHCloudVolumeAttachment(AnsibleHCloud): diff --git a/plugins/modules/volume_info.py b/plugins/modules/volume_info.py index 7f576c6..041fcc9 100644 --- a/plugins/modules/volume_info.py +++ b/plugins/modules/volume_info.py @@ -96,9 +96,9 @@ hcloud_volume_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import HCloudException -from ..module_utils.vendor.hcloud.volumes import BoundVolume +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import HCloudException +from ..module_utils._vendor.hcloud.volumes import BoundVolume class AnsibleHCloudVolumeInfo(AnsibleHCloud): diff --git a/plugins/modules/zone.py b/plugins/modules/zone.py index 8d1cc24..f642cc4 100644 --- a/plugins/modules/zone.py +++ b/plugins/modules/zone.py @@ -257,10 +257,10 @@ hcloud_zone: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.actions import BoundAction -from ..module_utils.vendor.hcloud.zones import BoundZone, ZonePrimaryNameserver +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.actions import BoundAction +from ..module_utils._vendor.hcloud.zones import BoundZone, ZonePrimaryNameserver class AnsibleHCloudZone(AnsibleHCloud): diff --git a/plugins/modules/zone_info.py b/plugins/modules/zone_info.py index 0ed7a7e..40e7daa 100644 --- a/plugins/modules/zone_info.py +++ b/plugins/modules/zone_info.py @@ -156,9 +156,9 @@ hcloud_zone_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.zones import BoundZone, ZonePrimaryNameserver +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.zones import BoundZone, ZonePrimaryNameserver class AnsibleHCloudZoneInfo(AnsibleHCloud): diff --git a/plugins/modules/zone_rrset.py b/plugins/modules/zone_rrset.py index ebe85a2..814b56f 100644 --- a/plugins/modules/zone_rrset.py +++ b/plugins/modules/zone_rrset.py @@ -172,10 +172,10 @@ from typing import Literal from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.actions import BoundAction -from ..module_utils.vendor.hcloud.zones import BoundZoneRRSet, Zone, ZoneRecord +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.actions import BoundAction +from ..module_utils._vendor.hcloud.zones import BoundZoneRRSet, Zone, ZoneRecord class AnsibleHCloudZoneRRSet(AnsibleHCloud): diff --git a/plugins/modules/zone_rrset_info.py b/plugins/modules/zone_rrset_info.py index 104626c..848dbdd 100644 --- a/plugins/modules/zone_rrset_info.py +++ b/plugins/modules/zone_rrset_info.py @@ -118,9 +118,9 @@ hcloud_zone_rrset_info: from ansible.module_utils.basic import AnsibleModule -from ..module_utils.hcloud import AnsibleHCloud -from ..module_utils.vendor.hcloud import APIException, HCloudException -from ..module_utils.vendor.hcloud.zones import BoundZoneRRSet, Zone, ZoneRecord +from ..module_utils._base import AnsibleHCloud +from ..module_utils._vendor.hcloud import APIException, HCloudException +from ..module_utils._vendor.hcloud.zones import BoundZoneRRSet, Zone, ZoneRecord class AnsibleHCloudZoneRRSetInfo(AnsibleHCloud): diff --git a/pyproject.toml b/pyproject.toml index 7c5ffa7..1e311ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ jobs = 0 max-line-length = 120 ignore-paths = [ - "plugins/module_utils/vendor", + "plugins/module_utils/_vendor", ] [tool.pylint.reports] diff --git a/scripts/vendor.py b/scripts/vendor.py index e67580d..374d83a 100755 --- a/scripts/vendor.py +++ b/scripts/vendor.py @@ -23,7 +23,7 @@ logger = logging.getLogger("vendor") HCLOUD_SOURCE_URL = "https://github.com/hetznercloud/hcloud-python" HCLOUD_VERSION = "v2.13.0" -HCLOUD_VENDOR_PATH = "plugins/module_utils/vendor/hcloud" +HCLOUD_VENDOR_PATH = "plugins/module_utils/_vendor/hcloud" def apply_code_modifications(source_path: Path): diff --git a/tests/utils/ci.sh b/tests/utils/ci.sh index e5d7391..4fa4c0e 100755 --- a/tests/utils/ci.sh +++ b/tests/utils/ci.sh @@ -100,7 +100,7 @@ case "$test_name" in sanity) # shellcheck disable=SC2086 ansible-test sanity --color -v \ - --exclude plugins/module_utils/vendor/ \ + --exclude plugins/module_utils/_vendor/ \ --exclude scripts/ \ --exclude tests/utils/ \ --docker default \