From 81ceb533688ad9d44368c887c8fe9bf4d6ca2bb3 Mon Sep 17 00:00:00 2001 From: pzhang Date: Wed, 18 Sep 2024 10:12:34 +0800 Subject: [PATCH 1/4] Ensure to_be_added_bindprimary_keys targets only the correct binding members Update galaxy.yaml, Makefile, and changelog (2.6.2) --- CHANGELOG.md | 7 +++++++ Makefile | 2 +- galaxy.yml | 2 +- plugins/module_utils/module_executor.py | 5 ++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d87e2001b..e1817e38a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.6.2] - 2024-09-18 + +### Fixed + +- Ensure to_be_added_bindprimary_keys targets only the correct binding members ([#457]) + ## [2.6.1] - 2024-04-29 ### Fixed @@ -169,3 +175,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#367]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/367 [#377]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/377 [#400]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/400 +[#457]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/457 diff --git a/Makefile b/Makefile index b6383a523..af8905980 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ build: ansible-galaxy collection build --force galaxy_importer: build - python3 -m galaxy_importer.main netscaler-adc-2.2.0.tar.gz + python3 -m galaxy_importer.main netscaler-adc-2.6.2.tar.gz # build_docs: # rm -rf _built_docs diff --git a/galaxy.yml b/galaxy.yml index 7ca197e55..7b6d099fb 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -7,7 +7,7 @@ namespace: netscaler # The name of the collection. Has the same character restrictions as 'namespace' name: adc # The version of the collection. Must be compatible with semantic versioning -version: 2.6.1 +version: 2.6.2 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md # A list of the collection's content authors. Can be just the name or in the format 'Full Name (url) diff --git a/plugins/module_utils/module_executor.py b/plugins/module_utils/module_executor.py index 6c3c4eb08..e7254dbe9 100644 --- a/plugins/module_utils/module_executor.py +++ b/plugins/module_utils/module_executor.py @@ -672,7 +672,10 @@ def sync_single_binding(self, binding_name): if to_be_added_bindprimary_keys: self.add_bindings( binding_name=binding_name, - desired_bindings=desired_binding_members, + desired_bindings=[ + x for x in desired_binding_members + if x[get_bindprimary_key(binding_name, x)] in to_be_added_bindprimary_keys + ], ) # If there is any default bindings, after adding the custom bindings, the default bindings will be deleted automatically From b1fc0ff496a0acf2f2a345746d70bb71dcab9a83 Mon Sep 17 00:00:00 2001 From: Sumanth Lingappa <42572246+sumanth-lingappa@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:52:37 +0530 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1817e38a..63236c822 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Ensure to_be_added_bindprimary_keys targets only the correct binding members ([#457]) +- Ensure to_be_added_bindprimary_keys targets only the correct binding members ([#462]) ## [2.6.1] - 2024-04-29 From 5717fb7bf63dc08fe55ac1b59194018842ce7ff8 Mon Sep 17 00:00:00 2001 From: Sumanth Lingappa <42572246+sumanth-lingappa@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:53:25 +0530 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63236c822..2a7618c2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -175,4 +175,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#367]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/367 [#377]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/377 [#400]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/400 -[#457]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/457 +[#462]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/462 From 53455cbb076e6738e184380207c241275494bf19 Mon Sep 17 00:00:00 2001 From: Sumanth Lingappa <42572246+sumanth-lingappa@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:54:28 +0530 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a7618c2c..6ca643800 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [2.6.2] - 2024-09-18 +## [2.6.2] - 2024-10-18 ### Fixed