Now correctly using the API base URL, when defined, addressing #16 (#18)

Co-authored-by: Sérgio Moura <[email protected]>

github/github.go

@@ -3,8 +3,11 @@ package github
 import (
 	"context"
 	"errors"
+	"net/http"
+	"os"
 	"strings"
 
+	"github.com/bitrise-io/go-utils/log"
 	gogithub "github.com/google/go-github/v33/github"
 	"golang.org/x/oauth2"
 )
@@ -16,17 +19,37 @@ type GithubClient struct {
 
 func NewClient(accessToken string) *GithubClient {
 	ctx := context.Background()
-	ts := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: accessToken},
-	)
-	tc := oauth2.NewClient(ctx, ts)
+	tc := NewAuthTokenClient(accessToken)
 
 	return &GithubClient{
 		ctx,
 		gogithub.NewClient(tc),
 	}
 }
 
+func NewEnterpriseClient(baseURL string, accessToken string) *GithubClient {
+	ctx := context.Background()
+	tc := NewAuthTokenClient(accessToken)
+	enterpriseClient, err := gogithub.NewEnterpriseClient(baseURL, baseURL, tc)
+	if err != nil {
+		log.Errorf("Error: %s\n", err)
+		os.Exit(1)
+	}
+
+	return &GithubClient{
+		ctx,
+		enterpriseClient,
+	}
+}
+
+func NewAuthTokenClient(accessToken string) *http.Client {
+	ctx := context.Background()
+	ts := oauth2.StaticTokenSource(
+		&oauth2.Token{AccessToken: accessToken},
+	)
+	return oauth2.NewClient(ctx, ts)
+}
+
 func (c *GithubClient) CreateComment(owner, repo string, issueNumber int, body string) (*gogithub.IssueComment, error) {
 	commentToCreate := gogithub.IssueComment{Body: &body}
 	comment, _, err := c.Issues.CreateComment(c.Context, owner, repo, issueNumber, &commentToCreate)

main.go

@@ -41,7 +41,13 @@ func main() {
 	owner, repo := ownerAndRepo(conf.RepositoryURL)
 	commentBody := conf.Body
 
-	githubClient := github.NewClient(string(conf.AuthToken))
+	var githubClient *github.GithubClient
+
+	if conf.APIBaseURL == "" {
+		githubClient = github.NewClient(string(conf.AuthToken))
+	} else {
+		githubClient = github.NewEnterpriseClient(conf.APIBaseURL, string(conf.AuthToken))
+	}
 
 	// if tag is set, try to find and update existing comment
 	if conf.UpdateCommentTag != "" {