Merge branch 'GCLOUD2-12819/fix-linters' into 'master'

GCLOUD2-12819 Fix errors for linters

See merge request cloudapi/ansible-provider!30

plugins/module_utils/clients/base.py

@@ -1,8 +1,10 @@
+# pylint: disable=inconsistent-return-statements
 from string import Formatter
 from time import sleep
 from typing import Optional
 
 from ansible.module_utils.basic import AnsibleModule
+
 from ansible_collections.gcore.cloud.plugins.module_utils.api import CloudAPIClient
 from ansible_collections.gcore.cloud.plugins.module_utils.exceptions import (
     ValidationError,

plugins/module_utils/cloud.py

@@ -1,4 +1,5 @@
 from ansible.module_utils.basic import AnsibleModule, env_fallback
+
 from ansible_collections.gcore.cloud.plugins.module_utils.api import CloudAPIClient
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.image import (
     CloudImageClient,
@@ -33,17 +34,17 @@
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.router import (
     CloudRouterClient,
 )
-from ansible_collections.gcore.cloud.plugins.module_utils.clients.servergroup import (
-    CloudServerGroupClient,
+from ansible_collections.gcore.cloud.plugins.module_utils.clients.secret import (
+    CloudSecretClient,
 )
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.securitygroup import (
     CloudSecurityGroupClient,
 )
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.securitygroup_rule import (
     CloudSecurityGroupRuleClient,
 )
-from ansible_collections.gcore.cloud.plugins.module_utils.clients.secret import (
-    CloudSecretClient,
+from ansible_collections.gcore.cloud.plugins.module_utils.clients.servergroup import (
+    CloudServerGroupClient,
 )
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.snapshot import (
     CloudSnapshotClient,

plugins/modules/image.py

@@ -300,6 +300,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.image import (
     ImageManageAction,
 )

plugins/modules/image_info.py

@@ -247,6 +247,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/instance.py

@@ -425,6 +425,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.instance import (
     InstanceManageAction,
 )

plugins/modules/instance_info.py

@@ -301,6 +301,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/instance_quota_info.py

@@ -199,6 +199,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/keypair.py

@@ -153,6 +153,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.keypair import (
     KeypairManageAction,
 )

plugins/modules/keypair_info.py

@@ -107,6 +107,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/lifecycle_policy.py

@@ -206,6 +206,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.lifecycle_policy import (
     LifecyclePolicyManageAction,
 )

plugins/modules/loadbalancer.py

@@ -329,6 +329,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.loadbalancer import (
     LoadbalancerManageAction,
 )

plugins/modules/loadbalancer_info.py

@@ -304,6 +304,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/loadbalancer_listener.py

@@ -224,6 +224,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.loadbalancer_listener import (
     LbListenerManageAction,
 )

plugins/modules/loadbalancer_listener_info.py

@@ -152,6 +152,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/loadbalancer_member.py

@@ -228,6 +228,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.loadbalancer_member import (
     LbPoolMemeberManageAction,
 )

plugins/modules/loadbalancer_pool.py

@@ -274,6 +274,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.loadbalancer_pool import (
     LbPoolManageAction,
 )

plugins/modules/loadbalancer_pool_info.py

@@ -184,6 +184,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/network.py

@@ -184,6 +184,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.network import (
     NetworkManageAction,
 )

plugins/modules/network_info.py

@@ -165,6 +165,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/reserved_fixed_ip.py

@@ -235,6 +235,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.reserved_fip import (
     ReservedFipManageAction,
 )

plugins/modules/reserved_fixed_ip_info.py

@@ -202,6 +202,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/router.py

@@ -202,6 +202,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.router import (
     RouterManageAction,
 )

plugins/modules/router_info.py

@@ -138,6 +138,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/secret.py

@@ -138,6 +138,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.secret import (
     SecretManageAction,
 )

plugins/modules/secret_info.py

@@ -104,6 +104,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/securitygroup.py

@@ -189,6 +189,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.securitygroup import (
     SecurityGroupManageAction,
 )

plugins/modules/securitygroup_info.py

@@ -151,6 +151,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/securitygroup_rule.py

@@ -224,6 +224,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.schemas.securitygroup_rule import (
     DirectionType,
     Ethertype,

plugins/modules/servergroup.py

@@ -112,6 +112,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.schemas.servergroup import (
     ServerGroupPolicy,
 )

plugins/modules/servergroup_info.py

@@ -89,6 +89,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/subnet.py

@@ -255,6 +255,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.subnet import (
     SubnetManageAction,
 )

plugins/modules/subnet_info.py

@@ -190,6 +190,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/volume.py

@@ -345,6 +345,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.schemas.volume import (
     RetypableVolumeType,
     VolumeSource,

plugins/modules/volume_info.py

@@ -235,6 +235,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

plugins/modules/volume_snapshot.py

@@ -160,6 +160,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.clients.snapshot import (
     SnapshotManageAction,
 )

plugins/modules/volume_snapshot_info.py

@@ -153,6 +153,7 @@
 from traceback import format_exc
 
 from ansible.module_utils.basic import AnsibleModule, to_native
+
 from ansible_collections.gcore.cloud.plugins.module_utils.cloud import (
     AnsibleCloudClient,
 )

pyproject.toml

@@ -44,6 +44,8 @@ wrong-import-position,
 no-name-in-module,
 use-dict-literal,
 broad-exception-caught,
+too-many-instance-attributes,
+duplicate-code,
 """
 
 [build-system]

tests/unit/plugins/module_utils/test_api_client.py

@@ -1,8 +1,9 @@
 import unittest
 
-from ansible_collections.gcore.cloud.plugins.module_utils.api import CloudAPIClient
 from mock import MagicMock
 
+from ansible_collections.gcore.cloud.plugins.module_utils.api import CloudAPIClient
+
 
 def mock_module(params: dict):
     module = MagicMock()