Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace: devolutions
name: dvls
version: 1.2.2
version: 1.2.3
readme: README.md
authors:
- Danny Bédard <devops@devolutions.net>
Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/vaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ def get_vault_entries(server_base_url, token, vault_id):
raise Exception(f"An error occurred while getting vault entries: {e}")


def find_entry_by_name(entries, name):
def find_entry_by_name(entries, name, path=""):
for entry in entries:
if entry.get("name") == name:
if entry.get("name") == name and entry.get("path") == path:
return entry
return None
8 changes: 6 additions & 2 deletions plugins/modules/create_secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,13 @@ def run_module():
password = secret.get("value")
secret_type = secret.get("secret_type")
secret_subtype = secret.get("secret_subtype")
secret_path = secret.get("secret_path")
description = secret.get("secret_description")

if secret.get("secret_path") is None:
secret_path = ""
else:
secret_path = secret.get("secret_path")

vault_id = module.params.get("vault_id")

try:
Expand All @@ -178,7 +182,7 @@ def run_module():
)

# when an existing entry is found, it gets updated. Otherwise a new entry gets created
entry = find_entry_by_name(path_entries, secret_name)
entry = find_entry_by_name(path_entries, secret_name, secret_path)
if entry:
vault_url = f"{server_base_url}/api/v1/vault/{vault_id}/entry/{entry['id']}"
response = requests.put(vault_url, headers=vault_headers, json=vault_body)
Expand Down