From 9462506edc529bf43f3302f51c3b1b9b68709fd7 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 5 May 2022 08:03:49 +0200 Subject: [PATCH] Rename single-filter plugins so that the filename equals the filter name. (#4625) --- .github/BOTMETA.yml | 4 ++-- changelogs/fragments/4625-fix-filter-filenames.yml | 2 ++ plugins/filter/{groupby.py => groupby_as_dict.py} | 0 plugins/filter/{list.py => lists_mergeby.py} | 0 .../{filter_groupby => filter_groupby_as_dict}/aliases | 0 .../{filter_groupby => filter_groupby_as_dict}/tasks/main.yml | 0 .../{filter_groupby => filter_groupby_as_dict}/vars/main.yml | 0 .../targets/{filter_list => filter_lists_mergeby}/aliases | 0 .../tasks/lists_mergeby_2-10.yml | 0 .../tasks/lists_mergeby_default.yml | 0 .../{filter_list => filter_lists_mergeby}/tasks/main.yml | 0 .../{filter_list => filter_lists_mergeby}/vars/main.yml | 0 12 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/4625-fix-filter-filenames.yml rename plugins/filter/{groupby.py => groupby_as_dict.py} (100%) rename plugins/filter/{list.py => lists_mergeby.py} (100%) rename tests/integration/targets/{filter_groupby => filter_groupby_as_dict}/aliases (100%) rename tests/integration/targets/{filter_groupby => filter_groupby_as_dict}/tasks/main.yml (100%) rename tests/integration/targets/{filter_groupby => filter_groupby_as_dict}/vars/main.yml (100%) rename tests/integration/targets/{filter_list => filter_lists_mergeby}/aliases (100%) rename tests/integration/targets/{filter_list => filter_lists_mergeby}/tasks/lists_mergeby_2-10.yml (100%) rename tests/integration/targets/{filter_list => filter_lists_mergeby}/tasks/lists_mergeby_default.yml (100%) rename tests/integration/targets/{filter_list => filter_lists_mergeby}/tasks/main.yml (100%) rename tests/integration/targets/{filter_list => filter_lists_mergeby}/vars/main.yml (100%) diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index d1a85c2cbb..ecedff1e81 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -126,7 +126,7 @@ files: maintainers: giner $filters/from_csv.py: maintainers: Ajpantuso - $filters/groupby.py: + $filters/groupby_as_dict.py: maintainers: felixfontein $filters/hashids.py: maintainers: Ajpantuso @@ -137,7 +137,7 @@ files: $filters/jc.py: maintainers: kellyjonbrazil $filters/json_query.py: {} - $filters/list.py: + $filters/lists_mergeby.py: maintainers: vbotka $filters/random_mac.py: {} $filters/time.py: diff --git a/changelogs/fragments/4625-fix-filter-filenames.yml b/changelogs/fragments/4625-fix-filter-filenames.yml new file mode 100644 index 0000000000..d3c0eb5f92 --- /dev/null +++ b/changelogs/fragments/4625-fix-filter-filenames.yml @@ -0,0 +1,2 @@ +breaking_changes: + - "lists_mergeby and groupby_as_dict filter plugins - adjust filter plugin filename. This change is not visible to end-users, it only affects possible other collections importing Python paths (https://github.com/ansible-collections/community.general/pull/4625)." diff --git a/plugins/filter/groupby.py b/plugins/filter/groupby_as_dict.py similarity index 100% rename from plugins/filter/groupby.py rename to plugins/filter/groupby_as_dict.py diff --git a/plugins/filter/list.py b/plugins/filter/lists_mergeby.py similarity index 100% rename from plugins/filter/list.py rename to plugins/filter/lists_mergeby.py diff --git a/tests/integration/targets/filter_groupby/aliases b/tests/integration/targets/filter_groupby_as_dict/aliases similarity index 100% rename from tests/integration/targets/filter_groupby/aliases rename to tests/integration/targets/filter_groupby_as_dict/aliases diff --git a/tests/integration/targets/filter_groupby/tasks/main.yml b/tests/integration/targets/filter_groupby_as_dict/tasks/main.yml similarity index 100% rename from tests/integration/targets/filter_groupby/tasks/main.yml rename to tests/integration/targets/filter_groupby_as_dict/tasks/main.yml diff --git a/tests/integration/targets/filter_groupby/vars/main.yml b/tests/integration/targets/filter_groupby_as_dict/vars/main.yml similarity index 100% rename from tests/integration/targets/filter_groupby/vars/main.yml rename to tests/integration/targets/filter_groupby_as_dict/vars/main.yml diff --git a/tests/integration/targets/filter_list/aliases b/tests/integration/targets/filter_lists_mergeby/aliases similarity index 100% rename from tests/integration/targets/filter_list/aliases rename to tests/integration/targets/filter_lists_mergeby/aliases diff --git a/tests/integration/targets/filter_list/tasks/lists_mergeby_2-10.yml b/tests/integration/targets/filter_lists_mergeby/tasks/lists_mergeby_2-10.yml similarity index 100% rename from tests/integration/targets/filter_list/tasks/lists_mergeby_2-10.yml rename to tests/integration/targets/filter_lists_mergeby/tasks/lists_mergeby_2-10.yml diff --git a/tests/integration/targets/filter_list/tasks/lists_mergeby_default.yml b/tests/integration/targets/filter_lists_mergeby/tasks/lists_mergeby_default.yml similarity index 100% rename from tests/integration/targets/filter_list/tasks/lists_mergeby_default.yml rename to tests/integration/targets/filter_lists_mergeby/tasks/lists_mergeby_default.yml diff --git a/tests/integration/targets/filter_list/tasks/main.yml b/tests/integration/targets/filter_lists_mergeby/tasks/main.yml similarity index 100% rename from tests/integration/targets/filter_list/tasks/main.yml rename to tests/integration/targets/filter_lists_mergeby/tasks/main.yml diff --git a/tests/integration/targets/filter_list/vars/main.yml b/tests/integration/targets/filter_lists_mergeby/vars/main.yml similarity index 100% rename from tests/integration/targets/filter_list/vars/main.yml rename to tests/integration/targets/filter_lists_mergeby/vars/main.yml