kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-30 18:01:21 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4986 from KnVerey/repospec_custom_usernames

Browse Source 
repospec: support ssh urls with ssh certificates
This commit is contained in:
Kubernetes Prow Robot
2023-01-20 13:23:54 -08:00
committed by GitHub
parent 0a1aa7c2cb 2405da65d2
commit a69092c4b7
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/internal/git/repospec.go
View File

@@ -8,6 +8,7 @@ import (
"log"
"net/url"
"path/filepath"
"regexp"
"strconv"
"strings"
"time"
@@ -343,8 +344,10 @@ func extractScheme(s string) (string, string) {
}
func extractUsername(s string) (string, string) {
if trimmed, found := trimPrefixIgnoreCase(s, gitUsername); found {
return gitUsername, trimmed
var userRegexp = regexp.MustCompile(`^([a-zA-Z][a-zA-Z0-9-]*)@`)
if m := userRegexp.FindStringSubmatch(s); m != nil {
username := m[1] + "@"
return username, s[len(username):]
}
return "", s
}
@@ -375,8 +378,6 @@ func findPathSeparator(hostPath string, acceptSCP bool) int {
return sepIndex
}
const gitUsername = "git@"
func normalizeGithubHostParts(scheme, username string) (string, string, string) {
if strings.HasPrefix(scheme, sshScheme) || username != "" {
return "", username, "github.com:"