fix issue with ghe deep link

Author: bradrydzewski

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Improve status display text in new bitbucket pull request screen, from [@bradrydzewski](https://github.com/bradrydzewski). See [#27](https://github.com/drone/go-scm/issues/27).
 
+### Fixed
+- Fix issue with GitHub enterprise deep link including API prefix, from [@bradrydzewski](https://github.com/bradrydzewski).
+
 ## [1.6.0]
 ### Added
 - Support Head and Base sha for GitHub pull request, from [@bradrydzewski](https://github.com/bradrydzewski).

scm/driver/github/github.go

@@ -25,15 +25,16 @@ func New(uri string) (*scm.Client, error) {
 	if !strings.HasSuffix(base.Path, "/") {
 		base.Path = base.Path + "/"
 	}
-	home := base.String()
-	if home == "https://api.github.com/" {
-		home = "https://github.com/"
-	}
+	// home := base.String()
+	// if home == "https://api.github.com/" {
+	// 	home = "https://github.com/"
+	// }
+
 	client := &wrapper{new(scm.Client)}
 	client.BaseURL = base
 	// initialize services
 	client.Driver = scm.DriverGithub
-	client.Linker = &linker{home}
+	client.Linker = &linker{websiteAddress(base)}
 	client.Contents = &contentService{client}
 	client.Git = &gitService{client}
 	client.Issues = &issueService{client}
@@ -126,3 +127,14 @@ type Error struct {
 func (e *Error) Error() string {
 	return e.Message
 }
+
+// helper function converts the github API url to
+// the website url.
+func websiteAddress(u *url.URL) string {
+	host, proto := u.Host, u.Scheme
+	switch host {
+	case "api.github.com":
+		return "https://github.com/"
+	}
+	return proto + "://" + host + "/"
+}

scm/driver/github/github_test.go

@@ -5,6 +5,7 @@
 package github
 
 import (
+	"net/url"
 	"testing"
 
 	"github.com/drone/go-scm/scm"
@@ -96,3 +97,23 @@ func testRequest(res *scm.Response) func(t *testing.T) {
 		}
 	}
 }
+
+func TestWebsiteAddress(t *testing.T) {
+	tests := []struct {
+		api string
+		web string
+	}{
+		{"https://api.github.com/", "https://github.com/"},
+		{"https://api.github.com", "https://github.com/"},
+		{"https://github.acme.com/api/v3", "https://github.acme.com/"},
+		{"https://github.acme.com/api/v3/", "https://github.acme.com/"},
+	}
+
+	for _, test := range tests {
+		parsed, _ := url.Parse(test.api)
+		got, want := websiteAddress(parsed), test.web
+		if got != want {
+			t.Errorf("Want website address %q, got %q", want, got)
+		}
+	}
+}

scm/driver/github/linker_test.go

@@ -97,7 +97,7 @@ func TestDiff(t *testing.T) {
 }
 
 func TestLink_GitHub_Enterprise(t *testing.T) {
-	client, _ := New("https://github.acme.com")
+	client, _ := New("https://github.acme.com/api/v3")
 	ref := scm.Reference{
 		Path: "refs/heads/master",
 		Sha:  "a7389057b0eb027e73b32a81e3c5923a71d01dde",
@@ -112,3 +112,14 @@ func TestLink_GitHub_Enterprise(t *testing.T) {
 		t.Errorf("Want link %q, got %q", want, got)
 	}
 }
+
+func TestLinkBase(t *testing.T) {
+	if got, want := NewDefault().Linker.(*linker).base, "https://github.com/"; got != want {
+		t.Errorf("Want url %s, got %s", want, got)
+	}
+
+	client, _ := New("https://github.acme.com/api/v3")
+	if got, want := client.Linker.(*linker).base, "https://github.acme.com/"; got != want {
+		t.Errorf("Want url %s, got %s", want, got)
+	}
+}