fix: replace github search api with graphql in success lifecycle method #857
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ import debugFactory from "debug"; | |
| import parseGithubUrl from "./parse-github-url.js"; | ||
| import resolveConfig from "./resolve-config.js"; | ||
| import { toOctokitOptions } from "./octokit.js"; | ||
| import getSuccessComment from "./get-success-comment.js"; | ||
| import findSRIssues from "./find-sr-issues.js"; | ||
| import { RELEASE_NAME } from "./definitions/constants.js"; | ||
|
|
@@ -65,44 +64,38 @@ export default async function success(pluginConfig, context, { Octokit }) { | |
| const releaseInfos = releases.filter((release) => Boolean(release.name)); | ||
| const shas = commits.map(({ hash }) => hash); | ||
|
|
||
| const { repository } = await octokit.graphql( | ||
| buildAssociatedPRsQuery(shas), | ||
| { owner, repo }, | ||
| ); | ||
| const associatedPRs = Object.values(repository).map( | ||
| (item) => item.associatedPullRequests.nodes, | ||
| ); | ||
|
|
||
| const uniqueAssociatedPRs = uniqBy(flatten(associatedPRs), "number"); | ||
|
|
||
| const prs = await pFilter(uniqueAssociatedPRs, async ({ number }) => { | ||
| const commits = await octokit.paginate( | ||
| "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", | ||
| { | ||
| owner, | ||
| repo, | ||
| pull_number: number, | ||
| }, | ||
| ); | ||
| const matchingCommit = commits.find(({ sha }) => shas.includes(sha)); | ||
| if (matchingCommit) return matchingCommit; | ||
|
|
||
| const { data: pullRequest } = await octokit.request( | ||
| "GET /repos/{owner}/{repo}/pulls/{pull_number}", | ||
| { | ||
| owner, | ||
| repo, | ||
| pull_number: number, | ||
| }, | ||
| ); | ||
| return shas.includes(pullRequest.merge_commit_sha); | ||
| }); | ||
|
|
||
| debug( | ||
| "found pull requests: %O", | ||
|
|
@@ -250,3 +243,31 @@ export default async function success(pluginConfig, context, { Octokit }) { | |
| throw new AggregateError(errors); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Builds GraphQL query for fetching associated PRs to a list of commit hash (sha) | ||
| * @param {Array<string>} shas | ||
| * @returns {string} | ||
| */ | ||
| export function buildAssociatedPRsQuery(shas) { | ||
| return `#graphql | ||
| query getAssociatedPRs($owner: String!, $repo: String!) { | ||
| repository(owner: $owner, name: $repo) { | ||
| ${shas | ||
| .map((sha) => { | ||
| return `"commit${sha.slice(0, 6)}": object(oid: ${sha}) { | ||
| ...on Commit { | ||
| associatedPullRequests(first: 100) { | ||
| nodes { | ||
| url | ||
| number | ||
| } | ||
| } | ||
| } | ||
| }`; | ||
| }) | ||
| .join("")} | ||
| } | ||
| } | ||
|
Comment on lines
+254
to
+272
Member
There was a problem hiding this comment. 
We will need to address the possibility that there might be more than 100 commits. If that occurs, we need to send multiple requests as only 100 nodes can be requested with a single GraphQL request There was a problem hiding this comment. 
was this addressed in this PR? im working with a repo that has more than 100 commits and am experiencing this secondary rate error on v24.0.0
Member
Author
There was a problem hiding this comment. 
The Edge Case isn't addressed in this PR nor yet. But, could you kindly open an issue with details of this error you're getting in regard this 100+ commit, thanks. There was a problem hiding this comment.
unfortunately this is happening on an internal repo but ill do my best! @babblebey There was a problem hiding this comment.
@babblebey im not able to reliable reproduce it at this point since re-running so will hold off on logging an issue. will revisit if it reappears!
Member
Author
There was a problem hiding this comment.
I'm currently working on a fix in regard the edge case here #892
Member
There was a problem hiding this comment. 
just capturing the relation to #867 (comment) as well |
||
| `; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.