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

[EmbeddedAnsible] Fix stdout sanitization #1594

Merged
merged 1 commit into from
Sep 23, 2019
Merged

[EmbeddedAnsible] Fix stdout sanitization #1594

merged 1 commit into from
Sep 23, 2019

Conversation

NickLaMuro
Copy link
Member

@NickLaMuro NickLaMuro commented Sep 21, 2019 •
edited
Loading

Second half of this PR ManageIQ/manageiq#19320

Since the API is now passing the full html source (for the moment), don't sanitize the HTML passed back from the API to retain it's formatting.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1753721

Before

Screen Shot 2019-09-20 at 2 51 17 PM

After

Screen Shot 2019-09-20 at 7 07 49 PM

@NickLaMuro
[EmbeddedAnsible] Fix stdout sanitization
439b310 
Since the API is now passing the full html source (for the moment) don't
sanitize the HTML passed back from the API to retain it's formatting.
@NickLaMuro
Copy link
Member Author

@miq-bot add_label ivanchuk/yes, bug, embedded ansible
@miq-bot assign @himdel

@miq-bot
Copy link
Member

miq-bot commented Sep 21, 2019

@NickLaMuro Cannot apply the following label because they are not recognized: embedded ansible

@miq-bot
Copy link
Member

miq-bot commented Sep 21, 2019

Checked commit NickLaMuro@439b310 with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍰

@himdel
Copy link
Contributor

himdel commented Sep 23, 2019 •
edited
Loading

LGTM @NickLaMuro , thanks!

Matches what ui-classic does in ansible-raw-stdout.

(Except SUI is now asking the orchestration stack for stdout, instead of the task that retrieves it, which makes me think this is probably another place where we're blocking API calls to wait for an external service response nope, just assuming such task has already run and is associated with the stack, but that's unrelated to your BZ.)

@himdel himdel merged commit 938906d into ManageIQ:master Sep 23, 2019
@himdel himdel added this to the Sprint 121 Ending Sep 30, 2019 milestone Sep 23, 2019
@himdel himdel added the blocker label Sep 23, 2019
@NickLaMuro
Copy link
Member Author

@himdel Awesome, glad I didn't bang my head against the wall for this one on Friday for nothing. Thanks for the review!

simaishi pushed a commit that referenced this pull request Sep 23, 2019
@himdel @simaishi
Merge pull request #1594 from NickLaMuro/embedded_ansible_fix_service…
9f2f21c 
…_stdout_sanitize

[EmbeddedAnsible] Fix stdout sanitization

(cherry picked from commit 938906d)

https://bugzilla.redhat.com/show_bug.cgi?id=1753721
@simaishi
Copy link
Contributor

Ivanchuk backport details:

$ git log -1
commit 9f2f21c6babe2804f1d94ff396e0caf170b62340
Author: Martin Hradil <mhradil@redhat.com>
Date:   Mon Sep 23 14:04:03 2019 +0200

    Merge pull request #1594 from NickLaMuro/embedded_ansible_fix_service_stdout_sanitize
    
    [EmbeddedAnsible] Fix stdout sanitization
    
    (cherry picked from commit 938906d4d6875af5dd5968a82215b5725bc18f6b)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1753721

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@himdel himdel

Labels
blocker bug ivanchuk/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NickLaMuro @miq-bot @himdel @simaishi