add user_name to http git #51256
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,7 @@ def get_ui_field_behaviour(cls) -> dict[str, Any]: | |
| return { | ||
| "hidden_fields": ["schema"], | ||
| "relabeling": { | ||
| "login": "Username or Access Token name", | ||
| "host": "Repository URL", | ||
| "password": "Access Token (optional)", | ||
| }, | ||
|
|
@@ -68,6 +68,7 @@ def __init__( | |
| super().__init__() | ||
| connection = self.get_connection(git_conn_id) | ||
| self.repo_url = repo_url or connection.host | ||
| self.user_name = connection.login or "user" | ||
| self.auth_token = connection.password | ||
| self.private_key = connection.extra_dejson.get("private_key") | ||
| self.key_file = connection.extra_dejson.get("key_file") | ||
|
|
@@ -89,7 +90,7 @@ def _process_git_auth_url(self): | |
| if not isinstance(self.repo_url, str): | ||
| return | ||
| if self.auth_token and self.repo_url.startswith("https://"): | ||
| self.repo_url = self.repo_url.replace("https://", f"https://{self.user_name}:{self.auth_token}@") | ||
potiuk marked this conversation as resolved.
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment. what if user is not specified, and you don't want it to be specified?
Contributor
Author
There was a problem hiding this comment. The original one does not work for gitlab. So I was thinking specifying it like this will achieve the most compatibility. Please refer to: #51256 (comment) |
||
| elif not self.repo_url.startswith("git@") or not self.repo_url.startswith("https://"): | ||
| self.repo_url = os.path.expanduser(self.repo_url) | ||
|
|
||
|
|
||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@codenamelxl it definitely seems wrong to have a default of "user" for username
why does that make sense?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is for the later logic which always enforces a "user_name".