Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions github/orgs_codesecurity_configurations.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ 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)
if err != nil {
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
Expand Down
27 changes: 17 additions & 10 deletions github/orgs_codesecurity_configurations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,25 +159,32 @@ 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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch :) fixed in latest commit

"configuration": {
"id":2,
"name":"config2",
"private_vulnerability_reporting": "enabled"
}
}
]`)
})

configurations, _, err := client.Organizations.GetDefaultCodeSecurityConfigurations(ctx, "o")
if err != nil {
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)
Expand Down