From 86d7b9297baa50107f24c3809298815e57f0c6fa Mon Sep 17 00:00:00 2001 From: kgalli Date: Fri, 26 May 2023 09:52:09 +0200 Subject: [PATCH 1/4] Add "new_name" prameter to repo transfer request (#2787) --- github/repos.go | 1 + github/repos_test.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/github/repos.go b/github/repos.go index 9c9c7506309..1e0541d7827 100644 --- a/github/repos.go +++ b/github/repos.go @@ -1969,6 +1969,7 @@ func (s *RepositoriesService) RemoveUserRestrictions(ctx context.Context, owner, // TransferRequest represents a request to transfer a repository. type TransferRequest struct { NewOwner string `json:"new_owner"` + NewName string `json:"new_name,omitempty"` TeamID []int64 `json:"team_ids,omitempty"` } diff --git a/github/repos_test.go b/github/repos_test.go index 992ec418749..96c20df9402 100644 --- a/github/repos_test.go +++ b/github/repos_test.go @@ -3220,7 +3220,7 @@ func TestRepositoriesService_Transfer(t *testing.T) { client, mux, _, teardown := setup() defer teardown() - input := TransferRequest{NewOwner: "a", TeamID: []int64{123}} + input := TransferRequest{NewOwner: "a", NewName: "b", TeamID: []int64{123}} mux.HandleFunc("/repos/o/r/transfer", func(w http.ResponseWriter, r *http.Request) { var v TransferRequest @@ -3390,11 +3390,13 @@ func TestTransferRequest_Marshal(t *testing.T) { u := &TransferRequest{ NewOwner: "testOwner", + NewName: "testName", TeamID: []int64{1, 2}, } want := `{ "new_owner": "testOwner", + "new_name": "testName", "team_ids": [1,2] }` From 8da19a19e7fa553d7178c7943a6cb8ad815f8f83 Mon Sep 17 00:00:00 2001 From: kgalli Date: Fri, 26 May 2023 14:04:40 +0200 Subject: [PATCH 2/4] Use pointer for not required string field --- github/repos.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/repos.go b/github/repos.go index 1e0541d7827..5ffad6dd3c4 100644 --- a/github/repos.go +++ b/github/repos.go @@ -1969,7 +1969,7 @@ func (s *RepositoriesService) RemoveUserRestrictions(ctx context.Context, owner, // TransferRequest represents a request to transfer a repository. type TransferRequest struct { NewOwner string `json:"new_owner"` - NewName string `json:"new_name,omitempty"` + NewName *string `json:"new_name,omitempty"` TeamID []int64 `json:"team_ids,omitempty"` } From 4432b40c9b58dc380b1a5da5cf22eef105a407ee Mon Sep 17 00:00:00 2001 From: kgalli Date: Fri, 26 May 2023 14:06:31 +0200 Subject: [PATCH 3/4] Add github accessor for TransferRequest.GetNewName --- github/github-accessors.go | 8 ++++++++ github/github-accessors_test.go | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/github/github-accessors.go b/github/github-accessors.go index f310e42a01e..c2d9061c174 100644 --- a/github/github-accessors.go +++ b/github/github-accessors.go @@ -20862,6 +20862,14 @@ func (t *TrafficViews) GetUniques() int { return *t.Uniques } +// GetNewName returns the NewName field if it's non-nil, zero value otherwise. +func (t *TransferRequest) GetNewName() string { + if t == nil || t.NewName == nil { + return "" + } + return *t.NewName +} + // GetSHA returns the SHA field if it's non-nil, zero value otherwise. func (t *Tree) GetSHA() string { if t == nil || t.SHA == nil { diff --git a/github/github-accessors_test.go b/github/github-accessors_test.go index 97f3994fc43..eb0a0db42c6 100644 --- a/github/github-accessors_test.go +++ b/github/github-accessors_test.go @@ -24329,6 +24329,16 @@ func TestTrafficViews_GetUniques(tt *testing.T) { t.GetUniques() } +func TestTransferRequest_GetNewName(tt *testing.T) { + var zeroValue string + t := &TransferRequest{NewName: &zeroValue} + t.GetNewName() + t = &TransferRequest{} + t.GetNewName() + t = nil + t.GetNewName() +} + func TestTree_GetSHA(tt *testing.T) { var zeroValue string t := &Tree{SHA: &zeroValue} From fce6b4a5ae4ed5646a211af2f194eb7fd92a2495 Mon Sep 17 00:00:00 2001 From: kgalli Date: Fri, 26 May 2023 14:16:45 +0200 Subject: [PATCH 4/4] Fix broken tests --- github/repos_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github/repos_test.go b/github/repos_test.go index 96c20df9402..b35f44ddc30 100644 --- a/github/repos_test.go +++ b/github/repos_test.go @@ -3220,7 +3220,7 @@ func TestRepositoriesService_Transfer(t *testing.T) { client, mux, _, teardown := setup() defer teardown() - input := TransferRequest{NewOwner: "a", NewName: "b", TeamID: []int64{123}} + input := TransferRequest{NewOwner: "a", NewName: String("b"), TeamID: []int64{123}} mux.HandleFunc("/repos/o/r/transfer", func(w http.ResponseWriter, r *http.Request) { var v TransferRequest @@ -3390,7 +3390,7 @@ func TestTransferRequest_Marshal(t *testing.T) { u := &TransferRequest{ NewOwner: "testOwner", - NewName: "testName", + NewName: String("testName"), TeamID: []int64{1, 2}, }