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

Fix provider proxy settings fallback #17205

Merged
merged 1 commit into from
Mar 26, 2018
Merged

Conversation

agrare
Copy link
Member

@agrare agrare commented Mar 26, 2018

The VMDB::Utils.http_proxy_uri uses per-provider proxy settings first,
then falls back to the base Settings.http_proxy. It was doing this with
::Settings.http_proxy[proxy_config] || ::Settings.http_proxy but
::Settings.http_proxy[proxy_config] wasn't returning nil so it was
never falling back to the base proxy settings.

cc @Fryguy @blomquisg

The VMDB::Utils.http_proxy_uri uses per-provider proxy settings first,
then falls back to the base Settings.http_proxy.  It was doing this with
`::Settings.http_proxy[proxy_config] || ::Settings.http_proxy` but
`::Settings.http_proxy[proxy_config]` wasn't returning nil so it was
never falling back to the base proxy settings.
@miq-bot
Copy link
Member

miq-bot commented Mar 26, 2018

Checked commit agrare@edde34b with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 1 offense detected

spec/lib/vmdb/util_spec.rb

@bdunne bdunne merged commit f2f55f6 into ManageIQ:master Mar 26, 2018
@bdunne bdunne added this to the Sprint 82 Ending Mar 26, 2018 milestone Mar 26, 2018
@bdunne bdunne assigned bdunne and unassigned Fryguy Mar 26, 2018
@agrare agrare deleted the fix_proxy_settings branch March 26, 2018 20:17
@agrare
Copy link
Member Author

agrare commented Mar 26, 2018

Thanks @bdunne !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants