multiple module utils: flatten directories (#11974)

* multiple module utils: flatten directories * adjust pritunl tests * adjust lxca and keycloak tests * adjust botmeta * rename test files correctly * and an import fix * rename pritunl api mod utils test * fix typo in test filename * rename references to pritunl api test * rename keycloak mod utils test
2026-05-07 05:42:50 +00:00 · 2026-05-06 17:07:51 +12:00
parent fb0541defb
commit 1047f45bec
84 changed files with 116 additions and 114 deletions
--- a/plugins/module_utils/_source_control/bitbucket.py
+++ b/plugins/module_utils/_source_control/bitbucket.py
--- a/plugins/module_utils/_storage/emc/emc_vnx.py
+++ b/plugins/module_utils/_storage/emc/emc_vnx.py
--- a/plugins/module_utils/_storage/hpe3par/hpe3par.py
+++ b/plugins/module_utils/_storage/hpe3par/hpe3par.py
--- a/plugins/module_utils/_identity/keycloak/keycloak.py
+++ b/plugins/module_utils/_identity/keycloak/keycloak.py
--- a/plugins/module_utils/_identity/keycloak/keycloak_clientsecret.py
+++ b/plugins/module_utils/_identity/keycloak/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,
 )
--- a/plugins/module_utils/_identity/keycloak/_keycloak_utils.py
+++ b/plugins/module_utils/_identity/keycloak/_keycloak_utils.py
--- a/plugins/module_utils/_remote_management/lxca/common.py
+++ b/plugins/module_utils/_remote_management/lxca/common.py
--- a/plugins/module_utils/_net_tools/pritunl/api.py
+++ b/plugins/module_utils/_net_tools/pritunl/api.py
--- 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`",
--- 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",
--- 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",
--- 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`",
--- 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:
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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"
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
 )
--- 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,
 )
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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():
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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