helm/chart-testing
1
0
Fork 0
mirror of https://github.com/helm/chart-testing.git synced 2026-02-05 09:45:14 +01:00
Code Issues Activity

bug(493): Improved git remote parsing (#726)

Browse Source 
* bug(493): Improved git remote parsing

Previously this would fail to parse git remotes like:

ssh://github.com/foo/bar
ssh://github.com:2222/foo/bar

This properly parses hostname from both URLs and scp style remotes.

Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>

* Fix lint issue

Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>

---------

Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
This commit is contained in:
Rickard von Essen
2025-06-02 15:49:32 +02:00
committed by GitHub
parent dac2d60e7a
commit 75d3cfc4f1
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/tool/account.go
View File

@@ -17,12 +17,13 @@ package tool
import (
"fmt"
"net/http"
"net/url"
"regexp"
)
type AccountValidator struct{}
var repoDomainPattern = regexp.MustCompile("(?:https://(?:[^@:]+:[^@:]+@)?|git@)([^/:]+)")
var scpStylePattern = regexp.MustCompile("^(?:[^@]+@)?(?<host>[^@/:]+):.+$")
func (v AccountValidator) Validate(repoURL string, account string) error {
domain, err := parseOutGitRepoDomain(repoURL)
@@ -41,10 +42,15 @@ func (v AccountValidator) Validate(repoURL string, account string) error {
}
func parseOutGitRepoDomain(repoURL string) (string, error) {
// This works for GitHub, Bitbucket, and Gitlab
submatch := repoDomainPattern.FindStringSubmatch(repoURL)
if len(submatch) < 2 {
return "", fmt.Errorf("could not parse git repository domain for %q", repoURL)
// Git remotes can be either URLs or scp style remotes
parsedURL, err := url.Parse(repoURL)
if err != nil || len(parsedURL.Hostname()) < 1 {
submatch := scpStylePattern.FindStringSubmatch(repoURL)
if len(submatch) < 2 || len(submatch[1]) < 1 {
return "", fmt.Errorf("could not parse git repository domain for %q", repoURL)
}
return submatch[1], nil
}
return submatch[1], nil
return parsedURL.Hostname(), nil
}

9
pkg/tool/account_test.go
View File

@@ -15,6 +15,9 @@ func TestParseOutGitDomain(t *testing.T) {
err error
}{
{"GitHub SSH", "git@github.com:foo/bar", "github.com", nil},
{"GitHub SSH 2", "ssh://github.com/foo/bar", "github.com", nil},
{"GitHub SSH 3", "ssh://git@github.com:2222/foo/bar", "github.com", nil},
{"GitHub SSH 4", "ssh://github.com:2222/foo/bar", "github.com", nil},
{"GitHub HTTPS", "https://github.com/foo/bar", "github.com", nil},
{"GitHub HTTPS with username/password", "https://foo:token@github.com/foo/bar", "github.com", nil},
{"Gitlab SSH", "git@gitlab.com:foo/bar", "gitlab.com", nil},
@@ -23,13 +26,15 @@ func TestParseOutGitDomain(t *testing.T) {
{"Bitbucket SSH", "git@bitbucket.com:foo/bar", "bitbucket.com", nil},
{"Bitbucket HTTPS", "https://bitbucket.com/foo/bar", "bitbucket.com", nil},
{"Bitbucket HTTPS with username/password", "https://user:pass@bitbucket.com/foo/bar", "bitbucket.com", nil},
{"Invalid", "foo/bar", "", fmt.Errorf("could not parse git repository domain for \"foo/bar\"")},
{"Domain name without dot", "foo/bar", "", fmt.Errorf("could not parse git repository domain for \"foo/bar\"")},
{"Domain name without dot 2", "foo/some/path/bar.git", "", fmt.Errorf("could not parse git repository domain for \"foo/some/path/bar.git\"")},
{"Invalid", "user@:2222/bar", "", fmt.Errorf("could not parse git repository domain for \"user@:2222/bar\"")},
}
for _, testData := range testDataSlice {
t.Run(testData.name, func(t *testing.T) {
actual, err := parseOutGitRepoDomain(testData.repoURL)
assert.Equal(t, err, testData.err)
assert.Equal(t, testData.err, err)
assert.Equal(t, testData.expected, actual)
})
}