diff --git a/plugins/action/openssl_privatekey_pipe.py b/plugins/action/openssl_privatekey_pipe.py index 002adc95..42d603ec 100644 --- a/plugins/action/openssl_privatekey_pipe.py +++ b/plugins/action/openssl_privatekey_pipe.py @@ -11,7 +11,7 @@ import base64 from ansible.module_utils._text import to_native, to_bytes -from ansible_collections.community.crypto.plugins.module_utils.action_module import ActionModuleBase +from ansible_collections.community.crypto.plugins.plugin_utils.action_module import ActionModuleBase from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import ( OpenSSLObjectError, diff --git a/plugins/module_utils/action_module.py b/plugins/plugin_utils/action_module.py similarity index 100% rename from plugins/module_utils/action_module.py rename to plugins/plugin_utils/action_module.py diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index a517bd54..43335011 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -1,11 +1,3 @@ -plugins/module_utils/action_module.py import-2.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-2.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.5!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.8!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.9!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py pylint:ansible-bad-module-import # This is not supposed to be included by modules, but by action plugins plugins/module_utils/compat/ipaddress.py future-import-boilerplate plugins/module_utils/compat/ipaddress.py metaclass-boilerplate plugins/module_utils/compat/ipaddress.py no-assert diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index a517bd54..43335011 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -1,11 +1,3 @@ -plugins/module_utils/action_module.py import-2.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-2.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.5!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.8!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.9!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py pylint:ansible-bad-module-import # This is not supposed to be included by modules, but by action plugins plugins/module_utils/compat/ipaddress.py future-import-boilerplate plugins/module_utils/compat/ipaddress.py metaclass-boilerplate plugins/module_utils/compat/ipaddress.py no-assert diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 353f11c0..f12ed5f7 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -1,10 +1,3 @@ -plugins/module_utils/action_module.py import-2.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-2.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.5!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.6!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.7!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py import-3.8!skip # This is not supposed to be included by modules, but by action plugins -plugins/module_utils/action_module.py pylint:ansible-bad-module-import # This is not supposed to be included by modules, but by action plugins plugins/module_utils/compat/ipaddress.py future-import-boilerplate plugins/module_utils/compat/ipaddress.py metaclass-boilerplate plugins/module_utils/compat/ipaddress.py no-assert