Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
16 changes: 16 additions & 0 deletions github/github-accessors.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions github/github-accessors_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions github/orgs_codesecurity_configurations.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@ type RepositoryAttachment struct {
Repository *Repository `json:"repository"`
}

// SecretScanningDelegatedBypassOptions represents the feature options for the secret scanning delegated bypass.
type SecretScanningDelegatedBypassOptions struct {
Reviewers []*BypassReviewer `json:"reviewers,omitzero"`
}

// BypassReviewer represents the bypass reviewers for the delegated bypass of a code security configuration.
// SecurityConfigurationID is added by GitHub in responses.
type BypassReviewer struct {
ReviewerID int64 `json:"reviewer_id"`
ReviewerType string `json:"reviewer_type"`
SecurityConfigurationID *int64 `json:"security_configuration_id,omitempty"`
}

// CodeSecurityConfiguration represents a code security configuration.
type CodeSecurityConfiguration struct {
ID *int64 `json:"id,omitempty"`
Expand All @@ -52,6 +65,8 @@ type CodeSecurityConfiguration struct {
CodeSecurity *string `json:"code_security,omitempty"`
SecretScanning *string `json:"secret_scanning,omitempty"`
SecretScanningPushProtection *string `json:"secret_scanning_push_protection,omitempty"`
SecretScanningDelegatedBypass *string `json:"secret_scanning_delegated_bypass,omitempty"`
SecretScanningDelegatedBypassOptions *SecretScanningDelegatedBypassOptions `json:"secret_scanning_delegated_bypass_options,omitempty"`
SecretScanningValidityChecks *string `json:"secret_scanning_validity_checks,omitempty"`
SecretScanningNonProviderPatterns *string `json:"secret_scanning_non_provider_patterns,omitempty"`
SecretScanningGenericSecrets *string `json:"secret_scanning_generic_secrets,omitempty"`
Expand Down
106 changes: 106 additions & 0 deletions github/orgs_codesecurity_configurations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,112 @@ func TestOrganizationsService_CreateCodeSecurityConfiguration(t *testing.T) {
})
}

func TestOrganizationsService_CreateCodeSecurityConfigurationWithDelegatedBypass(t *testing.T) {
t.Parallel()
client, mux, _ := setup(t)
ctx := t.Context()

input := CodeSecurityConfiguration{
Name: "config1",
Description: "desc1",
SecretProtection: Ptr("enabled"), // required to configure bypass
SecretScanning: Ptr("enabled"), // required to configure bypass
SecretScanningPushProtection: Ptr("enabled"), // required to configure bypass
SecretScanningDelegatedBypass: Ptr("enabled"),
SecretScanningDelegatedBypassOptions: &SecretScanningDelegatedBypassOptions{
Reviewers: []*BypassReviewer{
{
ReviewerType: "TEAM",
ReviewerID: 456,
},
{
ReviewerType: "ROLE",
ReviewerID: 789,
},
},
},
}

mux.HandleFunc("/orgs/o/code-security/configurations", func(w http.ResponseWriter, r *http.Request) {
var v CodeSecurityConfiguration
assertNilError(t, json.NewDecoder(r.Body).Decode(&v))

if !cmp.Equal(v, input) {
t.Errorf("Organizations.CreateCodeSecurityConfiguration with Bypass request body = %+v, want %+v", v, input)
}

fmt.Fprint(w, `{
"id":123,
"name":"config1",
"description":"desc1",
"secret_protection": "enabled",
"secret_scanning": "enabled",
"secret_scanning_push_protection": "enabled",
"secret_scanning_delegated_bypass": "enabled",
"secret_scanning_delegated_bypass_options": {
"reviewers": [
{
"security_configuration_id": 123,
"reviewer_type": "TEAM",
"reviewer_id": 456
},
{
"security_configuration_id": 123,
"reviewer_type": "ROLE",
"reviewer_id": 789
}
]
}
}`)
})

configuration, _, err := client.Organizations.CreateCodeSecurityConfiguration(ctx, "o", input)
if err != nil {
t.Errorf("Organizations.CreateCodeSecurityConfiguration with Bypass returned error: %v", err)
}

want := &CodeSecurityConfiguration{
ID: Ptr(int64(123)),
Name: "config1",
Description: "desc1",
SecretProtection: Ptr("enabled"),
SecretScanning: Ptr("enabled"),
SecretScanningPushProtection: Ptr("enabled"),
SecretScanningDelegatedBypass: Ptr("enabled"),
SecretScanningDelegatedBypassOptions: &SecretScanningDelegatedBypassOptions{
Reviewers: []*BypassReviewer{
{
SecurityConfigurationID: Ptr(int64(123)),
ReviewerType: "TEAM",
ReviewerID: 456,
},
{
SecurityConfigurationID: Ptr(int64(123)),
ReviewerType: "ROLE",
ReviewerID: 789,
},
},
},
}
if !cmp.Equal(configuration, want) {
t.Errorf("Organizations.CreateCodeSecurityConfiguration with Bypass returned %+v, want %+v", configuration, want)
}

const methodName = "CreateCodeSecurityConfiguration"
testBadOptions(t, methodName, func() (err error) {
_, _, err = client.Organizations.CreateCodeSecurityConfiguration(ctx, "\n", input)
return err
})

testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
got, resp, err := client.Organizations.CreateCodeSecurityConfiguration(ctx, "o", input)
if got != nil {
t.Errorf("testNewRequestAndDoFailure %v = %#v, want nil", methodName, got)
}
return resp, err
})
}

func TestOrganizationsService_ListDefaultCodeSecurityConfigurations(t *testing.T) {
t.Parallel()
client, mux, _ := setup(t)
Expand Down
Loading