set insteadOf url for org-id #621
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
ericsciple
commented
Nov 1, 2021
| `git config --local '${this.insteadOfKey}' '${this.insteadOfValue}'`, | ||
| this.settings.nestedSubmodules | ||
| ) | ||
| for (const insteadOfValue of this.insteadOfValues) { |
There was a problem hiding this comment.
this is for submodule config (recursive submodules)
ericsciple
commented
Nov 1, 2021
| @@ -63,7 +63,12 @@ class GitAuthHelper { | |||
|
|
|||
| // Instead of SSH URL | |||
| this.insteadOfKey = `url.${serverUrl.origin}/.insteadOf` // "origin" is SCHEME://HOSTNAME[:PORT] | |||
| this.insteadOfValue = `git@${serverUrl.hostname}:` | |||
| this.insteadOfValues.push(`git@${serverUrl.hostname}:`) | |||
| if (this.settings.workflowOrganizationId) { | |||
There was a problem hiding this comment.
register extra prefix now
ericsciple
commented
Nov 1, 2021
| @@ -118,7 +123,9 @@ class GitAuthHelper { | |||
| // Configure HTTPS instead of SSH | |||
| await this.git.tryConfigUnset(this.insteadOfKey, true) | |||
| if (!this.settings.sshKey) { | |||
| await this.git.config(this.insteadOfKey, this.insteadOfValue, true) | |||
| for (const insteadOfValue of this.insteadOfValues) { | |||
| await this.git.config(this.insteadOfKey, insteadOfValue, true, true) | |||
There was a problem hiding this comment.
when configuring auth, now we register multiple instead-of values
this translates submodule URLs like:
[email protected]:my-org/my-submodule.git -> https://github.com/my-org/my-submodule.git
[email protected]:my-org/my-submodule.git -> https://github.com/my-org/my-submodule.git
ericsciple
commented
Nov 1, 2021
| ]) | ||
| const args: string[] = ['config', globalConfig ? '--global' : '--local'] | ||
| if (add) { | ||
| args.push('--add') |
There was a problem hiding this comment.
this is required in order to add two insteadOf URLs
There was a problem hiding this comment.
Try out running checkout on two separate occasions (i.e. the repo is not deleted in between runs).
ericsciple
commented
Nov 1, 2021
| /** | ||
| * Gets the organization ID of the running workflow or undefined if the value cannot be loaded from the GITHUB_EVENT_PATH | ||
| */ | ||
| export async function getOrganizationId(): Promise<number | undefined> { |
There was a problem hiding this comment.
best effort, debug log if can't load
|
Changes LGTM 👍 . The only thing pending to test is that |
juliobbv
approved these changes
Nov 1, 2021
Oriblish
reviewed
Feb 19, 2022
| /** | ||
| * Gets the organization ID of the running workflow or undefined if the value cannot be loaded from the GITHUB_EVENT_PATH | ||
| */ | ||
| export async function getOrganizationId(): Promise<number | undefined> { |
|
🧩 |
nekketsuuu
added a commit
to nekketsuuu/checkout
that referenced
this pull request
Oct 10, 2022
GitHub Enterprise Server can show a SSH URLs that includes organization ID, too: https://docs.github.com/en/[email protected]/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities#about-ssh-urls-with-ssh-certificates Follow-up: ec3a7ce (<actions#621>)
nekketsuuu
added a commit
to nekketsuuu/checkout
that referenced
this pull request
Oct 10, 2022
GitHub Enterprise Server can show a SSH URLs that includes organization ID, too: https://docs.github.com/en/[email protected]/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities#about-ssh-urls-with-ssh-certificates Follow-up: ec3a7ce 🔗 actions#621
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.
fixes #570
When ssl certificate authentication is enabled, the clone UI suggested in the UI is like
org-<ORG_ID>@github.com:<ORG>/<REPO>.gitinstead of the normal format[email protected]:<ORG>/<REPO>.gitWe need to register a git config
insteadOfurl to handle the new format. Today users set the inputsubmodules: trueand the inputssh-keyis not provided, we register an insteadOf config so SSH URLs beginning with[email protected]:are converted to HTTPS. We need to do the same thing for the new format.