From 64b6804b419f56f9750ef463ab77e6fec99f9504 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 31 Jul 2023 10:12:55 +0200 Subject: [PATCH] refactor: use relative imports for local modules (#279) --- plugins/inventory/hcloud.py | 8 +++---- plugins/module_utils/hcloud.py | 3 ++- plugins/modules/hcloud_certificate.py | 7 +++---- plugins/modules/hcloud_certificate_info.py | 7 +++---- plugins/modules/hcloud_datacenter_info.py | 7 +++---- plugins/modules/hcloud_firewall.py | 12 ++++------- plugins/modules/hcloud_floating_ip.py | 7 +++---- plugins/modules/hcloud_floating_ip_info.py | 7 +++---- plugins/modules/hcloud_image_info.py | 7 +++---- plugins/modules/hcloud_iso_info.py | 3 ++- plugins/modules/hcloud_load_balancer.py | 7 +++---- plugins/modules/hcloud_load_balancer_info.py | 7 +++---- .../modules/hcloud_load_balancer_network.py | 7 +++---- .../modules/hcloud_load_balancer_service.py | 10 ++++----- .../modules/hcloud_load_balancer_target.py | 10 ++++----- .../modules/hcloud_load_balancer_type_info.py | 7 +++---- plugins/modules/hcloud_location_info.py | 7 +++---- plugins/modules/hcloud_network.py | 7 +++---- plugins/modules/hcloud_network_info.py | 7 +++---- plugins/modules/hcloud_placement_group.py | 7 +++---- plugins/modules/hcloud_primary_ip.py | 7 +++---- plugins/modules/hcloud_primary_ip_info.py | 7 +++---- plugins/modules/hcloud_rdns.py | 7 +++---- plugins/modules/hcloud_route.py | 11 ++++------ plugins/modules/hcloud_server.py | 21 +++++++------------ plugins/modules/hcloud_server_info.py | 7 +++---- plugins/modules/hcloud_server_network.py | 8 +++---- plugins/modules/hcloud_server_type_info.py | 7 +++---- plugins/modules/hcloud_ssh_key.py | 7 +++---- plugins/modules/hcloud_ssh_key_info.py | 7 +++---- plugins/modules/hcloud_subnetwork.py | 11 ++++------ plugins/modules/hcloud_volume.py | 7 +++---- plugins/modules/hcloud_volume_info.py | 7 +++---- 33 files changed, 106 insertions(+), 152 deletions(-) diff --git a/plugins/inventory/hcloud.py b/plugins/inventory/hcloud.py index e1d9083..1afc8f5 100644 --- a/plugins/inventory/hcloud.py +++ b/plugins/inventory/hcloud.py @@ -121,11 +121,9 @@ from ansible.errors import AnsibleError from ansible.module_utils.common.text.converters import to_native from ansible.plugins.inventory import BaseInventoryPlugin, Constructable from ansible.release import __version__ -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import ( - HAS_DATEUTIL, - HAS_REQUESTS, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor import hcloud + +from ..module_utils.hcloud import HAS_DATEUTIL, HAS_REQUESTS +from ..module_utils.vendor import hcloud class InventoryModule(BaseInventoryPlugin, Constructable): diff --git a/plugins/module_utils/hcloud.py b/plugins/module_utils/hcloud.py index 17419e2..42f031e 100644 --- a/plugins/module_utils/hcloud.py +++ b/plugins/module_utils/hcloud.py @@ -8,7 +8,8 @@ import traceback from ansible.module_utils.ansible_release import __version__ from ansible.module_utils.basic import env_fallback, missing_required_lib from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor import hcloud + +from ..module_utils.vendor import hcloud HAS_REQUESTS = True HAS_DATEUTIL = True diff --git a/plugins/modules/hcloud_certificate.py b/plugins/modules/hcloud_certificate.py index 6d907c4..9a949c1 100644 --- a/plugins/modules/hcloud_certificate.py +++ b/plugins/modules/hcloud_certificate.py @@ -136,10 +136,9 @@ hcloud_certificate: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudCertificate(Hcloud): diff --git a/plugins/modules/hcloud_certificate_info.py b/plugins/modules/hcloud_certificate_info.py index 3766ef2..280563e 100644 --- a/plugins/modules/hcloud_certificate_info.py +++ b/plugins/modules/hcloud_certificate_info.py @@ -84,10 +84,9 @@ hcloud_certificate_info: """ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudCertificateInfo(Hcloud): diff --git a/plugins/modules/hcloud_datacenter_info.py b/plugins/modules/hcloud_datacenter_info.py index 9001dd5..ea830ce 100644 --- a/plugins/modules/hcloud_datacenter_info.py +++ b/plugins/modules/hcloud_datacenter_info.py @@ -75,10 +75,9 @@ hcloud_datacenter_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudDatacenterInfo(Hcloud): diff --git a/plugins/modules/hcloud_firewall.py b/plugins/modules/hcloud_firewall.py index 6cc38d9..734d8ba 100644 --- a/plugins/modules/hcloud_firewall.py +++ b/plugins/modules/hcloud_firewall.py @@ -170,14 +170,10 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - APIException, - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.firewalls.domain import ( - FirewallRule, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import APIException, HCloudException +from ..module_utils.vendor.hcloud.firewalls.domain import FirewallRule class AnsibleHcloudFirewall(Hcloud): diff --git a/plugins/modules/hcloud_floating_ip.py b/plugins/modules/hcloud_floating_ip.py index a71a7ba..900e08c 100644 --- a/plugins/modules/hcloud_floating_ip.py +++ b/plugins/modules/hcloud_floating_ip.py @@ -163,10 +163,9 @@ hcloud_floating_ip: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudFloatingIP(Hcloud): diff --git a/plugins/modules/hcloud_floating_ip_info.py b/plugins/modules/hcloud_floating_ip_info.py index d976ce8..8d6e4e1 100644 --- a/plugins/modules/hcloud_floating_ip_info.py +++ b/plugins/modules/hcloud_floating_ip_info.py @@ -94,10 +94,9 @@ hcloud_floating_ip_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudFloatingIPInfo(Hcloud): diff --git a/plugins/modules/hcloud_image_info.py b/plugins/modules/hcloud_image_info.py index a6c4f25..0677e34 100644 --- a/plugins/modules/hcloud_image_info.py +++ b/plugins/modules/hcloud_image_info.py @@ -110,10 +110,9 @@ hcloud_image_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudImageInfo(Hcloud): diff --git a/plugins/modules/hcloud_iso_info.py b/plugins/modules/hcloud_iso_info.py index e69bfa3..1741e08 100644 --- a/plugins/modules/hcloud_iso_info.py +++ b/plugins/modules/hcloud_iso_info.py @@ -97,7 +97,8 @@ hcloud_iso_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud + +from ..module_utils.hcloud import Hcloud class AnsibleHcloudIsoInfo(Hcloud): diff --git a/plugins/modules/hcloud_load_balancer.py b/plugins/modules/hcloud_load_balancer.py index 556be45..c2aff36 100644 --- a/plugins/modules/hcloud_load_balancer.py +++ b/plugins/modules/hcloud_load_balancer.py @@ -143,10 +143,9 @@ hcloud_load_balancer: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancer(Hcloud): diff --git a/plugins/modules/hcloud_load_balancer_info.py b/plugins/modules/hcloud_load_balancer_info.py index 74bf964..3771be8 100644 --- a/plugins/modules/hcloud_load_balancer_info.py +++ b/plugins/modules/hcloud_load_balancer_info.py @@ -258,10 +258,9 @@ hcloud_load_balancer_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerInfo(Hcloud): diff --git a/plugins/modules/hcloud_load_balancer_network.py b/plugins/modules/hcloud_load_balancer_network.py index 50b29e6..531300e 100644 --- a/plugins/modules/hcloud_load_balancer_network.py +++ b/plugins/modules/hcloud_load_balancer_network.py @@ -93,10 +93,9 @@ hcloud_load_balancer_network: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerNetwork(Hcloud): diff --git a/plugins/modules/hcloud_load_balancer_service.py b/plugins/modules/hcloud_load_balancer_service.py index 61ff51e..42c1f81 100644 --- a/plugins/modules/hcloud_load_balancer_service.py +++ b/plugins/modules/hcloud_load_balancer_service.py @@ -281,12 +281,10 @@ hcloud_load_balancer_service: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - APIException, - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.load_balancers.domain import ( + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import APIException, HCloudException +from ..module_utils.vendor.hcloud.load_balancers.domain import ( LoadBalancerHealtCheckHttp, LoadBalancerHealthCheck, LoadBalancerService, diff --git a/plugins/modules/hcloud_load_balancer_target.py b/plugins/modules/hcloud_load_balancer_target.py index bd2c411..a68b974 100644 --- a/plugins/modules/hcloud_load_balancer_target.py +++ b/plugins/modules/hcloud_load_balancer_target.py @@ -137,12 +137,10 @@ hcloud_load_balancer_target: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - APIException, - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.load_balancers.domain import ( + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import APIException, HCloudException +from ..module_utils.vendor.hcloud.load_balancers.domain import ( LoadBalancerTarget, LoadBalancerTargetIP, LoadBalancerTargetLabelSelector, diff --git a/plugins/modules/hcloud_load_balancer_type_info.py b/plugins/modules/hcloud_load_balancer_type_info.py index 85afb45..9afd53a 100644 --- a/plugins/modules/hcloud_load_balancer_type_info.py +++ b/plugins/modules/hcloud_load_balancer_type_info.py @@ -86,10 +86,9 @@ hcloud_load_balancer_type_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerTypeInfo(Hcloud): diff --git a/plugins/modules/hcloud_location_info.py b/plugins/modules/hcloud_location_info.py index 196aa33..d65eea0 100644 --- a/plugins/modules/hcloud_location_info.py +++ b/plugins/modules/hcloud_location_info.py @@ -76,10 +76,9 @@ hcloud_location_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLocationInfo(Hcloud): diff --git a/plugins/modules/hcloud_network.py b/plugins/modules/hcloud_network.py index 7571e5b..ac3003d 100644 --- a/plugins/modules/hcloud_network.py +++ b/plugins/modules/hcloud_network.py @@ -118,10 +118,9 @@ hcloud_network: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudNetwork(Hcloud): diff --git a/plugins/modules/hcloud_network_info.py b/plugins/modules/hcloud_network_info.py index 251a431..c56806b 100644 --- a/plugins/modules/hcloud_network_info.py +++ b/plugins/modules/hcloud_network_info.py @@ -183,10 +183,9 @@ hcloud_network_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudNetworkInfo(Hcloud): diff --git a/plugins/modules/hcloud_placement_group.py b/plugins/modules/hcloud_placement_group.py index 25ce1b8..5927d8c 100644 --- a/plugins/modules/hcloud_placement_group.py +++ b/plugins/modules/hcloud_placement_group.py @@ -109,10 +109,9 @@ hcloud_placement_group: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPlacementGroup(Hcloud): diff --git a/plugins/modules/hcloud_primary_ip.py b/plugins/modules/hcloud_primary_ip.py index d0f553a..95a19b4 100644 --- a/plugins/modules/hcloud_primary_ip.py +++ b/plugins/modules/hcloud_primary_ip.py @@ -133,10 +133,9 @@ hcloud_primary_ip: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPrimaryIP(Hcloud): diff --git a/plugins/modules/hcloud_primary_ip_info.py b/plugins/modules/hcloud_primary_ip_info.py index 224c0b7..1b49f89 100644 --- a/plugins/modules/hcloud_primary_ip_info.py +++ b/plugins/modules/hcloud_primary_ip_info.py @@ -119,10 +119,9 @@ hcloud_primary_ip_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPrimaryIPInfo(Hcloud): diff --git a/plugins/modules/hcloud_rdns.py b/plugins/modules/hcloud_rdns.py index 57a11fc..b123fbb 100644 --- a/plugins/modules/hcloud_rdns.py +++ b/plugins/modules/hcloud_rdns.py @@ -139,10 +139,9 @@ from ansible.module_utils.common.text.converters import to_native from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import ( utils, ) -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudReverseDNS(Hcloud): diff --git a/plugins/modules/hcloud_route.py b/plugins/modules/hcloud_route.py index b506d27..d8ef7e3 100644 --- a/plugins/modules/hcloud_route.py +++ b/plugins/modules/hcloud_route.py @@ -89,13 +89,10 @@ hcloud_route: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.networks.domain import ( - NetworkRoute, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException +from ..module_utils.vendor.hcloud.networks.domain import NetworkRoute class AnsibleHcloudRoute(Hcloud): diff --git a/plugins/modules/hcloud_server.py b/plugins/modules/hcloud_server.py index b0d3060..4970c60 100644 --- a/plugins/modules/hcloud_server.py +++ b/plugins/modules/hcloud_server.py @@ -332,23 +332,16 @@ from datetime import datetime, timedelta, timezone from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.firewalls.domain import ( - FirewallResource, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.servers.domain import ( + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException +from ..module_utils.vendor.hcloud.firewalls.domain import FirewallResource +from ..module_utils.vendor.hcloud.servers.domain import ( Server, ServerCreatePublicNetwork, ) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.ssh_keys.domain import ( - SSHKey, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.volumes.domain import ( - Volume, -) +from ..module_utils.vendor.hcloud.ssh_keys.domain import SSHKey +from ..module_utils.vendor.hcloud.volumes.domain import Volume class AnsibleHcloudServer(Hcloud): diff --git a/plugins/modules/hcloud_server_info.py b/plugins/modules/hcloud_server_info.py index 43755ae..1cd568d 100644 --- a/plugins/modules/hcloud_server_info.py +++ b/plugins/modules/hcloud_server_info.py @@ -139,10 +139,9 @@ hcloud_server_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudServerInfo(Hcloud): diff --git a/plugins/modules/hcloud_server_network.py b/plugins/modules/hcloud_server_network.py index fdca2c7..63f80b0 100644 --- a/plugins/modules/hcloud_server_network.py +++ b/plugins/modules/hcloud_server_network.py @@ -114,11 +114,9 @@ hcloud_server_network: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - APIException, - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import APIException, HCloudException class AnsibleHcloudServerNetwork(Hcloud): diff --git a/plugins/modules/hcloud_server_type_info.py b/plugins/modules/hcloud_server_type_info.py index c65202d..279a813 100644 --- a/plugins/modules/hcloud_server_type_info.py +++ b/plugins/modules/hcloud_server_type_info.py @@ -122,10 +122,9 @@ hcloud_server_type_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudServerTypeInfo(Hcloud): diff --git a/plugins/modules/hcloud_ssh_key.py b/plugins/modules/hcloud_ssh_key.py index 4f5bfdf..cd71149 100644 --- a/plugins/modules/hcloud_ssh_key.py +++ b/plugins/modules/hcloud_ssh_key.py @@ -112,10 +112,9 @@ hcloud_ssh_key: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudSSHKey(Hcloud): diff --git a/plugins/modules/hcloud_ssh_key_info.py b/plugins/modules/hcloud_ssh_key_info.py index f40b629..28eff74 100644 --- a/plugins/modules/hcloud_ssh_key_info.py +++ b/plugins/modules/hcloud_ssh_key_info.py @@ -76,10 +76,9 @@ hcloud_ssh_key_info: """ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudSSHKeyInfo(Hcloud): diff --git a/plugins/modules/hcloud_subnetwork.py b/plugins/modules/hcloud_subnetwork.py index 355f1d5..4abdbfc 100644 --- a/plugins/modules/hcloud_subnetwork.py +++ b/plugins/modules/hcloud_subnetwork.py @@ -126,13 +126,10 @@ hcloud_subnetwork: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud.networks.domain import ( - NetworkSubnet, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException +from ..module_utils.vendor.hcloud.networks.domain import NetworkSubnet class AnsibleHcloudSubnetwork(Hcloud): diff --git a/plugins/modules/hcloud_volume.py b/plugins/modules/hcloud_volume.py index bad7ef4..e4de0bf 100644 --- a/plugins/modules/hcloud_volume.py +++ b/plugins/modules/hcloud_volume.py @@ -159,10 +159,9 @@ hcloud_volume: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudVolume(Hcloud): diff --git a/plugins/modules/hcloud_volume_info.py b/plugins/modules/hcloud_volume_info.py index 7b110c6..5e9c788 100644 --- a/plugins/modules/hcloud_volume_info.py +++ b/plugins/modules/hcloud_volume_info.py @@ -93,10 +93,9 @@ hcloud_volume_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud -from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( - HCloudException, -) + +from ..module_utils.hcloud import Hcloud +from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudVolumeInfo(Hcloud):