From fdb19eacf1788bc6d77de9e57f1a5de350948903 Mon Sep 17 00:00:00 2001 From: Eric Mortensen Date: Wed, 1 Oct 2025 10:45:51 +0200 Subject: [PATCH 1/2] fix return type of GetDefaultCodeSecurityConfigurations --- github/orgs_codesecurity_configurations.go | 4 +-- .../orgs_codesecurity_configurations_test.go | 27 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/github/orgs_codesecurity_configurations.go b/github/orgs_codesecurity_configurations.go index c88ec72fd82..b78bbbc28fc 100644 --- a/github/orgs_codesecurity_configurations.go +++ b/github/orgs_codesecurity_configurations.go @@ -106,7 +106,7 @@ func (s *OrganizationsService) CreateCodeSecurityConfiguration(ctx context.Conte // GitHub API docs: https://docs.github.com/rest/code-security/configurations#get-default-code-security-configurations // //meta:operation GET /orgs/{org}/code-security/configurations/defaults -func (s *OrganizationsService) GetDefaultCodeSecurityConfigurations(ctx context.Context, org string) ([]*CodeSecurityConfiguration, *Response, error) { +func (s *OrganizationsService) GetDefaultCodeSecurityConfigurations(ctx context.Context, org string) ([]*CodeSecurityConfigurationWithDefaultForNewRepos, *Response, error) { u := fmt.Sprintf("orgs/%v/code-security/configurations/defaults", org) req, err := s.client.NewRequest("GET", u, nil) @@ -114,7 +114,7 @@ func (s *OrganizationsService) GetDefaultCodeSecurityConfigurations(ctx context. return nil, nil, err } - var configurations []*CodeSecurityConfiguration + var configurations []*CodeSecurityConfigurationWithDefaultForNewRepos resp, err := s.client.Do(ctx, req, &configurations) if err != nil { return nil, resp, err diff --git a/github/orgs_codesecurity_configurations_test.go b/github/orgs_codesecurity_configurations_test.go index 495214f627d..461fe69ff5f 100644 --- a/github/orgs_codesecurity_configurations_test.go +++ b/github/orgs_codesecurity_configurations_test.go @@ -159,15 +159,22 @@ func TestOrganizationsService_GetDefaultCodeSecurityConfigurations(t *testing.T) testMethod(t, r, "GET") fmt.Fprint(w, `[ { - "id":1, - "name":"config1", - "code_scanning_default_setup": "enabled" + "default_for_new_repos": "public", + "configuration": { + "id":1, + "name":"config1", + "code_scanning_default_setup": "enabled" + } }, { - "id":2, - "name":"config2", - "private_vulnerability_reporting": "enabled" - }]`) + "default_for_new_repos": "private", + "configuration": { + "id":2, + "name":"config2", + "private_vulnerability_reporting": "enabled" + } + } + ]`) }) configurations, _, err := client.Organizations.GetDefaultCodeSecurityConfigurations(ctx, "o") @@ -175,9 +182,9 @@ func TestOrganizationsService_GetDefaultCodeSecurityConfigurations(t *testing.T) t.Errorf("Organizations.GetDefaultCodeSecurityConfigurations returned error: %v", err) } - want := []*CodeSecurityConfiguration{ - {ID: Ptr(int64(1)), Name: Ptr("config1"), CodeScanningDefaultSetup: Ptr("enabled")}, - {ID: Ptr(int64(2)), Name: Ptr("config2"), PrivateVulnerabilityReporting: Ptr("enabled")}, + want := []*CodeSecurityConfigurationWithDefaultForNewRepos{ + {DefaultForNewRepos: Ptr("public"), Configuration: &CodeSecurityConfiguration{ID: Ptr(int64(1)), Name: Ptr("config1"), CodeScanningDefaultSetup: Ptr("enabled")}}, + {DefaultForNewRepos: Ptr("private"), Configuration: &CodeSecurityConfiguration{ID: Ptr(int64(2)), Name: Ptr("config2"), PrivateVulnerabilityReporting: Ptr("enabled")}}, } if !cmp.Equal(configurations, want) { t.Errorf("Organizations.GetDefaultCodeSecurityConfigurations returned %+v, want %+v", configurations, want) From d4efcfee61f502b17ead33a7774bd5ac7d6bc68c Mon Sep 17 00:00:00 2001 From: Eric Mortensen Date: Thu, 2 Oct 2025 09:14:24 +0200 Subject: [PATCH 2/2] fix default_for_new_repos not allowed value in test --- github/orgs_codesecurity_configurations_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github/orgs_codesecurity_configurations_test.go b/github/orgs_codesecurity_configurations_test.go index 461fe69ff5f..81683284f84 100644 --- a/github/orgs_codesecurity_configurations_test.go +++ b/github/orgs_codesecurity_configurations_test.go @@ -167,7 +167,7 @@ func TestOrganizationsService_GetDefaultCodeSecurityConfigurations(t *testing.T) } }, { - "default_for_new_repos": "private", + "default_for_new_repos": "private_and_internal", "configuration": { "id":2, "name":"config2", @@ -184,7 +184,7 @@ func TestOrganizationsService_GetDefaultCodeSecurityConfigurations(t *testing.T) want := []*CodeSecurityConfigurationWithDefaultForNewRepos{ {DefaultForNewRepos: Ptr("public"), Configuration: &CodeSecurityConfiguration{ID: Ptr(int64(1)), Name: Ptr("config1"), CodeScanningDefaultSetup: Ptr("enabled")}}, - {DefaultForNewRepos: Ptr("private"), Configuration: &CodeSecurityConfiguration{ID: Ptr(int64(2)), Name: Ptr("config2"), PrivateVulnerabilityReporting: Ptr("enabled")}}, + {DefaultForNewRepos: Ptr("private_and_internal"), Configuration: &CodeSecurityConfiguration{ID: Ptr(int64(2)), Name: Ptr("config2"), PrivateVulnerabilityReporting: Ptr("enabled")}}, } if !cmp.Equal(configurations, want) { t.Errorf("Organizations.GetDefaultCodeSecurityConfigurations returned %+v, want %+v", configurations, want)