From 4a6cacb06d546c565510f0ed4bc0ac3e1bc22725 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Wed, 19 Feb 2020 13:21:39 -0500
Subject: [PATCH] Change GitHub calls to pass client_id and secret in the Auth
 header

This is a required change, as GitHub is deprecating the query parameters in a few months. See https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/ for details.

Fixes https://issues.redhat.com/browse/PROJQUAY-268
---
 buildtrigger/githubhandler.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildtrigger/githubhandler.py b/buildtrigger/githubhandler.py
index 85f483902..fbdb8e195 100644
--- a/buildtrigger/githubhandler.py
+++ b/buildtrigger/githubhandler.py
@@ -159,10 +159,9 @@ class GithubBuildTrigger(BuildTriggerHandler):
         Returns an authenticated client for talking to the GitHub API.
         """
         return Github(
-            self.auth_token,
             base_url=github_trigger.api_endpoint(),
-            client_id=github_trigger.client_id(),
-            client_secret=github_trigger.client_secret(),
+            login_or_token=self.auth_token if self.auth_token else github_trigger.client_id(),
+            password=None if self.auth_token else github_trigger.client_secret(),
             timeout=5,
         )