Fix Git URL rewrite issue for HTTPS URLs #952
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
Using `git config` has the disadvantage that it also changes the Git config in the development system when running the test cases. Rename `addtlCredArgs` to `addtlGitArgs` to be more generic. Use `-c` Git flag to supply specific configuration instead of using Git config.
The Git URL rewrite logic was located outside of the credentials section of the code, which means it was used in any case. However, it does not make sense to be used in combination with a HTTPS URL and basic auth. Move section as-is into the private key section and setup.
Fix credentials checks to allow for the combination of: - HTTPS URL, - private SSH key, and - Git URL rewrite enabled.
openshift-ci
bot
added
do-not-merge/release-note-label-needed
HeavyWombat
changed the title
SaschaSchwarze0
approved these changes
Nov 30, 2021
There was a problem hiding this comment.
@HeavyWombat I wonder if no release no would be more correct because we fix a bug in unreleased code ? Not sure if we ever honored this on the other hand.
/lgtm
/approve
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: SaschaSchwarze0 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
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.
Changes
Avoid using git config
Using
git confighas the disadvantage that it also changes the Git configin the development system when running the test cases.
Rename
addtlCredArgstoaddtlGitArgsto be more generic.Use
-cGit flag to supply specific configuration instead of using Git config.Move Git URL rewrite into private key section
The Git URL rewrite logic was located outside of the credentials section of the
code, which means it was used in any case. However, it does not make sense to
be used in combination with a HTTPS URL and basic auth.
Move section as-is into the private key section and setup.
Fix Git URL rewrite issue for HTTPS URLs
Fix credentials checks to allow for the combination of:
Submitter Checklist
See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.
Release Notes