-
Notifications
You must be signed in to change notification settings - Fork 81
Add merge rules engine for validating PRs before landing #317
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
seemethere
wants to merge
2
commits into
master
Choose a base branch
from
gh/seemethere/1/head
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+435
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,6 +257,19 @@ def repository(self, info: GraphQLResolveInfo) -> Repository: | |
| return github_state(info).repositories[self._repository] | ||
|
|
||
|
|
||
| @dataclass | ||
| class PullRequestReview: | ||
| user: str | ||
| state: str # APPROVED, CHANGES_REQUESTED, COMMENTED, etc. | ||
|
|
||
|
|
||
| @dataclass | ||
| class CheckRun: | ||
| name: str | ||
| status: str # queued, in_progress, completed | ||
| conclusion: Optional[str] # success, failure, neutral, cancelled, skipped, etc. | ||
|
|
||
|
|
||
| @dataclass | ||
| class PullRequest(Node): | ||
| baseRef: Optional[Ref] | ||
|
|
@@ -274,6 +287,10 @@ class PullRequest(Node): | |
| url: str | ||
| reviewers: List[str] = dataclasses.field(default_factory=list) | ||
| labels: List[str] = dataclasses.field(default_factory=list) | ||
| # Merge rules related fields | ||
| files: List[str] = dataclasses.field(default_factory=list) | ||
| reviews: List[PullRequestReview] = dataclasses.field(default_factory=list) | ||
| check_runs: List[CheckRun] = dataclasses.field(default_factory=list) | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There doesn't seem to be any API for populating these |
||
|
|
||
| def repository(self, info: GraphQLResolveInfo) -> Repository: | ||
| return github_state(info).repositories[self._repository] | ||
|
|
@@ -464,6 +481,75 @@ def rest(self, method: str, path: str, **kwargs: Any) -> Any: | |
| # For now, pretend all branches are not protected | ||
| raise ghstack.github.NotFoundError() | ||
|
|
||
| # GET /repos/{owner}/{repo}/pulls/{number}/reviews | ||
| if m := re.match(r"^repos/([^/]+)/([^/]+)/pulls/(\d+)/reviews$", path): | ||
| state = self.state | ||
| repo = state.repository(m.group(1), m.group(2)) | ||
| pr = state.pull_request(repo, GitHubNumber(int(m.group(3)))) | ||
| return [ | ||
| {"user": {"login": r.user}, "state": r.state} for r in pr.reviews | ||
| ] | ||
|
|
||
| # GET /repos/{owner}/{repo}/pulls/{number}/files | ||
| if m := re.match(r"^repos/([^/]+)/([^/]+)/pulls/(\d+)/files$", path): | ||
| state = self.state | ||
| repo = state.repository(m.group(1), m.group(2)) | ||
| pr = state.pull_request(repo, GitHubNumber(int(m.group(3)))) | ||
| return [{"filename": f} for f in pr.files] | ||
|
|
||
| # GET /repos/{owner}/{repo}/pulls/{number} | ||
| if m := re.match(r"^repos/([^/]+)/([^/]+)/pulls/(\d+)$", path): | ||
| state = self.state | ||
| repo = state.repository(m.group(1), m.group(2)) | ||
| pr = state.pull_request(repo, GitHubNumber(int(m.group(3)))) | ||
| head_sha = "" | ||
| if pr.headRef: | ||
| head_sha = pr.headRef.target.oid | ||
| return { | ||
| "number": pr.number, | ||
| "title": pr.title, | ||
| "body": pr.body, | ||
| "head": {"sha": head_sha}, | ||
| "base": {"ref": pr.baseRefName}, | ||
| } | ||
|
|
||
| # GET /repos/{owner}/{repo}/commits/{ref}/check-runs | ||
| if m := re.match( | ||
| r"^repos/([^/]+)/([^/]+)/commits/([^/]+)/check-runs$", path | ||
| ): | ||
| # For the fake endpoint, we need to find the PR by head SHA | ||
| # and return its check runs | ||
| state = self.state | ||
| ref = m.group(3) | ||
| # Search for PR with matching head ref | ||
| for pr in state.pull_requests.values(): | ||
| if pr.headRef and pr.headRef.target.oid == ref: | ||
| return { | ||
| "total_count": len(pr.check_runs), | ||
| "check_runs": [ | ||
| { | ||
| "name": c.name, | ||
| "status": c.status, | ||
| "conclusion": c.conclusion, | ||
| } | ||
| for c in pr.check_runs | ||
| ], | ||
| } | ||
| # No matching PR found | ||
| return {"total_count": 0, "check_runs": []} | ||
|
|
||
| # GET /orgs/{org}/teams/{team_slug}/members | ||
| if m := re.match(r"^orgs/([^/]+)/teams/([^/]+)/members$", path): | ||
| # Return empty list for fake endpoint | ||
| return [] | ||
|
|
||
| # GET /repos/{owner}/{repo}/contents/{path} | ||
| if m := re.match( | ||
| r"^repos/([^/]+)/([^/]+)/contents/(.+?)(?:\?ref=(.+))?$", path | ||
| ): | ||
| # Return a NotFoundError for the fake endpoint | ||
| raise ghstack.github.NotFoundError() | ||
|
|
||
| elif method == "post": | ||
| if m := re.match(r"^repos/([^/]+)/([^/]+)/pulls$", path): | ||
| return self._create_pull( | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Recommend adding tests for the fakes