Extract slug from GitHub Enterprise URLs

Co-authored-by: Markus Wolf <[email protected]>
nektos · May 4, 2021 · fcf1bc5 · fcf1bc5
1 parent c15e4a7
commit fcf1bc5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/pkg/common/git.go b/pkg/common/git.go
@@ -142,12 +142,12 @@ func findGitPrettyRef(head, root, sub string) (string, error) {
 }
 
 // FindGithubRepo get the repo
-func FindGithubRepo(file string) (string, error) {
+func FindGithubRepo(file string, githubInstance string) (string, error) {
 	url, err := findGitRemoteURL(file)
 	if err != nil {
 		return "", err
 	}
-	_, slug, err := findGitSlug(url)
+	_, slug, err := findGitSlug(url, githubInstance)
 	return slug, err
 }
 
@@ -174,7 +174,7 @@ func findGitRemoteURL(file string) (string, error) {
 	return url, nil
 }
 
-func findGitSlug(url string) (string, string, error) {
+func findGitSlug(url string, githubInstance string) (string, string, error) {
 	if matches := codeCommitHTTPRegex.FindStringSubmatch(url); matches != nil {
 		return "CodeCommit", matches[2], nil
 	} else if matches := codeCommitSSHRegex.FindStringSubmatch(url); matches != nil {
@@ -183,6 +183,14 @@ func findGitSlug(url string) (string, string, error) {
 		return "GitHub", fmt.Sprintf("%s/%s", matches[1], matches[2]), nil
 	} else if matches := githubSSHRegex.FindStringSubmatch(url); matches != nil {
 		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))
+		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 {
+			return "GitHubEnterprise", fmt.Sprintf("%s/%s", matches[1], matches[2]), nil
+		}
 	}
 	return "", url, nil
 }

diff --git a/pkg/common/git_test.go b/pkg/common/git_test.go
@@ -34,7 +34,7 @@ func TestFindGitSlug(t *testing.T) {
 	}
 
 	for _, tt := range slugTests {
-		provider, slug, err := findGitSlug(tt.url)
+		provider, slug, err := findGitSlug(tt.url, "github.com")
 
 		assert.NoError(err)
 		assert.Equal(tt.provider, provider)

diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
@@ -486,7 +486,7 @@ func (rc *RunContext) getGithubContext() *githubContext {
 	}
 
 	repoPath := rc.Config.Workdir
-	repo, err := common.FindGithubRepo(repoPath)
+	repo, err := common.FindGithubRepo(repoPath, rc.Config.GitHubInstance)
 	if err != nil {
 		log.Warningf("unable to get git repo: %v", err)
 	} else {
@@ -620,7 +620,7 @@ func (rc *RunContext) withGithubEnv(env map[string]string) map[string]string {
 	env["GITHUB_SHA"] = github.Sha
 	env["GITHUB_REF"] = github.Ref
 	env["GITHUB_TOKEN"] = github.Token
-	if (rc.Config.GitHubInstance == "github.com") {
+	if rc.Config.GitHubInstance == "github.com" {
 		env["GITHUB_SERVER_URL"] = "https://github.com"
 		env["GITHUB_API_URL"] = "https://api.github.com"
 		env["GITHUB_GRAPHQL_URL"] = "https://api.github.com/graphql"