Public Access
DEVX-169: create_dependency_pr: use branches API (Gitea lacks POST /git/refs) #335
@@ -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.
|
||||||
@@ -344,17 +344,13 @@ def cli(
|
|||||||
|
|
||||||
# Create branch via API
|
# Create branch via API
|
||||||
try:
|
try:
|
||||||
master_ref = client._request("GET", "/git/refs/heads/master").json()
|
# Implements: REQ-1 — Gitea lacks POST /git/refs; create the branch
|
||||||
# Implements: REQ-1 — Gitea returns a list of matching refs
|
# from master via the branches API.
|
||||||
if isinstance(master_ref, list):
|
client._request(
|
||||||
master_ref = next(
|
"POST",
|
||||||
(r for r in master_ref if r.get("ref") == "refs/heads/master"),
|
"/branches",
|
||||||
master_ref[0] if master_ref else {},
|
json={"new_branch_name": branch_name, "old_branch_name": base_branch},
|
||||||
)
|
)
|
||||||
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})
|
|
||||||
except APIError as e:
|
except APIError as e:
|
||||||
if "already exists" in str(e).lower():
|
if "already exists" in str(e).lower():
|
||||||
click.echo(f"[dep-pr] Branch {branch_name} already exists")
|
click.echo(f"[dep-pr] Branch {branch_name} already exists")
|
||||||
|
|||||||
@@ -462,10 +462,10 @@ class TestCliManifestMode:
|
|||||||
assert args[1:4] == ("oblachno", "sso-bridge", "0.2.4")
|
assert args[1:4] == ("oblachno", "sso-bridge", "0.2.4")
|
||||||
|
|
||||||
|
|
||||||
class TestMasterRefParsing:
|
class TestBranchCreation:
|
||||||
"""Gitea's /git/refs/heads/<branch> returns a list, not an object."""
|
"""Branch creation uses the branches API (Gitea lacks POST /git/refs)."""
|
||||||
|
|
||||||
def _invoke(self, client: MagicMock) -> object:
|
def _invoke(self) -> object:
|
||||||
runner = CliRunner()
|
runner = CliRunner()
|
||||||
return runner.invoke(
|
return runner.invoke(
|
||||||
cli,
|
cli,
|
||||||
@@ -481,31 +481,10 @@ class TestMasterRefParsing:
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
|
def _client(self, mock_client_cls: MagicMock) -> MagicMock:
|
||||||
@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:
|
|
||||||
client = mock_client_cls.return_value
|
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}
|
client.create_pr.return_value = {"number": 1}
|
||||||
result = self._invoke(client)
|
return 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"
|
|
||||||
|
|
||||||
@patch("devx.ci.create_dependency_pr.create_vikunja_task", return_value=None)
|
@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.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.find_existing_pr", return_value=None)
|
||||||
@patch("devx.ci.create_dependency_pr.GiteaClient")
|
@patch("devx.ci.create_dependency_pr.GiteaClient")
|
||||||
@patch("devx.ci.create_dependency_pr.get_ci_token", return_value="tok")
|
@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,
|
self,
|
||||||
_token: MagicMock,
|
_token: MagicMock,
|
||||||
mock_client_cls: MagicMock,
|
mock_client_cls: MagicMock,
|
||||||
@@ -522,10 +501,59 @@ class TestMasterRefParsing:
|
|||||||
_update: MagicMock,
|
_update: MagicMock,
|
||||||
_task: MagicMock,
|
_task: MagicMock,
|
||||||
) -> None:
|
) -> None:
|
||||||
client = mock_client_cls.return_value
|
client = self._client(mock_client_cls)
|
||||||
resp = MagicMock()
|
result = self._invoke()
|
||||||
resp.json.return_value = []
|
assert result.exit_code == 0
|
||||||
client._request.return_value = resp
|
assert "Created PR" in result.output
|
||||||
result = self._invoke(client)
|
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 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
|
||||||
|
|||||||
Reference in New Issue
Block a user