github2gerrit 1.0.6__tar.gz → 1.0.7__tar.gz

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
         types: [yaml]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: fa93bc3224c614a0e9786d3e2d3d48edcca246eb  # frozen: v0.15.1
+    rev: 0839f92796ae388643a08a21640a029b322be5c2  # frozen: v0.15.2
     hooks:
       - id: ruff
         files: ^(src|scripts|tests)/.+\.py$

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 1.0.6
+Version: 1.0.7
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Project-URL: Homepage, https://github.com/lfreleng-actions/github2gerrit-action
 Project-URL: Repository, https://github.com/lfreleng-actions/github2gerrit-action

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/src/github2gerrit/core.py

@@ -3424,7 +3424,7 @@ class Orchestrator:
             )
             if (
                 not sync_all_prs
-                and gh.event_name == "pull_request_target"
+                and gh.event_name in ("pull_request", "pull_request_target")
                 and gh.event_action in ("reopened", "synchronize")
             ):
                 try:
@@ -5518,8 +5518,9 @@ class Orchestrator:
         self,
         gh: GitHubContext,
     ) -> None:
-        """Close the PR if policy requires (pull_request_target events).
+        """Close the PR if policy requires.
 
+        Supports both ``pull_request`` and ``pull_request_target`` triggers.
         When PRESERVE_GITHUB_PRS is true, skip closing PRs (useful for testing).
         """
         # Respect PRESERVE_GITHUB_PRS to avoid closing PRs during tests
@@ -5530,9 +5531,9 @@ class Orchestrator:
                 gh.pr_number,
             )
             return
-        # The current shell action closes PR on pull_request_target events.
-        if gh.event_name != "pull_request_target":
-            log.debug("Event is not pull_request_target; not closing PR")
+        # Close PRs on pull_request or pull_request_target events.
+        if gh.event_name not in ("pull_request", "pull_request_target"):
+            log.debug("Event is not a pull_request event; not closing PR")
             return
         log.info("Closing PR #%s", gh.pr_number)
         try:

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/src/github2gerrit/models.py

@@ -117,10 +117,15 @@ class GitHubContext:
     def get_operation_mode(self) -> PROperationMode:
         """Determine the operation mode based on event type and action.
 
+        Supports both ``pull_request`` and ``pull_request_target`` triggers.
+        Using ``pull_request`` is preferred for security (avoids granting
+        secrets to untrusted fork code), while ``pull_request_target`` is
+        accepted for backward compatibility.
+
         Returns:
             PROperationMode enum indicating the type of operation
         """
-        if self.event_name != "pull_request_target":
+        if self.event_name not in ("pull_request", "pull_request_target"):
             return PROperationMode.UNKNOWN
 
         action = self.event_action.lower() if self.event_action else ""

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/tests/test_core_close_pr_policy.py

@@ -58,16 +58,16 @@ def test_close_pr_skipped_when_preserve_github_prs_true(
     orch._close_pull_request_if_required(gh)
 
 
-def test_close_pr_not_invoked_for_non_target_event(
+def test_close_pr_not_invoked_for_non_pr_event(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     # Ensure preservation is disabled so only event controls behavior
     monkeypatch.delenv("PRESERVE_GITHUB_PRS", raising=False)
 
-    # Non-target event should not attempt to close
+    # Non-PR events (e.g. workflow_dispatch, push) should not attempt to close
     def _fail(*args: Any, **kwargs: Any) -> Any:
         raise AssertionError(
-            "GitHub API should not be called for non-target events"
+            "GitHub API should not be called for non-PR events"
         )
 
     monkeypatch.setattr("github2gerrit.core.build_client", _fail)
@@ -75,12 +75,66 @@ def test_close_pr_not_invoked_for_non_target_event(
     monkeypatch.setattr("github2gerrit.core.get_pull", _fail)
     monkeypatch.setattr("github2gerrit.core.close_pr", _fail)
 
+    orch = Orchestrator(workspace=tmp_path)
+    gh = _gh_ctx(event_name="workflow_dispatch", pr_number=42)
+
+    # Act: should no-op for non-PR events
+    orch._close_pull_request_if_required(gh)
+
+
+def test_close_pr_invoked_for_pull_request_event(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Verify that pull_request events (not just pull_request_target) close PRs.
+
+    The code now supports both ``pull_request`` and ``pull_request_target``
+    triggers.  Using ``pull_request`` is preferred for security.
+    """
+    # Ensure preservation is disabled so closing is allowed
+    monkeypatch.delenv("PRESERVE_GITHUB_PRS", raising=False)
+
+    calls: dict[str, Any] = {}
+
+    class DummyClient:
+        pass
+
+    class DummyRepo:
+        pass
+
+    class DummyPR:
+        def __init__(self, number: int) -> None:
+            self.number = number
+            self.closed_state: str | None = None
+
+    # Patch the GitHub helper functions used by the close path
+    monkeypatch.setattr("github2gerrit.core.build_client", DummyClient)
+    monkeypatch.setattr(
+        "github2gerrit.core.get_repo_from_env", lambda _c: DummyRepo()
+    )
+
+    def _get_pull(_repo: DummyRepo, number: int) -> DummyPR:
+        calls["get_pull_number"] = number
+        return DummyPR(number)
+
+    def _close_pr(pr: DummyPR, *, comment: str | None = None) -> None:
+        calls["closed_pr_number"] = pr.number
+        calls["comment"] = comment
+        pr.closed_state = "closed"
+
+    monkeypatch.setattr("github2gerrit.core.get_pull", _get_pull)
+    monkeypatch.setattr("github2gerrit.core.close_pr", _close_pr)
+
     orch = Orchestrator(workspace=tmp_path)
     gh = _gh_ctx(event_name="pull_request", pr_number=42)
 
-    # Act: should no-op
+    # Act: pull_request events should now close the PR
     orch._close_pull_request_if_required(gh)
 
+    # Assert
+    assert calls.get("get_pull_number") == 42
+    assert calls.get("closed_pr_number") == 42
+    assert calls.get("comment") == "Auto-closing pull request"
+
 
 def test_close_pr_invoked_for_pull_request_target_event(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/tests/test_duplicate_detection.py

@@ -425,7 +425,10 @@ project=test/project.git
 
             responses.add(
                 responses.GET,
-                re.compile(r"https://gerrit\.example\.org/a?/?changes/\?.*"),
+                re.compile(
+                    r"https://gerrit\.example\.org"
+                    r"(/[a-z]+)?/a?/?changes/\?.*"
+                ),
                 json=gerrit_response,
                 status=200,
             )
@@ -435,6 +438,7 @@ project=test/project.git
                 {
                     "GERRIT_SERVER": "gerrit.example.org",
                     "GERRIT_PROJECT": "test/project",
+                    "GERRIT_HTTP_BASE_PATH": "r",
                 },
             ):
                 with pytest.raises(DuplicateChangeError) as exc_info:
@@ -489,7 +493,10 @@ project=test/project.git
 
             responses.add(
                 responses.GET,
-                re.compile(r"https://gerrit\.example\.org/a?/?changes/\?.*"),
+                re.compile(
+                    r"https://gerrit\.example\.org"
+                    r"(/[a-z]+)?/a?/?changes/\?.*"
+                ),
                 json=gerrit_response,
                 status=200,
             )
@@ -499,6 +506,7 @@ project=test/project.git
                 {
                     "GERRIT_SERVER": "gerrit.example.org",
                     "GERRIT_PROJECT": "test/project",
+                    "GERRIT_HTTP_BASE_PATH": "r",
                 },
             ):
                 # Should NOT raise when allow_duplicates=True

{github2gerrit-1.0.6 → github2gerrit-1.0.7}/uv.lock

@@ -415,7 +415,7 @@ wheels = [
 
 [[package]]
 name = "hatchling"
-version = "1.28.0"
+version = "1.29.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "packaging" },
@@ -423,9 +423,9 @@ dependencies = [
     { name = "pluggy" },
     { name = "trove-classifiers" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/0b/8e/e480359492affde4119a131da729dd26da742c2c9b604dff74836e47eef9/hatchling-1.28.0.tar.gz", hash = "sha256:4d50b02aece6892b8cd0b3ce6c82cb218594d3ec5836dbde75bf41a21ab004c8", size = 55365, upload-time = "2025-11-27T00:31:13.766Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cf/9c/b4cfe330cd4f49cff17fd771154730555fa4123beb7f292cf0098b4e6c20/hatchling-1.29.0.tar.gz", hash = "sha256:793c31816d952cee405b83488ce001c719f325d9cda69f1fc4cd750527640ea6", size = 55656, upload-time = "2026-02-23T19:42:06.539Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0d/a5/48cb7efb8b4718b1a4c0c331e3364a3a33f614ff0d6afd2b93ee883d3c47/hatchling-1.28.0-py3-none-any.whl", hash = "sha256:dc48722b68b3f4bbfa3ff618ca07cdea6750e7d03481289ffa8be1521d18a961", size = 76075, upload-time = "2025-11-27T00:31:12.544Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/8a/44032265776062a89171285ede55a0bdaadc8ac00f27f0512a71a9e3e1c8/hatchling-1.29.0-py3-none-any.whl", hash = "sha256:50af9343281f34785fab12da82e445ed987a6efb34fd8c2fc0f6e6630dbcc1b0", size = 76356, upload-time = "2026-02-23T19:42:05.197Z" },
 ]
 
 [[package]]
@@ -965,7 +965,7 @@ wheels = [
 
 [[package]]
 name = "typer"
-version = "0.24.0"
+version = "0.24.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-doc" },
@@ -973,9 +973,9 @@ dependencies = [
     { name = "rich" },
     { name = "shellingham" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5a/b6/3e681d3b6bb22647509bdbfdd18055d5adc0dce5c5585359fa46ff805fdc/typer-0.24.0.tar.gz", hash = "sha256:f9373dc4eff901350694f519f783c29b6d7a110fc0dcc11b1d7e353b85ca6504", size = 118380, upload-time = "2026-02-16T22:08:48.496Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f5/24/cb09efec5cc954f7f9b930bf8279447d24618bb6758d4f6adf2574c41780/typer-0.24.1.tar.gz", hash = "sha256:e39b4732d65fbdcde189ae76cf7cd48aeae72919dea1fdfc16593be016256b45", size = 118613, upload-time = "2026-02-21T16:54:40.609Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/85/d0/4da85c2a45054bb661993c93524138ace4956cb075a7ae0c9d1deadc331b/typer-0.24.0-py3-none-any.whl", hash = "sha256:5fc435a9c8356f6160ed6e85a6301fdd6e3d8b2851da502050d1f92c5e9eddc8", size = 56441, upload-time = "2026-02-16T22:08:47.535Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/91/48db081e7a63bb37284f9fbcefda7c44c277b18b0e13fbc36ea2335b71e6/typer-0.24.1-py3-none-any.whl", hash = "sha256:112c1f0ce578bfb4cab9ffdabc68f031416ebcc216536611ba21f04e9aa84c9e", size = 56085, upload-time = "2026-02-21T16:54:41.616Z" },
 ]
 
 [[package]]