Skip to content

Commit

Permalink
Adapt for Enterprise version - respect GITHUB ENV variables (#52)
Browse files Browse the repository at this point in the history
Co-authored-by: wojciech.sielski <wojciech.sielski@adevinta.com>
  • Loading branch information
sielaq and wojciech.sielski committed Oct 27, 2022
1 parent 2e9a86d commit 984d112
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,23 @@ func newCommentLoopChannel(ctx context.Context, apprv *approvalEnvironment, clie
return channel
}

func newGithubClient(ctx context.Context) *github.Client {
func newGithubClient(ctx context.Context) (*github.Client, error) {
token := os.Getenv(envVarToken)
ts := oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: token},
)
tc := oauth2.NewClient(ctx, ts)
return github.NewClient(tc)

serverUrl, serverUrlPresent := os.LookupEnv("GITHUB_SERVER_URL")
apiUrl, apiUrlPresent := os.LookupEnv("GITHUB_API_URL")

if serverUrlPresent {
if ! apiUrlPresent {
apiUrl = serverUrl
}
return github.NewEnterpriseClient(apiUrl, serverUrl, tc)
}
return github.NewClient(tc), nil
}

func validateInput() error {
Expand Down Expand Up @@ -148,7 +158,11 @@ func main() {
repoOwner := os.Getenv(envVarRepoOwner)

ctx := context.Background()
client := newGithubClient(ctx)
client, err := newGithubClient(ctx)
if err != nil {
fmt.Printf("error connecting to server: %v\n", err)
os.Exit(1)
}

approvers, err := retrieveApprovers(client, repoOwner)
if err != nil {
Expand Down

0 comments on commit 984d112

Please sign in to comment.