Merge branch 'main' into passwordchange

netscaler · Oct 25, 2024 · 548c2fb · 548c2fb
2 parents 26d3c94 + bed278f
commit 548c2fb
Show file tree

Hide file tree

Showing 5 changed files with 906 additions and 3 deletions.
diff --git 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-10-18
+
+### Fixed
+
+- Ensure to_be_added_bindprimary_keys targets only the correct binding members ([#462])
+
 ## [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
+[#462]: https://github.com/netscaler/ansible-collection-netscaleradc/issues/462
diff --git 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
@@ -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 <email> (url)

diff --git 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