From 39ae1b3dda66778bd8b359c4e0756f9452e3813f Mon Sep 17 00:00:00 2001 From: Virgil Date: Thu, 2 Apr 2026 06:34:26 +0000 Subject: [PATCH] fix: return repository transfer responses Co-Authored-By: Virgil --- repos.go | 24 +++++++++--- repos_test.go | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 6 deletions(-) diff --git a/repos.go b/repos.go index c283119..79fefab 100644 --- a/repos.go +++ b/repos.go @@ -848,21 +848,33 @@ func (s *RepoService) IterForks(ctx context.Context, owner, repo string) iter.Se } // Transfer initiates a repository transfer. -func (s *RepoService) Transfer(ctx context.Context, owner, repo string, opts map[string]any) error { +func (s *RepoService) Transfer(ctx context.Context, owner, repo string, opts *types.TransferRepoOption) (*types.Repository, error) { path := ResolvePath("/api/v1/repos/{owner}/{repo}/transfer", pathParams("owner", owner, "repo", repo)) - return s.client.Post(ctx, path, opts, nil) + var out types.Repository + if err := s.client.Post(ctx, path, opts, &out); err != nil { + return nil, err + } + return &out, nil } // AcceptTransfer accepts a pending repository transfer. -func (s *RepoService) AcceptTransfer(ctx context.Context, owner, repo string) error { +func (s *RepoService) AcceptTransfer(ctx context.Context, owner, repo string) (*types.Repository, error) { path := ResolvePath("/api/v1/repos/{owner}/{repo}/transfer/accept", pathParams("owner", owner, "repo", repo)) - return s.client.Post(ctx, path, nil, nil) + var out types.Repository + if err := s.client.Post(ctx, path, nil, &out); err != nil { + return nil, err + } + return &out, nil } // RejectTransfer rejects a pending repository transfer. -func (s *RepoService) RejectTransfer(ctx context.Context, owner, repo string) error { +func (s *RepoService) RejectTransfer(ctx context.Context, owner, repo string) (*types.Repository, error) { path := ResolvePath("/api/v1/repos/{owner}/{repo}/transfer/reject", pathParams("owner", owner, "repo", repo)) - return s.client.Post(ctx, path, nil, nil) + var out types.Repository + if err := s.client.Post(ctx, path, nil, &out); err != nil { + return nil, err + } + return &out, nil } // MirrorSync triggers a mirror sync. diff --git a/repos_test.go b/repos_test.go index 1a32fdd..7da727e 100644 --- a/repos_test.go +++ b/repos_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" json "github.com/goccy/go-json" + "io" "net/http" "net/http/httptest" "reflect" @@ -2004,6 +2005,105 @@ func TestRepoService_ForkWithOptions_Good(t *testing.T) { } } +func TestRepoService_Transfer_Good(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + t.Errorf("expected POST, got %s", r.Method) + } + if r.URL.Path != "/api/v1/repos/core/go-forge/transfer" { + t.Errorf("wrong path: %s", r.URL.Path) + http.NotFound(w, r) + return + } + var body types.TransferRepoOption + if err := json.NewDecoder(r.Body).Decode(&body); err != nil { + t.Fatalf("decode body: %v", err) + } + if body.NewOwner != "core-team" || !reflect.DeepEqual(body.TeamIDs, []int64{7, 9}) { + t.Fatalf("got %#v", body) + } + w.WriteHeader(http.StatusAccepted) + json.NewEncoder(w).Encode(types.Repository{Name: "go-forge", FullName: "core-team/go-forge"}) + })) + defer srv.Close() + + f := NewForge(srv.URL, "tok") + repo, err := f.Repos.Transfer(context.Background(), "core", "go-forge", &types.TransferRepoOption{ + NewOwner: "core-team", + TeamIDs: []int64{7, 9}, + }) + if err != nil { + t.Fatal(err) + } + if repo.Name != "go-forge" || repo.FullName != "core-team/go-forge" { + t.Fatalf("got %#v", repo) + } +} + +func TestRepoService_AcceptTransfer_Good(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + t.Errorf("expected POST, got %s", r.Method) + } + if r.URL.Path != "/api/v1/repos/core/go-forge/transfer/accept" { + t.Errorf("wrong path: %s", r.URL.Path) + http.NotFound(w, r) + return + } + body, err := io.ReadAll(r.Body) + if err != nil { + t.Fatalf("read body: %v", err) + } + if len(body) != 0 { + t.Fatalf("expected empty body, got %q", body) + } + w.WriteHeader(http.StatusAccepted) + json.NewEncoder(w).Encode(types.Repository{Name: "go-forge", FullName: "core/go-forge"}) + })) + defer srv.Close() + + f := NewForge(srv.URL, "tok") + repo, err := f.Repos.AcceptTransfer(context.Background(), "core", "go-forge") + if err != nil { + t.Fatal(err) + } + if repo.Name != "go-forge" || repo.FullName != "core/go-forge" { + t.Fatalf("got %#v", repo) + } +} + +func TestRepoService_RejectTransfer_Good(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + t.Errorf("expected POST, got %s", r.Method) + } + if r.URL.Path != "/api/v1/repos/core/go-forge/transfer/reject" { + t.Errorf("wrong path: %s", r.URL.Path) + http.NotFound(w, r) + return + } + body, err := io.ReadAll(r.Body) + if err != nil { + t.Fatalf("read body: %v", err) + } + if len(body) != 0 { + t.Fatalf("expected empty body, got %q", body) + } + w.WriteHeader(http.StatusOK) + json.NewEncoder(w).Encode(types.Repository{Name: "go-forge", FullName: "core/go-forge"}) + })) + defer srv.Close() + + f := NewForge(srv.URL, "tok") + repo, err := f.Repos.RejectTransfer(context.Background(), "core", "go-forge") + if err != nil { + t.Fatal(err) + } + if repo.Name != "go-forge" || repo.FullName != "core/go-forge" { + t.Fatalf("got %#v", repo) + } +} + func TestRepoService_PathParamsAreEscaped_Good(t *testing.T) { owner := "acme org" repo := "my/repo"