Skip to content

bug: fix slug regex for rcp style remotes #5950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sh41 wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −15
Open

bug: fix slug regex for rcp style remotes #5950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/common/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
codeCommitHTTPRegex = regexp.MustCompile(`^https?://git-codecommit\.(.+)\.amazonaws.com/v1/repos/(.+)$`)
codeCommitSSHRegex = regexp.MustCompile(`ssh://git-codecommit\.(.+)\.amazonaws.com/v1/repos/(.+)$`)
githubHTTPRegex = regexp.MustCompile(`^https?://.*github.com.*/(.+)/(.+?)(?:.git)?$`)
githubSSHRegex = regexp.MustCompile(`github.com[:/](.+)/(.+?)(?:.git)?$`)
githubSSHRegex = regexp.MustCompile(`github.com(?::/?|/)(.+)/(.+?)(?:.git)?$`)

cloneLock sync.Mutex

Expand Down Expand Up @@ -209,7 +209,7 @@ func findGitSlug(url string, githubInstance string) (string, string, error) {
return "GitHub", fmt.Sprintf("%s/%s", matches[1], matches[2]), nil
} else if githubInstance != "github.com" {
gheHTTPRegex := regexp.MustCompile(fmt.Sprintf(`^https?://%s/(.+)/(.+?)(?:.git)?$`, githubInstance))
gheSSHRegex := regexp.MustCompile(fmt.Sprintf(`%s[:/](.+)/(.+?)(?:.git)?$`, githubInstance))
gheSSHRegex := regexp.MustCompile(fmt.Sprintf(`%s(?::/?|/)(.+)/(.+?)(?:.git)?$`, githubInstance))
if matches := gheHTTPRegex.FindStringSubmatch(url); matches != nil {
return "GitHubEnterprise", fmt.Sprintf("%s/%s", matches[1], matches[2]), nil
} else if matches := gheSSHRegex.FindStringSubmatch(url); matches != nil {
Expand Down
53 changes: 40 additions & 13 deletions pkg/common/git/git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

func TestFindGitSlug(t *testing.T) {
assert := assert.New(t)
asserter := assert.New(t)

var slugTests = []struct {
url string // input
Expand All @@ -28,6 +28,7 @@ func TestFindGitSlug(t *testing.T) {
{"ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/my-repo", "CodeCommit", "my-repo"},
{"git@github.com:nektos/act.git", "GitHub", "nektos/act"},
{"git@github.com:nektos/act", "GitHub", "nektos/act"},
{"git@github.com:/nektos/act", "GitHub", "nektos/act"},
{"https://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"http://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"https://github.com/nektos/act", "GitHub", "nektos/act"},
Expand All @@ -39,9 +40,35 @@ func TestFindGitSlug(t *testing.T) {
for _, tt := range slugTests {
provider, slug, err := findGitSlug(tt.url, "github.com")

assert.NoError(err)
assert.Equal(tt.provider, provider)
assert.Equal(tt.slug, slug)
asserter.NoError(err)
asserter.Equal(tt.provider, provider)
asserter.Equal(tt.slug, slug)
}

var enterpriseSlugTests = []struct {
url string // input
provider string // expected result
slug string // expected result
}{
{"https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name", "CodeCommit", "my-repo-name"},
{"ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/my-repo", "CodeCommit", "my-repo"},
{"git@enterprise.com:nektos/act.git", "GitHubEnterprise", "nektos/act"},
{"git@enterprise.com:nektos/act", "GitHubEnterprise", "nektos/act"},
{"git@enterprise.com:/nektos/act", "GitHubEnterprise", "nektos/act"},
{"https://enterprise.com/nektos/act.git", "GitHubEnterprise", "nektos/act"},
{"http://enterprise.com/nektos/act.git", "GitHubEnterprise", "nektos/act"},
{"https://enterprise.com/nektos/act", "GitHubEnterprise", "nektos/act"},
{"http://enterprise.com/nektos/act", "GitHubEnterprise", "nektos/act"},
{"git+ssh://git@enterprise.com/owner/repo.git", "GitHubEnterprise", "owner/repo"},
{"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"},
}

for _, tt := range enterpriseSlugTests {
provider, slug, err := findGitSlug(tt.url, "enterprise.com")

asserter.NoError(err)
asserter.Equal(tt.provider, provider)
asserter.Equal(tt.slug, slug)
}
}

Expand Down Expand Up @@ -74,29 +101,29 @@ func cleanGitHooks(dir string) error {
}

func TestFindGitRemoteURL(t *testing.T) {
assert := assert.New(t)
asserter := assert.New(t)

basedir := testDir(t)
gitConfig()
err := gitCmd("init", basedir)
assert.NoError(err)
asserter.NoError(err)
err = cleanGitHooks(basedir)
assert.NoError(err)
asserter.NoError(err)

remoteURL := "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name"
err = gitCmd("-C", basedir, "remote", "add", "origin", remoteURL)
assert.NoError(err)
asserter.NoError(err)

u, err := findGitRemoteURL(context.Background(), basedir, "origin")
assert.NoError(err)
assert.Equal(remoteURL, u)
asserter.NoError(err)
asserter.Equal(remoteURL, u)

remoteURL = "git@github.com/AwesomeOwner/MyAwesomeRepo.git"
err = gitCmd("-C", basedir, "remote", "add", "upstream", remoteURL)
assert.NoError(err)
asserter.NoError(err)
u, err = findGitRemoteURL(context.Background(), basedir, "upstream")
assert.NoError(err)
assert.Equal(remoteURL, u)
asserter.NoError(err)
asserter.Equal(remoteURL, u)
}

func TestGitFindRef(t *testing.T) {
Expand Down