Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix aws_ssm when Powershell uses CLIXML #2080

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix aws_ssm when Powershell uses CLIXML #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dc78e1
If the return code contains #CLIXML (like a progress bar) remove it
matpompili Apr 22, 2024
11e6341
lint with black
matpompili Apr 23, 2024
ec2830f
added changelog fragment
matpompili Apr 26, 2024
0d4f36c
Merge branch 'main' into fix_aws_ssm_with_clixml
matpompili Jul 26, 2024
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: 2 additions & 0 deletions changelogs/fragments/20240426_fix_ssm_clixml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- ssm - strip Powershell CLIXML from stdout (https://github.com/ansible-collections/community.aws/issues/1952).
4 changes: 4 additions & 0 deletions plugins/connection/aws_ssm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,10 @@ def _post_process(self, stdout, mark_begin):
# output to keep will be before the mark
stdout = stdout[:stdout.rfind(mark_begin)] # fmt: skip

# If the return code contains #CLIXML (like a progress bar) remove it
clixml_filter = re.compile(r"#<\sCLIXML\s<Objs.*</Objs>")
stdout = clixml_filter.sub("", stdout)

# If it looks like JSON remove any newlines
if stdout.startswith("{"):
stdout = stdout.replace("\n", "")
Expand Down
Loading