Added no_proxy autoconfiguration from rhsm conf and tests #3507
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ahitacat
added
the
client
strider
requested changes
Aug 30, 2022
| saved_base_url = config.base_url | ||
| if ca_cert is not None: | ||
| saved_cert_verify = config.cert_verify | ||
| config.cert_verify = ca_cert | ||
| if proxy is not None: | ||
| saved_proxy = config.proxy | ||
| config.proxy = proxy | ||
| rhsm_no_proxy = None | ||
| if rhsm_no_proxy is not None or not '': | ||
| config.no_proxy = rhsm_no_proxy |
There was a problem hiding this comment.
The default value of rhsm_no_proxy is None in the function parameters. So why resetting it to None again here? And it looks like we will always pass in the conditional here.
I guess the condition should be this one:
if rhsm_no_proxy and rhsm_no_proxy != '':
insights/client/auto_config.py
Outdated
| @@ -128,6 +132,9 @@ def _try_satellite6_configuration(config): | |||
| rhsm_proxy_port = rhsm_config.get('server', 'proxy_port').strip() | |||
| rhsm_proxy_user = rhsm_config.get('server', 'proxy_user').strip() | |||
| rhsm_proxy_pass = rhsm_config.get('server', 'proxy_password').strip() | |||
| rhsm_no_proxy = rhsm_config.get('server', 'no_proxy').strip() | |||
| if rhsm_no_proxy.lower() == 'None' or rhsm_no_proxy == '': | |||
There was a problem hiding this comment.
str.lower() is supposed to return a copy of the string converted to lowercase and you compare it to None.
There was a problem hiding this comment.
oh my mistake, it needs to be compare with 'none'
Resolves: rhbz#2065233 Signed-off-by: ahitacat <[email protected]>
strider
approved these changes
Aug 30, 2022
| @@ -128,6 +131,9 @@ def _try_satellite6_configuration(config): | |||
| rhsm_proxy_port = rhsm_config.get('server', 'proxy_port').strip() | |||
| rhsm_proxy_user = rhsm_config.get('server', 'proxy_user').strip() | |||
| rhsm_proxy_pass = rhsm_config.get('server', 'proxy_password').strip() | |||
| rhsm_no_proxy = rhsm_config.get('server', 'no_proxy').strip() | |||
| if rhsm_no_proxy.lower() == 'none' or rhsm_no_proxy == '': | |||
There was a problem hiding this comment.
May be simplified as:
if rhsm_no_proxy.lower() in ['none', '']:
But it is just nitpicking here.
|
test me |
xiangce
pushed a commit
that referenced
this pull request
Sep 1, 2022
Resolves: rhbz#2065233 Signed-off-by: ahitacat <[email protected]> (cherry picked from commit 894484a)
xiangce
pushed a commit
that referenced
this pull request
Sep 6, 2024
Resolves: rhbz#2065233 Signed-off-by: ahitacat <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: ahitacat [email protected]
All Pull Requests:
Check all that apply:
Complete Description of Additions/Changes:
Insights-client wasn't honoring the no_proxy configuration of
/etc/rhsm/rhsm.conffile.This PR adds the no_proxy value to the auto-configuration module, to retrieve the value of the rhsm configuration file. It provides some tests related to this.
This fix is related to: [rhbz#2065233]((https://bugzilla.redhat.com/show_bug.cgi?id=2065233)