bugfix - Prevent passwordstore lookup to create subkey when create ==…

… false Fixes#9105
ansible-collections · Feb 4, 2025 · 1165453 · 1165453
1 parent e13d6de
commit 1165453
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/changelogs/fragments/9106-passwordstore-fix-subkey-creation-even-when-create-==-false.yml b/changelogs/fragments/9106-passwordstore-fix-subkey-creation-even-when-create-==-false.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - passwordstore lookup plugin - Fix subkey creation even when `create == false` (https://github.com/ansible-collections/community.general/pull/9106). 
diff --git a/plugins/lookup/passwordstore.py b/plugins/lookup/passwordstore.py
@@ -579,10 +579,7 @@ def run(self, terms, variables, **kwargs):
             self.parse_params(term)   # parse the input into paramvals
             with self.opt_lock('readwrite'):
                 if self.check_pass():     # password exists
-                    if self.paramvals['overwrite']:
-                        with self.opt_lock('write'):
-                            result.append(self.update_password())
-                    elif self.paramvals["subkey"] != "password" and not self.passdict.get(self.paramvals['subkey']):  # password exists but not the subkey
+                    if self.paramvals['overwrite'] or (self.paramvals["subkey"] == "password" and not self.passdict.get(self.paramvals['subkey'])): # if "overwrite", always update password, otherwise update password when it exists but not the subkey
                         with self.opt_lock('write'):
                             result.append(self.update_password())
                     else:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- passwordstore lookup plugin - Fix subkey creation even when `create == false` (https://github.com/ansible-collections/community.general/pull/9106).