Skip to content
This repository was archived by the owner on Sep 18, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions internal/github/pr._test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package github

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestParseGithubURL(t *testing.T) {
url := "https://github.com/foo/bar"
var enterprise bool
var baseURL string
var exists string
var err error

enterprise, baseURL, exists, _, err = parseGitHubURL(url)
require.NoError(t, err)
require.Equal(t, false, enterprise)
require.Equal(t, "https://github.com", baseURL)
require.Equal(t, "foo", exists)

url = "https://mygithub.co.uk/foo-BAR/bar"
// url = "https://otherdomain.example/baz/bar"
enterprise, baseURL, exists, _, err = parseGitHubURL(url)
require.NoError(t, err)
require.Equal(t, true, enterprise)
require.Equal(t, "https://mygithub.co.uk", baseURL)
require.Equal(t, "foo-BAR", exists)
// file = "bogus.go"
// exists, err = Exists(file)
// require.NoError(t, err)
// require.False(t, exists)
}
51 changes: 38 additions & 13 deletions internal/github/pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,36 @@ func OpenPR(
commitBranch string,
repoCreds git.RepoCredentials,
) (string, error) {
owner, repo, err := parseGitHubURL(repoURL)
var baseURL string
isEnterprise, baseURL, owner, repo, err := parseGitHubURL(repoURL)
if err != nil {
return "", err
}
githubClient := github.NewClient(
oauth2.NewClient(
ctx,
oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: repoCreds.Password},
var githubClient *github.Client
if isEnterprise {
githubClient, err = github.NewEnterpriseClient(
baseURL,
baseURL,
oauth2.NewClient(
ctx,
oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: repoCreds.Password},
),
),
),
)
)
if err != nil {
return "", err
}
} else {
githubClient = github.NewClient(
oauth2.NewClient(
ctx,
oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: repoCreds.Password},
),
),
)
}
pr, _, err := githubClient.PullRequests.Create(
ctx,
owner,
Expand All @@ -57,11 +75,18 @@ func OpenPR(
return *pr.HTMLURL, nil
}

func parseGitHubURL(url string) (string, string, error) {
regex := regexp.MustCompile(`^https\://github\.com/([\w-]+)/([\w-]+).*`)
func parseGitHubURL(url string) (bool, string, string, string, error) {
// regex := regexp.MustCompile(`^https\://github\.[\w]/([\w-]+)/([\w-]+).*`)
regex := regexp.MustCompile(`^https\://([\w.-]+)/([\w-]+)/([\w-]+).*`)
parts := regex.FindStringSubmatch(url)
if len(parts) != 3 {
return "", "", fmt.Errorf("error parsing github repository URL %q", url)
if len(parts) != 4 {
return false, "", "", "", fmt.Errorf("error parsing github repository URL %q", url)
}
isEnterprise := false
if parts[1] != "github.com" {
isEnterprise = true
}
return parts[1], parts[2], nil
baseURL := "https://" + parts[1]

return isEnterprise, baseURL, parts[2], parts[3], nil
}