From 4fc5328cc15c5023913830ff4bcb0cff30764253 Mon Sep 17 00:00:00 2001 From: Takashi Yoneuchi Date: Fri, 17 Jun 2022 16:33:01 +0900 Subject: [PATCH 1/2] Add MembersCanForkPrivateRepositories field to Organization struct Signed-off-by: Takashi Yoneuchi --- github/github-accessors.go | 8 ++++++++ github/github-accessors_test.go | 10 ++++++++++ github/github-stringify_test.go | 3 ++- github/orgs.go | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/github/github-accessors.go b/github/github-accessors.go index 6131fad9b8..55d5953306 100644 --- a/github/github-accessors.go +++ b/github/github-accessors.go @@ -9622,6 +9622,14 @@ func (o *Organization) GetMembersCanCreateRepos() bool { return *o.MembersCanCreateRepos } +// GetMembersCanForkPrivateRepositories returns the MembersCanForkPrivateRepositories field if it's non-nil, zero value otherwise. +func (o *Organization) GetMembersCanForkPrivateRepositories() bool { + if o == nil || o.MembersCanForkPrivateRepositories == nil { + return false + } + return *o.MembersCanForkPrivateRepositories +} + // GetMembersURL returns the MembersURL field if it's non-nil, zero value otherwise. func (o *Organization) GetMembersURL() string { if o == nil || o.MembersURL == nil { diff --git a/github/github-accessors_test.go b/github/github-accessors_test.go index 27ad0c8133..7de98f64bb 100644 --- a/github/github-accessors_test.go +++ b/github/github-accessors_test.go @@ -11281,6 +11281,16 @@ func TestOrganization_GetMembersCanCreateRepos(tt *testing.T) { o.GetMembersCanCreateRepos() } +func TestOrganization_GetMembersCanForkPrivateRepositories(tt *testing.T) { + var zeroValue bool + o := &Organization{MembersCanForkPrivateRepositories: &zeroValue} + o.GetMembersCanForkPrivateRepositories() + o = &Organization{} + o.GetMembersCanForkPrivateRepositories() + o = nil + o.GetMembersCanForkPrivateRepositories() +} + func TestOrganization_GetMembersURL(tt *testing.T) { var zeroValue string o := &Organization{MembersURL: &zeroValue} diff --git a/github/github-stringify_test.go b/github/github-stringify_test.go index fa7599d359..be21f9edb2 100644 --- a/github/github-stringify_test.go +++ b/github/github-stringify_test.go @@ -992,6 +992,7 @@ func TestOrganization_String(t *testing.T) { MembersCanCreatePublicRepos: Bool(false), MembersCanCreatePrivateRepos: Bool(false), MembersCanCreateInternalRepos: Bool(false), + MembersCanForkPrivateRepositories: Bool(false), MembersAllowedRepositoryCreationType: String(""), MembersCanCreatePages: Bool(false), MembersCanCreatePublicPages: Bool(false), @@ -1004,7 +1005,7 @@ func TestOrganization_String(t *testing.T) { PublicMembersURL: String(""), ReposURL: String(""), } - want := `github.Organization{Login:"", ID:0, NodeID:"", AvatarURL:"", HTMLURL:"", Name:"", Company:"", Blog:"", Location:"", Email:"", TwitterUsername:"", Description:"", PublicRepos:0, PublicGists:0, Followers:0, Following:0, TotalPrivateRepos:0, OwnedPrivateRepos:0, PrivateGists:0, DiskUsage:0, Collaborators:0, BillingEmail:"", Type:"", Plan:github.Plan{}, TwoFactorRequirementEnabled:false, IsVerified:false, HasOrganizationProjects:false, HasRepositoryProjects:false, DefaultRepoPermission:"", DefaultRepoSettings:"", MembersCanCreateRepos:false, MembersCanCreatePublicRepos:false, MembersCanCreatePrivateRepos:false, MembersCanCreateInternalRepos:false, MembersAllowedRepositoryCreationType:"", MembersCanCreatePages:false, MembersCanCreatePublicPages:false, MembersCanCreatePrivatePages:false, URL:"", EventsURL:"", HooksURL:"", IssuesURL:"", MembersURL:"", PublicMembersURL:"", ReposURL:""}` + want := `github.Organization{Login:"", ID:0, NodeID:"", AvatarURL:"", HTMLURL:"", Name:"", Company:"", Blog:"", Location:"", Email:"", TwitterUsername:"", Description:"", PublicRepos:0, PublicGists:0, Followers:0, Following:0, TotalPrivateRepos:0, OwnedPrivateRepos:0, PrivateGists:0, DiskUsage:0, Collaborators:0, BillingEmail:"", Type:"", Plan:github.Plan{}, TwoFactorRequirementEnabled:false, IsVerified:false, HasOrganizationProjects:false, HasRepositoryProjects:false, DefaultRepoPermission:"", DefaultRepoSettings:"", MembersCanCreateRepos:false, MembersCanCreatePublicRepos:false, MembersCanCreatePrivateRepos:false, MembersCanCreateInternalRepos:false, MembersCanForkPrivateRepositories:false, MembersAllowedRepositoryCreationType:"", MembersCanCreatePages:false, MembersCanCreatePublicPages:false, MembersCanCreatePrivatePages:false, URL:"", EventsURL:"", HooksURL:"", IssuesURL:"", MembersURL:"", PublicMembersURL:"", ReposURL:""}` if got := v.String(); got != want { t.Errorf("Organization.String = %v, want %v", got, want) } diff --git a/github/orgs.go b/github/orgs.go index 80979db350..b2eb85a261 100644 --- a/github/orgs.go +++ b/github/orgs.go @@ -65,6 +65,9 @@ type Organization struct { MembersCanCreatePrivateRepos *bool `json:"members_can_create_private_repositories,omitempty"` MembersCanCreateInternalRepos *bool `json:"members_can_create_internal_repositories,omitempty"` + // MembersCanForkPrivateRepositories toggles whether organization members can fork private organization repositories. + MembersCanForkPrivateRepositories *bool `json:"members_can_fork_private_repositories,omitempty"` + // MembersAllowedRepositoryCreationType denotes if organization members can create repositories // and the type of repositories they can create. Possible values are: "all", "private", or "none". // From b510ad5fd6341045d97c761c38b07c337905d0d4 Mon Sep 17 00:00:00 2001 From: Takashi Yoneuchi Date: Mon, 20 Jun 2022 16:42:17 +0900 Subject: [PATCH 2/2] shorten the name of `MembersCanForkPrivateRepositories` to `MembersCanForkPrivateRepos` Signed-off-by: Takashi Yoneuchi --- github/github-accessors.go | 8 ++++---- github/github-accessors_test.go | 10 +++++----- github/github-stringify_test.go | 4 ++-- github/orgs.go | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/github/github-accessors.go b/github/github-accessors.go index 55d5953306..bf0e7de1c3 100644 --- a/github/github-accessors.go +++ b/github/github-accessors.go @@ -9622,12 +9622,12 @@ func (o *Organization) GetMembersCanCreateRepos() bool { return *o.MembersCanCreateRepos } -// GetMembersCanForkPrivateRepositories returns the MembersCanForkPrivateRepositories field if it's non-nil, zero value otherwise. -func (o *Organization) GetMembersCanForkPrivateRepositories() bool { - if o == nil || o.MembersCanForkPrivateRepositories == nil { +// GetMembersCanForkPrivateRepos returns the MembersCanForkPrivateRepos field if it's non-nil, zero value otherwise. +func (o *Organization) GetMembersCanForkPrivateRepos() bool { + if o == nil || o.MembersCanForkPrivateRepos == nil { return false } - return *o.MembersCanForkPrivateRepositories + return *o.MembersCanForkPrivateRepos } // GetMembersURL returns the MembersURL field if it's non-nil, zero value otherwise. diff --git a/github/github-accessors_test.go b/github/github-accessors_test.go index 7de98f64bb..f87e600b58 100644 --- a/github/github-accessors_test.go +++ b/github/github-accessors_test.go @@ -11281,14 +11281,14 @@ func TestOrganization_GetMembersCanCreateRepos(tt *testing.T) { o.GetMembersCanCreateRepos() } -func TestOrganization_GetMembersCanForkPrivateRepositories(tt *testing.T) { +func TestOrganization_GetMembersCanForkPrivateRepos(tt *testing.T) { var zeroValue bool - o := &Organization{MembersCanForkPrivateRepositories: &zeroValue} - o.GetMembersCanForkPrivateRepositories() + o := &Organization{MembersCanForkPrivateRepos: &zeroValue} + o.GetMembersCanForkPrivateRepos() o = &Organization{} - o.GetMembersCanForkPrivateRepositories() + o.GetMembersCanForkPrivateRepos() o = nil - o.GetMembersCanForkPrivateRepositories() + o.GetMembersCanForkPrivateRepos() } func TestOrganization_GetMembersURL(tt *testing.T) { diff --git a/github/github-stringify_test.go b/github/github-stringify_test.go index be21f9edb2..53502c3d1b 100644 --- a/github/github-stringify_test.go +++ b/github/github-stringify_test.go @@ -992,7 +992,7 @@ func TestOrganization_String(t *testing.T) { MembersCanCreatePublicRepos: Bool(false), MembersCanCreatePrivateRepos: Bool(false), MembersCanCreateInternalRepos: Bool(false), - MembersCanForkPrivateRepositories: Bool(false), + MembersCanForkPrivateRepos: Bool(false), MembersAllowedRepositoryCreationType: String(""), MembersCanCreatePages: Bool(false), MembersCanCreatePublicPages: Bool(false), @@ -1005,7 +1005,7 @@ func TestOrganization_String(t *testing.T) { PublicMembersURL: String(""), ReposURL: String(""), } - want := `github.Organization{Login:"", ID:0, NodeID:"", AvatarURL:"", HTMLURL:"", Name:"", Company:"", Blog:"", Location:"", Email:"", TwitterUsername:"", Description:"", PublicRepos:0, PublicGists:0, Followers:0, Following:0, TotalPrivateRepos:0, OwnedPrivateRepos:0, PrivateGists:0, DiskUsage:0, Collaborators:0, BillingEmail:"", Type:"", Plan:github.Plan{}, TwoFactorRequirementEnabled:false, IsVerified:false, HasOrganizationProjects:false, HasRepositoryProjects:false, DefaultRepoPermission:"", DefaultRepoSettings:"", MembersCanCreateRepos:false, MembersCanCreatePublicRepos:false, MembersCanCreatePrivateRepos:false, MembersCanCreateInternalRepos:false, MembersCanForkPrivateRepositories:false, MembersAllowedRepositoryCreationType:"", MembersCanCreatePages:false, MembersCanCreatePublicPages:false, MembersCanCreatePrivatePages:false, URL:"", EventsURL:"", HooksURL:"", IssuesURL:"", MembersURL:"", PublicMembersURL:"", ReposURL:""}` + want := `github.Organization{Login:"", ID:0, NodeID:"", AvatarURL:"", HTMLURL:"", Name:"", Company:"", Blog:"", Location:"", Email:"", TwitterUsername:"", Description:"", PublicRepos:0, PublicGists:0, Followers:0, Following:0, TotalPrivateRepos:0, OwnedPrivateRepos:0, PrivateGists:0, DiskUsage:0, Collaborators:0, BillingEmail:"", Type:"", Plan:github.Plan{}, TwoFactorRequirementEnabled:false, IsVerified:false, HasOrganizationProjects:false, HasRepositoryProjects:false, DefaultRepoPermission:"", DefaultRepoSettings:"", MembersCanCreateRepos:false, MembersCanCreatePublicRepos:false, MembersCanCreatePrivateRepos:false, MembersCanCreateInternalRepos:false, MembersCanForkPrivateRepos:false, MembersAllowedRepositoryCreationType:"", MembersCanCreatePages:false, MembersCanCreatePublicPages:false, MembersCanCreatePrivatePages:false, URL:"", EventsURL:"", HooksURL:"", IssuesURL:"", MembersURL:"", PublicMembersURL:"", ReposURL:""}` if got := v.String(); got != want { t.Errorf("Organization.String = %v, want %v", got, want) } diff --git a/github/orgs.go b/github/orgs.go index b2eb85a261..26b55c62d0 100644 --- a/github/orgs.go +++ b/github/orgs.go @@ -65,8 +65,8 @@ type Organization struct { MembersCanCreatePrivateRepos *bool `json:"members_can_create_private_repositories,omitempty"` MembersCanCreateInternalRepos *bool `json:"members_can_create_internal_repositories,omitempty"` - // MembersCanForkPrivateRepositories toggles whether organization members can fork private organization repositories. - MembersCanForkPrivateRepositories *bool `json:"members_can_fork_private_repositories,omitempty"` + // MembersCanForkPrivateRepos toggles whether organization members can fork private organization repositories. + MembersCanForkPrivateRepos *bool `json:"members_can_fork_private_repositories,omitempty"` // MembersAllowedRepositoryCreationType denotes if organization members can create repositories // and the type of repositories they can create. Possible values are: "all", "private", or "none".