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.

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

ACME: improve error handling #49266

Merged
merged 3 commits into from
Nov 29, 2018

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Two general ACME improvements extracted from #48444, which should be backported:

  1. In case parse_json_result is False and an error occurs, returns the return body instead of {};
  2. Remove the return body from the info dict. (So if someone dumps the info dict, it will only contain headers etc.).
ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

lib/ansible/module_utils/acme.py

@ansibot
Copy link
Contributor

ansibot commented Nov 28, 2018

Hi @felixfontein, thank you for submitting this pull-request!

click here for bot help

@ansibot
Copy link
Contributor

ansibot commented Nov 28, 2018

cc @resmo
click here for bot help

@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 bug This issue/PR relates to a bug. community_review In order to be merged, this PR must follow the community review workflow. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. labels Nov 28, 2018
@resmo
Copy link
Contributor

resmo commented Nov 29, 2018

shipit

@ansibot ansibot added shipit This PR is ready to be merged by Core and removed community_review In order to be merged, this PR must follow the community review workflow. needs_triage Needs a first human triage before being processed. labels Nov 29, 2018
@resmo resmo merged commit b842b1b into ansible:devel Nov 29, 2018
@felixfontein felixfontein deleted the acme-improve-error-handling branch November 29, 2018 20:24
@felixfontein
Copy link
Contributor Author

@resmo thanks for reviewing and merging!

felixfontein added a commit to felixfontein/ansible that referenced this pull request Nov 29, 2018
* Improve error handling: when parse_json_result is False, still return the error message.

* Remove content body from info dict.

* Add changelog.

(cherry picked from commit b842b1b)
felixfontein added a commit to felixfontein/ansible that referenced this pull request Dec 2, 2018
felixfontein added a commit to felixfontein/ansible that referenced this pull request Dec 2, 2018
abadger pushed a commit that referenced this pull request Dec 4, 2018
* Improve error handling: when parse_json_result is False, still return the error message.

* Remove content body from info dict.

* Add changelog.

(cherry picked from commit b842b1b)
abadger pushed a commit that referenced this pull request Dec 4, 2018
kbreit pushed a commit to kbreit/ansible that referenced this pull request Jan 11, 2019
@dagwieers dagwieers added the crypto Crypto community (ACME, openssl, letsencrypt) label Feb 7, 2019
@ansible ansible locked and limited conversation to collaborators Jul 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.8 This issue/PR affects Ansible v2.8 bug This issue/PR relates to a bug. crypto Crypto community (ACME, openssl, letsencrypt) shipit This PR is ready to be merged by Core support:community This issue/PR relates to code supported by the Ansible community.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants