Merge pull request runatlantis#23 from hootsuite/anubhavmishra-patch-1

fixing default github api url
meringu · Jun 12, 2017 · 1d741cb · 1d741cb
2 parents d1bda5f + 0d296be
commit 1d741cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/server.go b/cmd/server.go
@@ -36,6 +36,7 @@ var stringFlags = []stringFlag{
 	{
 		name:        ghHostnameFlag,
 		description: "Hostname of Github installation.",
+		value: "api.github.com",
 	},
 	{
 		name:        logLevelFlag,

diff --git a/server/server.go b/server/server.go
@@ -87,7 +87,11 @@ func NewServer(config ServerConfig) (*Server, error) {
 	}
 	githubBaseClient := github.NewClient(tp.Client())
 	githubClientCtx := context.Background()
-	githubBaseClient.BaseURL, _ = url.Parse(fmt.Sprintf("https://%s/api/v3/", config.GitHubHostname))
+	ghHostname := fmt.Sprintf("https://%s/api/v3/", config.GitHubHostname)
+	if config.GitHubHostname == "api.github.com" {
+		ghHostname = fmt.Sprintf("https://%s/", config.GitHubHostname)
+	}
+	githubBaseClient.BaseURL, _ = url.Parse(ghHostname)
 	githubClient := &GithubClient{client: githubBaseClient, ctx: githubClientCtx}
 	terraformClient := &TerraformClient{
 		tfExecutableName: "terraform",