diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index f391b3a629..9f3c1b0945 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -347,10 +347,14 @@ files: maintainers: russoz $module_utils/_cmd_runner.py: maintainers: russoz + $module_utils/_crypt.py: + maintainers: russoz $module_utils/_deps.py: maintainers: russoz $module_utils/_django.py: maintainers: russoz + $module_utils/_emc_vnx.py: + maintainers: russoz $module_utils/_gconftool2.py: labels: gconftool2 maintainers: russoz @@ -361,26 +365,30 @@ files: labels: gitlab maintainers: $team_gitlab notify: jlozadad + $module_utils/_hpe3par.py: + maintainers: farhan7500 gautamphegde $module_utils/_hwc_utils.py: keywords: cloud huawei hwc labels: huawei hwc_utils networking maintainers: $team_huawei $module_utils/_icinga2.py: maintainers: cfiehe - $module_utils/_identity/keycloak/keycloak.py: - maintainers: $team_keycloak - $module_utils/_identity/keycloak/keycloak_clientsecret.py: - maintainers: $team_keycloak fynncfchen johncant $module_utils/_ipa.py: labels: ipa maintainers: $team_ipa $module_utils/_jenkins.py: labels: jenkins maintainers: russoz - $module_utils/_crypt.py: - maintainers: russoz + $module_utils/_keycloak_clientsecret.py: + maintainers: $team_keycloak fynncfchen johncant + $module_utils/_keycloak_utils.py: + maintainers: $team_keycloak + $module_utils/_keycloak.py: + maintainers: $team_keycloak $module_utils/_lxc.py: maintainers: russoz + $module_utils/_lxca_common.py: + maintainers: navalkp prabhosa $module_utils/_lvm.py: labels: lvm maintainers: russoz @@ -395,7 +403,7 @@ files: $module_utils/_module_helper.py: labels: module_helper maintainers: russoz - $module_utils/_net_tools/pritunl/: + $module_utils/_pritunl_api.py: maintainers: Lowess $module_utils/_pacemaker.py: maintainers: munchtoast @@ -412,8 +420,6 @@ files: $module_utils/_redfish_utils.py: labels: redfish_utils maintainers: $team_redfish - $module_utils/_remote_management/lxca/common.py: - maintainers: navalkp prabhosa $module_utils/_scaleway.py: labels: cloud scaleway maintainers: $team_scaleway @@ -424,8 +430,6 @@ files: maintainers: russoz $module_utils/_systemd.py: maintainers: NomakCooper - $module_utils/_storage/hpe3par/hpe3par.py: - maintainers: farhan7500 gautamphegde $module_utils/_utm_utils.py: labels: utm_utils maintainers: $team_e_spirit diff --git a/plugins/module_utils/_source_control/bitbucket.py b/plugins/module_utils/_bitbucket.py similarity index 100% rename from plugins/module_utils/_source_control/bitbucket.py rename to plugins/module_utils/_bitbucket.py diff --git a/plugins/module_utils/_storage/emc/emc_vnx.py b/plugins/module_utils/_emc_vnx.py similarity index 100% rename from plugins/module_utils/_storage/emc/emc_vnx.py rename to plugins/module_utils/_emc_vnx.py diff --git a/plugins/module_utils/_storage/hpe3par/hpe3par.py b/plugins/module_utils/_hpe3par.py similarity index 100% rename from plugins/module_utils/_storage/hpe3par/hpe3par.py rename to plugins/module_utils/_hpe3par.py diff --git a/plugins/module_utils/_identity/keycloak/keycloak.py b/plugins/module_utils/_keycloak.py similarity index 100% rename from plugins/module_utils/_identity/keycloak/keycloak.py rename to plugins/module_utils/_keycloak.py diff --git a/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py b/plugins/module_utils/_keycloak_clientsecret.py similarity index 98% rename from plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py rename to plugins/module_utils/_keycloak_clientsecret.py index f271e223dd..a7afec5a7b 100644 --- a/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py +++ b/plugins/module_utils/_keycloak_clientsecret.py @@ -12,7 +12,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, keycloak_argument_spec, ) diff --git a/plugins/module_utils/_identity/keycloak/_keycloak_utils.py b/plugins/module_utils/_keycloak_utils.py similarity index 100% rename from plugins/module_utils/_identity/keycloak/_keycloak_utils.py rename to plugins/module_utils/_keycloak_utils.py diff --git a/plugins/module_utils/_remote_management/lxca/common.py b/plugins/module_utils/_lxca_common.py similarity index 100% rename from plugins/module_utils/_remote_management/lxca/common.py rename to plugins/module_utils/_lxca_common.py diff --git a/plugins/module_utils/_net_tools/pritunl/api.py b/plugins/module_utils/_pritunl_api.py similarity index 100% rename from plugins/module_utils/_net_tools/pritunl/api.py rename to plugins/module_utils/_pritunl_api.py diff --git a/plugins/modules/bitbucket_access_key.py b/plugins/modules/bitbucket_access_key.py index 0bc9f45477..bb5e9178a5 100644 --- a/plugins/modules/bitbucket_access_key.py +++ b/plugins/modules/bitbucket_access_key.py @@ -74,7 +74,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper error_messages = { "required_key": "`key` is required when the `state` is `present`", diff --git a/plugins/modules/bitbucket_pipeline_key_pair.py b/plugins/modules/bitbucket_pipeline_key_pair.py index 465bf72864..68a4ba716b 100644 --- a/plugins/modules/bitbucket_pipeline_key_pair.py +++ b/plugins/modules/bitbucket_pipeline_key_pair.py @@ -71,7 +71,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper error_messages = { "invalid_params": "Account, repository or SSH key pair was not found", diff --git a/plugins/modules/bitbucket_pipeline_known_host.py b/plugins/modules/bitbucket_pipeline_known_host.py index 4568089a2a..2204b0b85f 100644 --- a/plugins/modules/bitbucket_pipeline_known_host.py +++ b/plugins/modules/bitbucket_pipeline_known_host.py @@ -95,7 +95,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper error_messages = { "invalid_params": "Account or repository was not found", diff --git a/plugins/modules/bitbucket_pipeline_variable.py b/plugins/modules/bitbucket_pipeline_variable.py index 2ab94d24b1..2461f0f919 100644 --- a/plugins/modules/bitbucket_pipeline_variable.py +++ b/plugins/modules/bitbucket_pipeline_variable.py @@ -83,7 +83,7 @@ RETURN = r""" # """ from ansible.module_utils.basic import AnsibleModule, _load_params -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper error_messages = { "required_value": "`value` is required when the `state` is `present`", diff --git a/plugins/modules/emc_vnx_sg_member.py b/plugins/modules/emc_vnx_sg_member.py index 652dbea720..fe0b2103bd 100644 --- a/plugins/modules/emc_vnx_sg_member.py +++ b/plugins/modules/emc_vnx_sg_member.py @@ -82,7 +82,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible_collections.community.general.plugins.module_utils._storage.emc.emc_vnx import emc_vnx_argument_spec +from ansible_collections.community.general.plugins.module_utils._emc_vnx import emc_vnx_argument_spec LIB_IMP_ERR = None try: diff --git a/plugins/modules/keycloak_authentication.py b/plugins/modules/keycloak_authentication.py index a0df7901ca..9b54113264 100644 --- a/plugins/modules/keycloak_authentication.py +++ b/plugins/modules/keycloak_authentication.py @@ -228,7 +228,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authentication_required_actions.py b/plugins/modules/keycloak_authentication_required_actions.py index 2d6825c185..723a992237 100644 --- a/plugins/modules/keycloak_authentication_required_actions.py +++ b/plugins/modules/keycloak_authentication_required_actions.py @@ -174,7 +174,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authentication_v2.py b/plugins/modules/keycloak_authentication_v2.py index 2f34dc6745..510a086944 100644 --- a/plugins/modules/keycloak_authentication_v2.py +++ b/plugins/modules/keycloak_authentication_v2.py @@ -372,7 +372,7 @@ import typing as t from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_authorization_scope.py b/plugins/modules/keycloak_authz_authorization_scope.py index 3f1d5c205e..3297c73775 100644 --- a/plugins/modules/keycloak_authz_authorization_scope.py +++ b/plugins/modules/keycloak_authz_authorization_scope.py @@ -123,7 +123,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_custom_policy.py b/plugins/modules/keycloak_authz_custom_policy.py index 780415924b..06e83fbab1 100644 --- a/plugins/modules/keycloak_authz_custom_policy.py +++ b/plugins/modules/keycloak_authz_custom_policy.py @@ -112,7 +112,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_permission.py b/plugins/modules/keycloak_authz_permission.py index a60a0f38e6..44437ba64f 100644 --- a/plugins/modules/keycloak_authz_permission.py +++ b/plugins/modules/keycloak_authz_permission.py @@ -215,7 +215,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_authz_permission_info.py b/plugins/modules/keycloak_authz_permission_info.py index 70ef34d4c1..c3a7d5db53 100644 --- a/plugins/modules/keycloak_authz_permission_info.py +++ b/plugins/modules/keycloak_authz_permission_info.py @@ -110,7 +110,7 @@ queried_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_client.py b/plugins/modules/keycloak_client.py index 5b8340836d..241933fe9d 100644 --- a/plugins/modules/keycloak_client.py +++ b/plugins/modules/keycloak_client.py @@ -769,16 +769,16 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak._keycloak_utils import ( - merge_settings_without_absent_nulls, -) -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, get_token, keycloak_argument_spec, ) +from ansible_collections.community.general.plugins.module_utils._keycloak_utils import ( + merge_settings_without_absent_nulls, +) PROTOCOL_OPENID_CONNECT = "openid-connect" PROTOCOL_SAML = "saml" diff --git a/plugins/modules/keycloak_client_rolemapping.py b/plugins/modules/keycloak_client_rolemapping.py index dc37f6a687..aeddfd429d 100644 --- a/plugins/modules/keycloak_client_rolemapping.py +++ b/plugins/modules/keycloak_client_rolemapping.py @@ -240,7 +240,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_client_rolescope.py b/plugins/modules/keycloak_client_rolescope.py index c7225cba7f..909c5d055c 100644 --- a/plugins/modules/keycloak_client_rolescope.py +++ b/plugins/modules/keycloak_client_rolescope.py @@ -149,7 +149,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_clientscope.py b/plugins/modules/keycloak_clientscope.py index 18ca95ef9d..317ba0ed38 100644 --- a/plugins/modules/keycloak_clientscope.py +++ b/plugins/modules/keycloak_clientscope.py @@ -290,7 +290,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_clientscope_type.py b/plugins/modules/keycloak_clientscope_type.py index da3a1c1003..7c632f399b 100644 --- a/plugins/modules/keycloak_clientscope_type.py +++ b/plugins/modules/keycloak_clientscope_type.py @@ -137,7 +137,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_clientsecret_info.py b/plugins/modules/keycloak_clientsecret_info.py index 42a7af88fe..99e8003923 100644 --- a/plugins/modules/keycloak_clientsecret_info.py +++ b/plugins/modules/keycloak_clientsecret_info.py @@ -126,12 +126,12 @@ clientsecret_info: sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1 """ -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, ) -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import ( +from ansible_collections.community.general.plugins.module_utils._keycloak_clientsecret import ( keycloak_clientsecret_module, keycloak_clientsecret_module_resolve_params, ) diff --git a/plugins/modules/keycloak_clientsecret_regenerate.py b/plugins/modules/keycloak_clientsecret_regenerate.py index 9cde8de8a6..51f5a5df35 100644 --- a/plugins/modules/keycloak_clientsecret_regenerate.py +++ b/plugins/modules/keycloak_clientsecret_regenerate.py @@ -129,12 +129,12 @@ end_state: sample: cUGnX1EIeTtPPAkcyGMv0ncyqDPu68P1 """ -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, ) -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak_clientsecret import ( +from ansible_collections.community.general.plugins.module_utils._keycloak_clientsecret import ( keycloak_clientsecret_module, keycloak_clientsecret_module_resolve_params, ) diff --git a/plugins/modules/keycloak_clienttemplate.py b/plugins/modules/keycloak_clienttemplate.py index 1864274122..be6323bdf9 100644 --- a/plugins/modules/keycloak_clienttemplate.py +++ b/plugins/modules/keycloak_clienttemplate.py @@ -267,7 +267,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_component.py b/plugins/modules/keycloak_component.py index 88ca62a22a..cf224bc592 100644 --- a/plugins/modules/keycloak_component.py +++ b/plugins/modules/keycloak_component.py @@ -133,7 +133,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_component_info.py b/plugins/modules/keycloak_component_info.py index 3457a71a91..1391952f1c 100644 --- a/plugins/modules/keycloak_component_info.py +++ b/plugins/modules/keycloak_component_info.py @@ -103,7 +103,7 @@ from urllib.parse import quote from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_group.py b/plugins/modules/keycloak_group.py index 8ecf0d616e..19b1bdb561 100644 --- a/plugins/modules/keycloak_group.py +++ b/plugins/modules/keycloak_group.py @@ -299,7 +299,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_identity_provider.py b/plugins/modules/keycloak_identity_provider.py index 451cd6ff38..8c95ae8e41 100644 --- a/plugins/modules/keycloak_identity_provider.py +++ b/plugins/modules/keycloak_identity_provider.py @@ -487,7 +487,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm.py b/plugins/modules/keycloak_realm.py index 97d78b0985..478f28af2d 100644 --- a/plugins/modules/keycloak_realm.py +++ b/plugins/modules/keycloak_realm.py @@ -825,7 +825,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm_info.py b/plugins/modules/keycloak_realm_info.py index d220dfcdc0..d7513e690b 100644 --- a/plugins/modules/keycloak_realm_info.py +++ b/plugins/modules/keycloak_realm_info.py @@ -97,7 +97,7 @@ realm_info: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import KeycloakAPI +from ansible_collections.community.general.plugins.module_utils._keycloak import KeycloakAPI def main(): diff --git a/plugins/modules/keycloak_realm_key.py b/plugins/modules/keycloak_realm_key.py index 4c6cfc2b92..640c53efe6 100644 --- a/plugins/modules/keycloak_realm_key.py +++ b/plugins/modules/keycloak_realm_key.py @@ -547,7 +547,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_realm_keys_metadata_info.py b/plugins/modules/keycloak_realm_keys_metadata_info.py index 48e1132ce4..4de8bdfc5a 100644 --- a/plugins/modules/keycloak_realm_keys_metadata_info.py +++ b/plugins/modules/keycloak_realm_keys_metadata_info.py @@ -87,7 +87,7 @@ keys_metadata: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_realm_localization.py b/plugins/modules/keycloak_realm_localization.py index 071dc575b7..f67f30b4ff 100644 --- a/plugins/modules/keycloak_realm_localization.py +++ b/plugins/modules/keycloak_realm_localization.py @@ -198,7 +198,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_realm_rolemapping.py b/plugins/modules/keycloak_realm_rolemapping.py index f19714f3d3..472d7d11b7 100644 --- a/plugins/modules/keycloak_realm_rolemapping.py +++ b/plugins/modules/keycloak_realm_rolemapping.py @@ -225,7 +225,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_role.py b/plugins/modules/keycloak_role.py index 528ac2dda5..d123974e32 100644 --- a/plugins/modules/keycloak_role.py +++ b/plugins/modules/keycloak_role.py @@ -229,7 +229,7 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user.py b/plugins/modules/keycloak_user.py index 84f58f2048..f3719c7942 100644 --- a/plugins/modules/keycloak_user.py +++ b/plugins/modules/keycloak_user.py @@ -343,7 +343,7 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user_execute_actions_email.py b/plugins/modules/keycloak_user_execute_actions_email.py index da74386c36..63d2333fa3 100644 --- a/plugins/modules/keycloak_user_execute_actions_email.py +++ b/plugins/modules/keycloak_user_execute_actions_email.py @@ -126,7 +126,7 @@ actions: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_user_federation.py b/plugins/modules/keycloak_user_federation.py index 712b3af806..14f7d9b195 100644 --- a/plugins/modules/keycloak_user_federation.py +++ b/plugins/modules/keycloak_user_federation.py @@ -723,7 +723,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/keycloak_user_rolemapping.py b/plugins/modules/keycloak_user_rolemapping.py index b0e63d85fa..dcf2f50b46 100644 --- a/plugins/modules/keycloak_user_rolemapping.py +++ b/plugins/modules/keycloak_user_rolemapping.py @@ -241,7 +241,7 @@ end_state: from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, get_token, diff --git a/plugins/modules/keycloak_userprofile.py b/plugins/modules/keycloak_userprofile.py index d9aedd05cc..5f1654b991 100644 --- a/plugins/modules/keycloak_userprofile.py +++ b/plugins/modules/keycloak_userprofile.py @@ -480,7 +480,7 @@ from urllib.parse import urlencode from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakAPI, KeycloakError, camel, diff --git a/plugins/modules/lxca_cmms.py b/plugins/modules/lxca_cmms.py index a12cab6988..3e743f5cbf 100644 --- a/plugins/modules/lxca_cmms.py +++ b/plugins/modules/lxca_cmms.py @@ -93,7 +93,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import ( +from ansible_collections.community.general.plugins.module_utils._lxca_common import ( LXCA_COMMON_ARGS, connection_object, has_pylxca, diff --git a/plugins/modules/lxca_nodes.py b/plugins/modules/lxca_nodes.py index 8db2571bc7..2036eab975 100644 --- a/plugins/modules/lxca_nodes.py +++ b/plugins/modules/lxca_nodes.py @@ -112,7 +112,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common import ( +from ansible_collections.community.general.plugins.module_utils._lxca_common import ( LXCA_COMMON_ARGS, connection_object, has_pylxca, diff --git a/plugins/modules/pritunl_org.py b/plugins/modules/pritunl_org.py index ccbc70c04a..33e15e03fc 100644 --- a/plugins/modules/pritunl_org.py +++ b/plugins/modules/pritunl_org.py @@ -78,7 +78,7 @@ response: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._pritunl_api import ( PritunlException, delete_pritunl_organization, get_pritunl_settings, diff --git a/plugins/modules/pritunl_org_info.py b/plugins/modules/pritunl_org_info.py index 334a06c645..1b1255af8e 100644 --- a/plugins/modules/pritunl_org_info.py +++ b/plugins/modules/pritunl_org_info.py @@ -73,7 +73,7 @@ organizations: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._pritunl_api import ( PritunlException, get_pritunl_settings, list_pritunl_organizations, diff --git a/plugins/modules/pritunl_user.py b/plugins/modules/pritunl_user.py index 16f25cebd7..8c1efb6d67 100644 --- a/plugins/modules/pritunl_user.py +++ b/plugins/modules/pritunl_user.py @@ -143,7 +143,7 @@ response: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._pritunl_api import ( PritunlException, delete_pritunl_user, get_pritunl_settings, diff --git a/plugins/modules/pritunl_user_info.py b/plugins/modules/pritunl_user_info.py index 3620fe35a0..1f85cccdff 100644 --- a/plugins/modules/pritunl_user_info.py +++ b/plugins/modules/pritunl_user_info.py @@ -91,7 +91,7 @@ users: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api import ( +from ansible_collections.community.general.plugins.module_utils._pritunl_api import ( PritunlException, get_pritunl_settings, list_pritunl_organizations, diff --git a/plugins/modules/ss_3par_cpg.py b/plugins/modules/ss_3par_cpg.py index ffed5142a4..3910d93706 100644 --- a/plugins/modules/ss_3par_cpg.py +++ b/plugins/modules/ss_3par_cpg.py @@ -123,7 +123,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par +from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par try: from hpe3par_sdk import client diff --git a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py b/tests/unit/plugins/module_utils/test__keycloak.py similarity index 98% rename from tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py rename to tests/unit/plugins/module_utils/test__keycloak.py index 889708328c..2c279250f8 100644 --- a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_module_utils.py +++ b/tests/unit/plugins/module_utils/test__keycloak.py @@ -6,7 +6,7 @@ from __future__ import annotations import unittest -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import is_struct_included +from ansible_collections.community.general.plugins.module_utils._keycloak import is_struct_included class KeycloakIsStructIncludedTestCase(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py b/tests/unit/plugins/module_utils/test__keycloak_connect.py similarity index 96% rename from tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py rename to tests/unit/plugins/module_utils/test__keycloak_connect.py index 09a604c286..0075a0ace9 100644 --- a/tests/unit/plugins/module_utils/_identity/keycloak/test_keycloak_connect.py +++ b/tests/unit/plugins/module_utils/test__keycloak_connect.py @@ -10,7 +10,7 @@ from urllib.error import HTTPError import pytest -from ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak import ( +from ansible_collections.community.general.plugins.module_utils._keycloak import ( KeycloakError, get_token, ) @@ -70,7 +70,7 @@ def mock_good_connection(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -98,7 +98,7 @@ def mock_bad_json_returned(mocker): "http://keycloak.url/auth/realms/master/protocol/openid-connect/token": create_wrapper('{"access_token":'), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -130,7 +130,7 @@ def mock_401_returned(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) @@ -154,7 +154,7 @@ def mock_json_without_token_returned(mocker): ), } return mocker.patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py b/tests/unit/plugins/module_utils/test__pritunl_api.py similarity index 99% rename from tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py rename to tests/unit/plugins/module_utils/test__pritunl_api.py index 864618ae8e..b2cb02d493 100644 --- a/tests/unit/plugins/module_utils/_net_tools/pritunl/test_api.py +++ b/tests/unit/plugins/module_utils/test__pritunl_api.py @@ -10,9 +10,7 @@ from unittest.mock import MagicMock import pytest from ansible.module_utils.common.dict_transformations import dict_merge -from ansible_collections.community.general.plugins.module_utils._net_tools.pritunl import ( - api, -) +from ansible_collections.community.general.plugins.module_utils import _pritunl_api as api # Pritunl Mocks diff --git a/tests/unit/plugins/module_utils/test__sclaeway.py b/tests/unit/plugins/module_utils/test__scaleway.py similarity index 100% rename from tests/unit/plugins/module_utils/test__sclaeway.py rename to tests/unit/plugins/module_utils/test__scaleway.py diff --git a/tests/unit/plugins/modules/test_bitbucket_access_key.py b/tests/unit/plugins/modules/test_bitbucket_access_key.py index c87e760948..4a0ba2604d 100644 --- a/tests/unit/plugins/modules/test_bitbucket_access_key.py +++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_access_key diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py index b69bc4d9cc..29224f414a 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py index 5f991e2f1a..e575c8e8b2 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py index a3a5aab1a1..abf71d9ebc 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py @@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module set_module_args, ) -from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper +from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable diff --git a/tests/unit/plugins/modules/test_keycloak_authentication.py b/tests/unit/plugins/modules/test_keycloak_authentication.py index 64e2d6810e..7c89fc1429 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication.py @@ -102,7 +102,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py index 6b13a2215c..31d0caec3c 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py @@ -98,7 +98,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_client.py b/tests/unit/plugins/modules/test_keycloak_client.py index 417f224c7a..57e1e1fa29 100644 --- a/tests/unit/plugins/modules/test_keycloak_client.py +++ b/tests/unit/plugins/modules/test_keycloak_client.py @@ -90,7 +90,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py index 49f743e735..ce9e17f0b4 100644 --- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py +++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py @@ -119,7 +119,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_clientscope.py b/tests/unit/plugins/modules/test_keycloak_clientscope.py index f5d505b7e4..6ea4a1620f 100644 --- a/tests/unit/plugins/modules/test_keycloak_clientscope.py +++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py @@ -124,7 +124,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_component.py b/tests/unit/plugins/modules/test_keycloak_component.py index 96f94be943..16230a3c1d 100644 --- a/tests/unit/plugins/modules/test_keycloak_component.py +++ b/tests/unit/plugins/modules/test_keycloak_component.py @@ -69,7 +69,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_identity_provider.py b/tests/unit/plugins/modules/test_keycloak_identity_provider.py index 33917d7275..eab2f62a21 100644 --- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py +++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py @@ -122,7 +122,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm.py b/tests/unit/plugins/modules/test_keycloak_realm.py index 9e6ceed7f6..691364ac65 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm.py +++ b/tests/unit/plugins/modules/test_keycloak_realm.py @@ -81,7 +81,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_info.py b/tests/unit/plugins/modules/test_keycloak_realm_info.py index 29c9341f29..7f4dbae9b5 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys.py b/tests/unit/plugins/modules/test_keycloak_realm_keys.py index 6c6a35018a..90be16fa41 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py index 6309719526..51560d1d0e 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_realm_localization.py b/tests/unit/plugins/modules/test_keycloak_realm_localization.py index 723e0961af..936b7c101f 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_localization.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_localization.py @@ -72,7 +72,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_role.py b/tests/unit/plugins/modules/test_keycloak_role.py index f0845dd908..e568c86932 100644 --- a/tests/unit/plugins/modules/test_keycloak_role.py +++ b/tests/unit/plugins/modules/test_keycloak_role.py @@ -119,7 +119,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user.py b/tests/unit/plugins/modules/test_keycloak_user.py index 58d9e0e124..57b3c8de2a 100644 --- a/tests/unit/plugins/modules/test_keycloak_user.py +++ b/tests/unit/plugins/modules/test_keycloak_user.py @@ -91,7 +91,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py index 5f05ae8aad..5d6152fc6a 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py +++ b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py @@ -46,7 +46,7 @@ def _mock_good_connection(): ) } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=_build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_user_federation.py b/tests/unit/plugins/modules/test_keycloak_user_federation.py index 72b4e1f00f..a5cc3f8a30 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_federation.py +++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py @@ -78,7 +78,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_keycloak_userprofile.py b/tests/unit/plugins/modules/test_keycloak_userprofile.py index b8a2d45101..0ab4e6abfa 100644 --- a/tests/unit/plugins/modules/test_keycloak_userprofile.py +++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py @@ -79,7 +79,7 @@ def mock_good_connection(): ), } return patch( - "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url", + "ansible_collections.community.general.plugins.module_utils._keycloak.open_url", side_effect=build_mocked_request(count(), token_response), autospec=True, ) diff --git a/tests/unit/plugins/modules/test_lxca_cmms.py b/tests/unit/plugins/modules/test_lxca_cmms.py index 087dfc4648..72faaf2832 100644 --- a/tests/unit/plugins/modules/test_lxca_cmms.py +++ b/tests/unit/plugins/modules/test_lxca_cmms.py @@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_cmms @pytest.fixture(scope="module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn", autospec=True, ) def setup_module(close_conn): @@ -43,7 +43,7 @@ class TestMyModule: ) @pytest.mark.usefixtures("patch_ansible_module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True) @@ -59,7 +59,7 @@ class TestMyModule: assert "missing required arguments" in results["msg"] @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True) @@ -87,7 +87,7 @@ class TestMyModule: assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms._cmms_by_uuid", autospec=True) diff --git a/tests/unit/plugins/modules/test_lxca_nodes.py b/tests/unit/plugins/modules/test_lxca_nodes.py index 25204709a7..29c1853809 100644 --- a/tests/unit/plugins/modules/test_lxca_nodes.py +++ b/tests/unit/plugins/modules/test_lxca_nodes.py @@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_nodes @pytest.fixture(scope="module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn", autospec=True, ) def setup_module(close_conn): @@ -43,7 +43,7 @@ class TestMyModule: ) @pytest.mark.usefixtures("patch_ansible_module") @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True) @@ -59,7 +59,7 @@ class TestMyModule: assert "missing required arguments" in results["msg"] @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True) @@ -96,7 +96,7 @@ class TestMyModule: assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args @mock.patch( - "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn", + "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn", autospec=True, ) @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes._nodes_by_uuid", autospec=True) diff --git a/tests/unit/plugins/modules/test_pritunl_org.py b/tests/unit/plugins/modules/test_pritunl_org.py index 5cf9cc9a9f..8e7b63148d 100644 --- a/tests/unit/plugins/modules/test_pritunl_org.py +++ b/tests/unit/plugins/modules/test_pritunl_org.py @@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_org, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import ( PritunlDeleteOrganizationMock, PritunlListOrganizationAfterPostMock, PritunlListOrganizationMock, @@ -35,21 +35,21 @@ class TestPritunlOrg(ModuleTestCase): def patch_add_pritunl_organization(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_organization", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_organization", autospec=True, **kwds, ) def patch_delete_pritunl_organization(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_organization", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_organization", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_org_info.py b/tests/unit/plugins/modules/test_pritunl_org_info.py index f23d77f2ec..003dd90009 100644 --- a/tests/unit/plugins/modules/test_pritunl_org_info.py +++ b/tests/unit/plugins/modules/test_pritunl_org_info.py @@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_org_info, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import ( PritunlEmptyOrganizationMock, PritunlListOrganizationMock, ) @@ -32,7 +32,7 @@ class TestPritunlOrgInfo(ModuleTestCase): def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_user.py b/tests/unit/plugins/modules/test_pritunl_user.py index 092ce61b4d..46cae92a63 100644 --- a/tests/unit/plugins/modules/test_pritunl_user.py +++ b/tests/unit/plugins/modules/test_pritunl_user.py @@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_user, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import ( PritunlDeleteUserMock, PritunlListOrganizationMock, PritunlListUserMock, @@ -47,35 +47,35 @@ class TestPritunlUser(ModuleTestCase): def patch_get_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users", autospec=True, **kwds, ) def patch_add_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_user", autospec=True, **kwds, ) def patch_update_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._put_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._put_pritunl_user", autospec=True, **kwds, ) def patch_delete_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_user", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_user", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_pritunl_user_info.py b/tests/unit/plugins/modules/test_pritunl_user_info.py index e36bc85ad1..0fe3550813 100644 --- a/tests/unit/plugins/modules/test_pritunl_user_info.py +++ b/tests/unit/plugins/modules/test_pritunl_user_info.py @@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module from ansible_collections.community.general.plugins.modules import ( pritunl_user_info, ) -from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import ( +from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import ( PritunlListOrganizationMock, PritunlListUserMock, ) @@ -32,14 +32,14 @@ class TestPritunlUserInfo(ModuleTestCase): def patch_get_pritunl_users(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users", autospec=True, **kwds, ) def patch_get_pritunl_organizations(self, **kwds): return patch( - "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations", + "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations", autospec=True, **kwds, ) diff --git a/tests/unit/plugins/modules/test_ss_3par_cpg.py b/tests/unit/plugins/modules/test_ss_3par_cpg.py index fe219fa54a..67c0641005 100644 --- a/tests/unit/plugins/modules/test_ss_3par_cpg.py +++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py @@ -11,7 +11,7 @@ sys.modules["hpe3par_sdk"] = mock.Mock() sys.modules["hpe3par_sdk.client"] = mock.Mock() sys.modules["hpe3parclient"] = mock.Mock() sys.modules["hpe3parclient.exceptions"] = mock.Mock() -from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par +from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par from ansible_collections.community.general.plugins.modules import ss_3par_cpg