minor improvements to auth plugins #17041
Merged
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
memsharded
commented
Sep 23, 2024
| if args.username is not None and args.username != user: | ||
| raise ConanException(f"User '{args.username}' doesn't match user '{user}' in " | ||
| f"credentials.json or environment variables") | ||
| if args.username is not None and args.password is not None: |
There was a problem hiding this comment.
This is the main change. I removed the password argument in the creds.auth(), it was confusing and it made you add it in your PR, because I think the argument was not right in the first place
| @@ -33,11 +33,11 @@ class _SourceURLCredentials: | |||
| """ | |||
| def __init__(self, cache_folder): | |||
| self._urls = {} | |||
| self.auth_source_plugin = None | |||
| self._auth_source_plugin = None | |||
There was a problem hiding this comment.
Prefer private by default
| def _load_auth_source_plugin(auth_source_plugin_path): | ||
| if os.path.exists(auth_source_plugin_path): | ||
| mod, _ = load_python_file(auth_source_plugin_path) | ||
| if hasattr(mod, "auth_source_plugin"): | ||
| return mod.auth_source_plugin | ||
| return getattr(mod, "auth_source_plugin", None) |
There was a problem hiding this comment.
More pythonic, single instruction, better than check-then-return
| class RemoteCredentials: | ||
| def __init__(self, cache_folder, global_conf): | ||
| self._global_conf = global_conf | ||
| self._urls = {} | ||
| self.auth_remote_plugin = _load_auth_remote_plugin(HomePaths(cache_folder).auth_remote_plugin_path) | ||
| auth_plugin_path = HomePaths(cache_folder).auth_remote_plugin_path | ||
| self._auth_remote_plugin = _load_auth_remote_plugin(auth_plugin_path) |
| class RemoteCredentials: | ||
| def __init__(self, cache_folder, global_conf): | ||
| self._global_conf = global_conf | ||
| self._urls = {} | ||
| self.auth_remote_plugin = _load_auth_remote_plugin(HomePaths(cache_folder).auth_remote_plugin_path) | ||
| auth_plugin_path = HomePaths(cache_folder).auth_remote_plugin_path |
| @@ -82,8 +80,8 @@ def _get_env(remote, user): | |||
| ConanOutput().info("Got password '******' from environment") | |||
| return user, passwd | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Pep8 says 2 blank lines here (enabling some linter in your IDE will make this highlighted)
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.
Changelog: Omit
Docs: Omit