get target branch from the PR

Author: saklar13

scripts/cli.py

@@ -84,7 +84,6 @@ def trigger_auto_tests(
 )
 @click.option("--vcs-root-url", required=True, help="VCS URL")
 @click.option("--pr-number", required=True, help="PR number")
-@click.option("--target-branch", required=True, help="Target branch of the PR")
 @click.option(
     "--valid-branches",
     default="master",
@@ -105,14 +104,12 @@ def trigger_auto_tests(
 def verify_user_can_trigger(
     vcs_root_url: str,
     pr_number: str,
-    target_branch: str,
     valid_branches: str,
     token: str,
 ):
     verify_user_can_trigger_build(
         vcs_root_url=vcs_root_url,
         pr_number=pr_number,
-        target_branch=target_branch,
         valid_branches=valid_branches,
         token=token,
     )

scripts/pr_check/pr_check.py

@@ -1,13 +1,11 @@
 from github import Github
+from github.PullRequest import PullRequest
+from github.Repository import Repository
 
 
-def is_author_pr_is_member_of_org(
-    vcs_root_url: str, pr_number: str, token: str
-) -> bool:
-    _, owner, repo_name = vcs_root_url.removesuffix(".git").rsplit("/", 2)
-    github = Github(token)
-    repo = github.get_repo(f"{owner}/{repo_name}")
-    pull = repo.get_pull(int(pr_number))
+def validate_author_pr_is_member_of_org(
+    repo: Repository, github: Github, pull: PullRequest
+):
     org_login = repo.organization.login
     org = github.get_organization(org_login)
     token_user = github.get_user(github.get_user().login)
@@ -17,26 +15,31 @@ def is_author_pr_is_member_of_org(
             f"rights 'read:org' so cannot check members of the organization"
         )
     # repo.organization.has_in_members(user) always returns false ¯\_(ツ)_/¯
-    return org.has_in_members(pull.user)
+    if not org.has_in_members(pull.user):
+        raise ValueError(
+            f"PR {pull.number} was created by user that is not a member of the "
+            f"repo organization"
+        )
 
 
-def is_pr_target_branch_in_valid_branches(target_branch: str, valid_branches: str):
-    return target_branch in map(str.strip, valid_branches.split(","))
+def validate_pr_target_branch_in_valid_branches(pull: PullRequest, valid_branches: str):
+    target_branch = pull.base.ref
+    if target_branch not in map(str.strip, valid_branches.split(",")):
+        raise ValueError(
+            f"Target branch {target_branch} is not in valid branches {valid_branches}"
+        )
 
 
 def verify_user_can_trigger_build(
     vcs_root_url: str,
     pr_number: str,
-    target_branch: str,
     valid_branches: str,
     token: str,
 ):
-    if not is_pr_target_branch_in_valid_branches(target_branch, valid_branches):
-        raise ValueError(
-            f"Target branch {target_branch} is not in valid branches {valid_branches}"
-        )
-    if not is_author_pr_is_member_of_org(vcs_root_url, pr_number, token):
-        raise ValueError(
-            f"PR {pr_number} was created by user that is not a member of the "
-            f"repo organization"
-        )
+    _, owner, repo_name = vcs_root_url.removesuffix(".git").rsplit("/", 2)
+    github = Github(token)
+    repo = github.get_repo(f"{owner}/{repo_name}")
+    pull = repo.get_pull(int(pr_number))
+
+    validate_pr_target_branch_in_valid_branches(pull, valid_branches)
+    validate_author_pr_is_member_of_org(repo, github, pull)

tests/test_smth.py

@@ -1,8 +1,8 @@
 import pytest
 
-from scripts.pr_check.pr_check import is_pr_target_branch_in_valid_branches
+from scripts.pr_check.pr_check import validate_pr_target_branch_in_valid_branches
 
 
 def test_smth():
     with pytest.raises(TypeError):
-        is_pr_target_branch_in_valid_branches()
+        validate_pr_target_branch_in_valid_branches()

version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3