Use merge base as base revision for PR patches #8674
+354
−351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kimchelly
requested changes
Jan 30, 2025
thirdparty/github.go
Outdated
| apiErr, ok := errors.Cause(err).(APIRequestError) | ||
| if !ok || apiErr.StatusCode != http.StatusNotFound { | ||
| return "", err | ||
| } |
There was a problem hiding this comment.
Is there any reason to exit early on these specific error cases, rather than just retrying on any error? If the logic below ultimately behaves the same as GetGithubMergeBaseRevision, then getting the merge base may be more resilient to other weird/unexpected GitHub results if it falls back on any error.
There was a problem hiding this comment.
That's fair, changed to fallback in all err cases
thirdparty/github.go
Outdated
| return "", err | ||
| } | ||
| // If GetGithubMergeBaseRevision returns a 404 APIRequestError, fallback to the secondary way of determining a PR | ||
| // merge base via API. |
There was a problem hiding this comment.
May be worth a clarification comment on situations where this is actually acceptable, like in the case of finding the merge base of PR based on a private fork that Evergreen doesn't have permission to access.
thirdparty/github_test.go
Outdated
| @@ -325,8 +318,7 @@ func (s *githubSuite) TestGetPullRequestMergeBase() { | |||
| s.ctx, s.cancel = context.WithTimeout(context.Background(), 30*time.Second) | |||
| s.Require().NotNil(s.ctx) | |||
| s.Require().NotNil(s.cancel) | |||
| data.BaseRepo = "conifer" | |||
| hash, err = GetPullRequestMergeBase(s.ctx, data) | |||
| hash, err = GetPullRequestMergeBase(s.ctx, "evergreen-ci", "confier", "", "", 666) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DEVPROD-13619
Description
Re-apply #8665 & #8658
It turns out if a user has a private fork, we can't hit the https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits API between the PR target branch and their fork branch, because our 10gen github app is not installed on that private repo.
There is a secondary way to figure out the merge base of a PR via API (list the PR commits and extract the parent of the first commit), so this change falls back to that method if we get a 404 from GitHub.
Testing
Found a private repo in the evergreen-ci org. Confirmed that if I make a fork off of it and try to stage a PR, no patch is created and Splunk shows the expected error:
Deployed these changes and added another commit to the test PR, and a version was created and the base revision was what I expected.