DEVX-169: fix(ci): create dep-PR branches via POST /branches
Post-merge / detect-and-configure (push) Successful in 59s
Post-merge / release-and-maintain (push) Successful in 1m6s

This commit was merged in pull request #335.
This commit is contained in:
2026-09-19 19:12:27 +00:00
parent c6e895b230
commit 85f1bd9304
3 changed files with 101 additions and 44 deletions
+33
View File
@@ -0,0 +1,33 @@
# DEVX-169: create_dependency_pr uses branches API
## Problem
After DEVX-168, dep-PR creation fails at `POST /git/refs` with
`HTTP 405 Method Not Allowed` — this Gitea version does not implement the
createRef endpoint. Observed creating the sso_bridge 0.4.1 infra
dependency PR.
## Approach
REQ-1: Create the dependency branch via `POST /branches` with
`new_branch_name`/`old_branch_name` (from master). An already-exists
error is tolerated; other API errors fail closed.
## Test Plan
- Branch creation calls `POST /branches` with the expected payload.
- 422 already-exists is tolerated and the PR is still created.
- Other API errors abort with a branch-creation failure.
## Deploy Plan
devx release tag; producers pick it up via pin bumps.
## Rollback Plan
Revert; dep-PR creation stays broken (status quo).
## Acceptance Criteria
- [x] REQ-1: branch creation uses the branches API; already-exists
tolerated; failures surface. Covered by unit tests at 100% coverage.
+7 -11
View File
@@ -344,17 +344,13 @@ def cli(
# Create branch via API
try:
master_ref = client._request("GET", "/git/refs/heads/master").json()
# Implements: REQ-1 — Gitea returns a list of matching refs
if isinstance(master_ref, list):
master_ref = next(
(r for r in master_ref if r.get("ref") == "refs/heads/master"),
master_ref[0] if master_ref else {},
)
master_sha = master_ref.get("object", {}).get("sha", "")
if not master_sha:
raise click.ClickException("Could not get master SHA")
client._request("POST", "/git/refs", json={"ref": f"refs/heads/{branch_name}", "sha": master_sha})
# Implements: REQ-1 — Gitea lacks POST /git/refs; create the branch
# from master via the branches API.
client._request(
"POST",
"/branches",
json={"new_branch_name": branch_name, "old_branch_name": base_branch},
)
except APIError as e:
if "already exists" in str(e).lower():
click.echo(f"[dep-pr] Branch {branch_name} already exists")
+61 -33
View File
@@ -462,10 +462,10 @@ class TestCliManifestMode:
assert args[1:4] == ("oblachno", "sso-bridge", "0.2.4")
class TestMasterRefParsing:
"""Gitea's /git/refs/heads/<branch> returns a list, not an object."""
class TestBranchCreation:
"""Branch creation uses the branches API (Gitea lacks POST /git/refs)."""
def _invoke(self, client: MagicMock) -> object:
def _invoke(self) -> object:
runner = CliRunner()
return runner.invoke(
cli,
@@ -481,31 +481,10 @@ class TestMasterRefParsing:
],
)
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
@patch("devx.ci.create_dependency_pr.update_manifest", return_value=True)
@patch("devx.ci.create_dependency_pr.read_manifest_version", return_value="0.9.0")
@patch("devx.ci.create_dependency_pr.find_existing_pr", return_value=None)
@patch("devx.ci.create_dependency_pr.GiteaClient")
@patch("devx.ci.create_dependency_pr.get_ci_token", return_value="tok")
def test_list_shaped_ref_response(
self,
_token: MagicMock,
mock_client_cls: MagicMock,
_find: MagicMock,
_read: MagicMock,
_update: MagicMock,
_task: MagicMock,
) -> None:
def _client(self, mock_client_cls: MagicMock) -> MagicMock:
client = mock_client_cls.return_value
resp = MagicMock()
resp.json.return_value = [{"ref": "refs/heads/master", "object": {"sha": "abc123"}}]
client._request.return_value = resp
client.create_pr.return_value = {"number": 1}
result = self._invoke(client)
assert result.exit_code == 0
assert "Created PR" in result.output
post = client._request.call_args_list[-1]
assert post.kwargs["json"]["sha"] == "abc123"
return client
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
@patch("devx.ci.create_dependency_pr.update_manifest", return_value=True)
@@ -513,7 +492,7 @@ class TestMasterRefParsing:
@patch("devx.ci.create_dependency_pr.find_existing_pr", return_value=None)
@patch("devx.ci.create_dependency_pr.GiteaClient")
@patch("devx.ci.create_dependency_pr.get_ci_token", return_value="tok")
def test_empty_ref_list_fails(
def test_creates_branch_via_branches_api(
self,
_token: MagicMock,
mock_client_cls: MagicMock,
@@ -522,10 +501,59 @@ class TestMasterRefParsing:
_update: MagicMock,
_task: MagicMock,
) -> None:
client = mock_client_cls.return_value
resp = MagicMock()
resp.json.return_value = []
client._request.return_value = resp
result = self._invoke(client)
client = self._client(mock_client_cls)
result = self._invoke()
assert result.exit_code == 0
assert "Created PR" in result.output
post = client._request.call_args
assert post.args[:2] == ("POST", "/branches")
assert post.kwargs["json"] == {
"new_branch_name": "deps/sso_bridge-0.9.1",
"old_branch_name": "master",
}
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
@patch("devx.ci.create_dependency_pr.update_manifest", return_value=True)
@patch("devx.ci.create_dependency_pr.read_manifest_version", return_value="0.9.0")
@patch("devx.ci.create_dependency_pr.find_existing_pr", return_value=None)
@patch("devx.ci.create_dependency_pr.GiteaClient")
@patch("devx.ci.create_dependency_pr.get_ci_token", return_value="tok")
def test_existing_branch_tolerated(
self,
_token: MagicMock,
mock_client_cls: MagicMock,
_find: MagicMock,
_read: MagicMock,
_update: MagicMock,
_task: MagicMock,
) -> None:
from devx.exceptions import APIError
client = self._client(mock_client_cls)
client._request.side_effect = APIError(422, "branch already exists")
result = self._invoke()
assert result.exit_code == 0
assert "already exists" in result.output.lower()
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
@patch("devx.ci.create_dependency_pr.update_manifest", return_value=True)
@patch("devx.ci.create_dependency_pr.read_manifest_version", return_value="0.9.0")
@patch("devx.ci.create_dependency_pr.find_existing_pr", return_value=None)
@patch("devx.ci.create_dependency_pr.GiteaClient")
@patch("devx.ci.create_dependency_pr.get_ci_token", return_value="tok")
def test_branch_api_error_fails(
self,
_token: MagicMock,
mock_client_cls: MagicMock,
_find: MagicMock,
_read: MagicMock,
_update: MagicMock,
_task: MagicMock,
) -> None:
from devx.exceptions import APIError
client = self._client(mock_client_cls)
client._request.side_effect = APIError(500, "boom")
result = self._invoke()
assert result.exit_code != 0
assert "master SHA" in str(result.exception) or "master SHA" in result.output
assert "Failed to create branch" in result.output