From 9e4251c1a7d2f846fe226563ef0dd824bbea566a Mon Sep 17 00:00:00 2001 From: Mathias Bergqvist Date: Wed, 6 May 2026 22:42:38 +0200 Subject: [PATCH] feat(tools): branch_delete --- internal/gitea/files.go | 9 ++++ internal/gitea/files_test.go | 26 +++++++++++ internal/tools/branch_delete.go | 64 ++++++++++++++++++++++++++++ internal/tools/branch_delete_test.go | 51 ++++++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 internal/tools/branch_delete.go create mode 100644 internal/tools/branch_delete_test.go diff --git a/internal/gitea/files.go b/internal/gitea/files.go index bcc0b37..1c2ccbf 100644 --- a/internal/gitea/files.go +++ b/internal/gitea/files.go @@ -114,6 +114,15 @@ func (c *Client) ListBranches(ctx context.Context, owner, repo string, page, lim return branches, nil } +func (c *Client) DeleteBranch(ctx context.Context, owner, repo, branch string) error { + p := fmt.Sprintf("/api/v1/repos/%s/%s/branches/%s", owner, repo, branch) + body, status, err := c.DeleteJSON(ctx, p) + if err != nil { + return err + } + return MapStatus(status, body) +} + // UpsertFile creates a file when args.Sha is empty (POST) or updates an existing // file when args.Sha is set (PUT). Gitea routes both operations by HTTP method on // the same /contents/{path} URL, and rejects PUT without a sha. diff --git a/internal/gitea/files_test.go b/internal/gitea/files_test.go index 873eec7..ecffec2 100644 --- a/internal/gitea/files_test.go +++ b/internal/gitea/files_test.go @@ -138,3 +138,29 @@ func TestUpsertFileSendsPayloadAndDecodesResult(t *testing.T) { assert.Equal(t, "http://example.com/p.md", result.Content.HTMLURL) assert.Equal(t, "abc", result.Commit.Sha) } + +func TestDeleteBranch(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, "/api/v1/repos/o/r/branches/feat/x", r.URL.Path) + assert.Equal(t, http.MethodDelete, r.Method) + w.WriteHeader(http.StatusNoContent) + })) + defer srv.Close() + + c := gitea.NewClient(srv.URL, "tok") + err := c.DeleteBranch(context.Background(), "o", "r", "feat/x") + require.NoError(t, err) +} + +func TestDeleteBranchProtected(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusForbidden) + _, _ = w.Write([]byte(`{"message":"branch is protected"}`)) + })) + defer srv.Close() + + c := gitea.NewClient(srv.URL, "tok") + err := c.DeleteBranch(context.Background(), "o", "r", "main") + require.Error(t, err) + assert.ErrorIs(t, err, gitea.ErrPermissionDenied) +} diff --git a/internal/tools/branch_delete.go b/internal/tools/branch_delete.go new file mode 100644 index 0000000..8938602 --- /dev/null +++ b/internal/tools/branch_delete.go @@ -0,0 +1,64 @@ +package tools + +import ( + "context" + "encoding/json" + "fmt" + + "gitea.d-ma.be/mathias/gitea-mcp/internal/allowlist" + "gitea.d-ma.be/mathias/gitea-mcp/internal/gitea" + "gitea.d-ma.be/mathias/gitea-mcp/internal/registry" +) + +type BranchDelete struct { + c *gitea.Client + a *allowlist.Allowlist +} + +func NewBranchDelete(c *gitea.Client, a *allowlist.Allowlist) *BranchDelete { + return &BranchDelete{c: c, a: a} +} + +func (t *BranchDelete) Descriptor() registry.ToolDescriptor { + return registry.ToolDescriptor{ + Name: "branch_delete", + Description: "Delete a branch from a repository.", + InputSchema: json.RawMessage(`{ + "type":"object", + "properties":{ + "owner":{"type":"string"}, + "name":{"type":"string"}, + "branch":{"type":"string"} + }, + "required":["owner","name","branch"] + }`), + } +} + +type branchDeleteArgs struct { + Owner string `json:"owner"` + Name string `json:"name"` + Branch string `json:"branch"` +} + +func (t *BranchDelete) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) { + var args branchDeleteArgs + if err := parseArgs(raw, &args); err != nil { + return nil, err + } + if err := t.a.Check(args.Owner); err != nil { + return nil, err + } + if args.Branch == "" { + return nil, fmt.Errorf("branch is required: %w", gitea.ErrValidation) + } + + if err := t.c.DeleteBranch(ctx, args.Owner, args.Name, args.Branch); err != nil { + return nil, err + } + + return textOK(map[string]any{ + "deleted": true, + "branch": args.Branch, + }) +} diff --git a/internal/tools/branch_delete_test.go b/internal/tools/branch_delete_test.go new file mode 100644 index 0000000..8555247 --- /dev/null +++ b/internal/tools/branch_delete_test.go @@ -0,0 +1,51 @@ +package tools_test + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "testing" + + "gitea.d-ma.be/mathias/gitea-mcp/internal/allowlist" + "gitea.d-ma.be/mathias/gitea-mcp/internal/gitea" + "gitea.d-ma.be/mathias/gitea-mcp/internal/tools" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestBranchDeleteSuccess(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, http.MethodDelete, r.Method) + w.WriteHeader(http.StatusNoContent) + })) + defer srv.Close() + + tool := tools.NewBranchDelete(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"owner"})) + out, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"owner","name":"repo","branch":"feat/x"}`)) + require.NoError(t, err) + + var result map[string]any + require.NoError(t, json.Unmarshal(out, &result)) + assert.Equal(t, true, result["deleted"]) + assert.Equal(t, "feat/x", result["branch"]) +} + +func TestBranchDeleteProtectedReturnsError(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusForbidden) + _, _ = w.Write([]byte(`{"message":"branch is protected"}`)) + })) + defer srv.Close() + + tool := tools.NewBranchDelete(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"owner"})) + _, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"owner","name":"repo","branch":"main"}`)) + require.Error(t, err) + assert.ErrorIs(t, err, gitea.ErrPermissionDenied) +} + +func TestBranchDeleteAllowlistRejects(t *testing.T) { + tool := tools.NewBranchDelete(gitea.NewClient("http://unused", ""), allowlist.New([]string{"allowed"})) + _, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"evil","name":"repo","branch":"feat/x"}`)) + require.Error(t, err) +}