Skip to content

Commit 257086d

Browse files
committed
Provide Github tokens to GraphQL
This will support a change in the upstream githubgql library to remove hardcoded token retrieval.
1 parent ac2b6c5 commit 257086d

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

src/assign

+4-1
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,10 @@ def update_assignees(number_to_update=None):
145145
"Updates assignees on all repo PRs by default, or a specified PR if input."
146146

147147
org, repo = os.environ["GITHUB_REPOSITORY"].split("/")
148+
token = os.environ.get('BOT_TOKEN', None)
148149

149150
try:
150-
pr_data = githubgql.graphql(QUERY, org=org, repo=repo, cursor=QUERY_CURSORS)
151+
pr_data = githubgql.graphql(QUERY, token=token, org=org, repo=repo, cursor=QUERY_CURSORS)
151152
except githubgql.TokenError as e:
152153
print(e.error)
153154
sys.exit(0)
@@ -190,6 +191,7 @@ def update_assignees(number_to_update=None):
190191
}
191192
}
192193
""",
194+
token=token,
193195
input=input
194196
)
195197

@@ -207,6 +209,7 @@ def update_assignees(number_to_update=None):
207209
}
208210
}
209211
""",
212+
token=token,
210213
input=input
211214
)
212215

src/copy-labels-linked

+3
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ def get_related_issues(body, commits):
8888

8989
def copy_labels_linked(id):
9090
owner, repo = os.environ["GITHUB_REPOSITORY"].split("/")
91+
token = os.environ.get('BOT_TOKEN', None)
9192

9293
# Get PR data and open issues in the repo.
9394
try:
9495
result = githubgql.graphql(
9596
QUERY,
97+
token=token,
9698
id=id,
9799
org=owner,
98100
repo=repo,
@@ -145,6 +147,7 @@ def copy_labels_linked(id):
145147
}
146148
}
147149
""",
150+
token=token,
148151
input={
149152
"labelableId": result['node']['id'],
150153
"labelIds": unset_labels_ids

src/merge

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ mutation($input: MergePullRequestInput!) {
3333

3434
def merge(number_to_merge=None):
3535
owner, repo = os.environ["GITHUB_REPOSITORY"].split("/")
36+
token = os.environ.get('BOT_TOKEN', None)
3637
cursors = {"cursor": ["repository", "pullRequests"]}
3738

3839
try:
39-
result = githubgql.graphql(MERGEABLE_QUERY, accept="application/vnd.github.merge-info-preview+json", cursors=cursors, owner=owner, repo=repo)
40+
result = githubgql.graphql(MERGEABLE_QUERY, token=token, accept="application/vnd.github.merge-info-preview+json", cursors=cursors, owner=owner, repo=repo)
4041
except githubgql.TokenError as e:
4142
print(e.error)
4243
sys.exit(0)
@@ -64,7 +65,7 @@ def merge(number_to_merge=None):
6465

6566
# Attempt to merge the PR if ready.
6667
if merged_indicator == "✓":
67-
githubgql.graphql(MERGE_MUTATION, input={
68+
githubgql.graphql(MERGE_MUTATION, token=token, input={
6869
"pullRequestId": id,
6970
"mergeMethod": "REBASE"
7071
}

src/request

+5-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def iterusers(nested_dictionary):
110110
elif type(value) is dict:
111111
yield from iterusers(value)
112112

113-
def auto_request(pr, org):
113+
def auto_request(pr, org, token):
114114
team_name = sys.argv[1]
115115
num_to_request = sys.argv[2]
116116

@@ -132,7 +132,7 @@ def auto_request(pr, org):
132132

133133
# Query the PR for all relevant users and status info.
134134
try:
135-
pr_data = githubgql.graphql(QUERY_PR, pr=pr, team=team_name, cursors=QUERY_PR_CURSORS)
135+
pr_data = githubgql.graphql(QUERY_PR, token=token, pr=pr, team=team_name, cursors=QUERY_PR_CURSORS)
136136
except githubgql.TokenError as e:
137137
print(e.error)
138138
sys.exit(0)
@@ -175,7 +175,7 @@ def auto_request(pr, org):
175175

176176
if len(to_request) > 0:
177177
# Make the request to Github.
178-
githubgql.graphql(MUTATION_REQUEST_REVIEW, input={
178+
githubgql.graphql(MUTATION_REQUEST_REVIEW, token=token, input={
179179
"pullRequestId": pr,
180180
"userIds": to_request,
181181
"teamIds": [],
@@ -195,8 +195,9 @@ def main():
195195
# Extract relevant data from event/environment.
196196
pr = event['pull_request']['node_id']
197197
org = event['organization']['node_id']
198+
token = os.environ.get('BOT_TOKEN', None)
198199

199-
auto_request(pr, org)
200+
auto_request(pr, org, token)
200201

201202
if __name__ == "__main__":
202203
main()

0 commit comments

Comments
 (0)