fix Enterprise server URL

Author: eksrha

src/acigithub/github-client.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"strings"
 
 	"github.com/google/go-github/v39/github"
 	"golang.org/x/oauth2"
@@ -15,7 +14,7 @@ import (
 var (
 	GithubClient                         *github.Client
 	ctx                                  = context.Background()
-	githubServerUrl, isgithubServerUrl   = os.LookupEnv("GITHUB_ENTERPRISE_SERVER_URL")
+	githubServerUrl, isgithubServerUrl   = os.LookupEnv("GITHUB_SERVER_URL")
 	githubRepository, isgithubRepository = os.LookupEnv("GITHUB_REPOSITORY")
 	githubToken, isgithubToken           = os.LookupEnv("GITHUB_TOKEN")
 	owner, repo                          string
@@ -34,15 +33,14 @@ func NewGitHubClient() (githubClient *github.Client, err error) {
 	)
 	githubTc := oauth2.NewClient(context.Background(), gitHubTs)
 
-	if !strings.HasSuffix(githubServerUrl, "/") {
-		githubServerUrl = githubServerUrl + "/"
-	}
-	uploadUrl := fmt.Sprintf("%sapi/uploads/", githubServerUrl)
-
 	if isgithubServerUrl {
-		githubClient, err = github.NewEnterpriseClient(githubServerUrl, uploadUrl, githubTc)
-		if err != nil {
-			return nil, fmt.Errorf("error at initializing github client: %v", err)
+		if githubServerUrl != "https://github.com" {
+			githubClient, err = github.NewEnterpriseClient(githubServerUrl, githubServerUrl, githubTc)
+			if err != nil {
+				return nil, fmt.Errorf("error at initializing github client: %v", err)
+			}
+		} else {
+			githubClient = github.NewClient(githubTc)
 		}
 	} else {
 		githubClient = github.NewClient(githubTc)