diff --git a/changelog.d/1.adding.md b/changelog.d/1.adding.md new file mode 100644 index 0000000..f591119 --- /dev/null +++ b/changelog.d/1.adding.md @@ -0,0 +1 @@ +Add remaining filters and tests from the base Ansible collection. \ No newline at end of file diff --git a/src/jinjanator_plugin_ansible/plugin.py b/src/jinjanator_plugin_ansible/plugin.py index cab69c0..f1ad267 100644 --- a/src/jinjanator_plugin_ansible/plugin.py +++ b/src/jinjanator_plugin_ansible/plugin.py @@ -2,8 +2,15 @@ from typing import cast -from ansible.plugins.filter.core import FilterModule # type: ignore[import] -from ansible.plugins.test.core import TestModule # type: ignore[import] +import ansible.plugins.filter.core as filter_core # type: ignore[import] +import ansible.plugins.filter.mathstuff as filter_mathstuff # type: ignore[import] +import ansible.plugins.filter.urls as filter_urls # type: ignore[import] +import ansible.plugins.filter.urlsplit as filter_urlsplit # type: ignore[import] +import ansible.plugins.test.core as test_core # type: ignore[import] +import ansible.plugins.test.files as test_files # type: ignore[import] +import ansible.plugins.test.mathstuff as test_mathstuff # type: ignore[import] +import ansible.plugins.test.uri as test_uri # type: ignore[import] + from jinjanator_plugins import ( Filters, Tests, @@ -14,9 +21,25 @@ @plugin_filters_hook def plugin_filters() -> Filters: - return cast(Filters, FilterModule().filters()) + return cast( + Filters, + { + **filter_core.FilterModule().filters(), + **filter_mathstuff.FilterModule().filters(), + **filter_urls.FilterModule().filters(), + **filter_urlsplit.FilterModule().filters(), + }, + ) @plugin_tests_hook def plugin_tests() -> Tests: - return cast(Tests, TestModule().tests()) + return cast( + Tests, + { + **test_core.TestModule().tests(), + **test_files.TestModule().tests(), + **test_mathstuff.TestModule().tests(), + **test_uri.TestModule().tests(), + }, + )