ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 03:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[PR #6720/6bff57ee backport][stable-7] Fix multiple issues with the TSS lookup plugin when using fetch_attachments (#6751)

Browse source 
Fix multiple issues with the TSS lookup plugin when using fetch_attachments (#6720)

* Treat files as binary when downloading attachments

* Raise a warning when the attachment can't be read

* Set the 'itemValue' for files, even when they can't be read

* Always return the original secret content

* Add changelog

* Fix changelog

* Update changelog

Co-authored-by: Felix Fontein <felix@fontein.de>

* Revert "Always return the original secret content"

This reverts commit a9fb96e165.

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 6bff57ee6e)

Co-authored-by: laszlojau <49835454+laszlojau@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2023-06-20 18:52:58 +02:00 • committed by GitHub
parent ba559d24cd
commit 50eb0a95de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/6720-tss-fix-fetch-attachments.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "tss lookup plugin - fix multiple issues when using ``fetch_attachments=true`` (https://github.com/ansible-collections/community.general/pull/6720)."

10
plugins/lookup/tss.py
View file

@ -289,11 +289,15 @@ class TSSClient(object):
if file_download_path and os.path.isdir(file_download_path): if file_download_path and os.path.isdir(file_download_path):
if i['isFile']: if i['isFile']:
try: try:
with open(os.path.join(file_download_path, str(obj['id']) + "_" + i['slug']), "w") as f: file_content = i['itemValue'].content
f.write(i['itemValue'].text) with open(os.path.join(file_download_path, str(obj['id']) + "_" + i['slug']), "wb") as f:
i['itemValue'] = "*** Not Valid For Display ***" f.write(file_content)
except ValueError: except ValueError:
raise AnsibleOptionsError("Failed to download {0}".format(str(i['slug']))) raise AnsibleOptionsError("Failed to download {0}".format(str(i['slug'])))
except AttributeError:
display.warning("Could not read file content for {0}".format(str(i['slug'])))
finally:
i['itemValue'] = "*** Not Valid For Display ***"
else: else:
raise AnsibleOptionsError("File download path does not exist") raise AnsibleOptionsError("File download path does not exist")
return obj return obj