DEVPROD-1008 Add setting to define oldest allowed merge base for PR patches #7656
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
malikchaya2
approved these changes
Mar 26, 2024
| ctx, cancel := context.WithTimeout(context.Background(), time.Minute) | ||
| defer cancel() | ||
| baseOwnerAndRepo := strings.Split(pr.Base.Repo.GetFullName(), "/") | ||
| mergeBase, err = thirdparty.GetGithubMergeBaseRevision(ctx, "", baseOwnerAndRepo[0], baseOwnerAndRepo[1], pr.Base.GetRef(), pr.Head.GetRef()) |
There was a problem hiding this comment.
We should check the length before accessing baseOwnerAndRepo[1] to make sure it doesn't panic.
thirdparty/github.go
Outdated
| "message": "failed to compare commits to find merge base commit", | ||
| "op": "GetGithubMergeBaseRevision", | ||
| "message": "failed to compare commits to determine order of commits", | ||
| "op": "IsMergeBaseAllowed", |
There was a problem hiding this comment.
I think this should be getCommitComparison
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-1008
Description
This introduces a new optional project ref setting field that defines the oldest allowed commit hash that can be the merge base for PR patches. If the field is set for the project and the PR patch's merge base is older than the defined commit sha, the patch will not run.
In order to make it such that the git commit comparison check API only hits for projects that have this new field set, I had to refactor the github PR intent logic a bit to move the project ref query earlier in the logic.
This will require a followup Spruce PR.
Testing
Tested in staging by setting an oldest allowed merge base on a sandbox project, and confirmed that PRs opened with merge bases before the merge base ran tasks, and a PR opened with a merge base older than the oldest allowed base failed with "merge base is too old"