Skip to content
Merged
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
12 changes: 6 additions & 6 deletions github/orgs_rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoNames(t *testing.T)
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down Expand Up @@ -396,7 +396,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoNames(t *testing.T)
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down Expand Up @@ -660,7 +660,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoProperty(t *testing.
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down Expand Up @@ -762,7 +762,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoProperty(t *testing.
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down Expand Up @@ -1009,7 +1009,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoIDs(t *testing.T) {
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down Expand Up @@ -1102,7 +1102,7 @@ func TestOrganizationsService_CreateOrganizationRuleset_RepoIDs(t *testing.T) {
Pattern: "github",
}),
NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down
6 changes: 3 additions & 3 deletions github/repos_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,16 @@ type RequiredWorkflowsRuleParameters struct {
RequiredWorkflows []*RuleRequiredWorkflow `json:"workflows"`
}

// RuleRequiredCodeScanningTools represents the RequiredCodeScanningTools for the RequiredCodeScanningParameters object.
type RuleRequiredCodeScanningTools struct {
// RuleRequiredCodeScanningTool represents a single required code-scanning tool for the RequiredCodeScanningParameters object.
type RuleRequiredCodeScanningTool struct {
AlertsThreshold string `json:"alerts_threshold"`
SecurityAlertsThreshold string `json:"security_alerts_threshold"`
Tool string `json:"tool"`
}

// RequiredCodeScanningRuleParameters represents the code_scanning rule parameters.
type RequiredCodeScanningRuleParameters struct {
RequiredCodeScanningTools []*RuleRequiredCodeScanningTools `json:"code_scanning_tools"`
RequiredCodeScanningTools []*RuleRequiredCodeScanningTool `json:"code_scanning_tools"`
}

// RepositoryRule represents a GitHub Rule.
Expand Down
2 changes: 1 addition & 1 deletion github/repos_rules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func TestRepositoryRule_UnmarshalJSON(t *testing.T) {
"Valid Required code_scanning params": {
data: `{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool": "CodeQL", "security_alerts_threshold": "high_or_higher", "alerts_threshold": "errors"}]}}`,
want: NewRequiredCodeScanningRule(&RequiredCodeScanningRuleParameters{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTools{
RequiredCodeScanningTools: []*RuleRequiredCodeScanningTool{
{
Tool: "CodeQL",
SecurityAlertsThreshold: "high_or_higher",
Expand Down
Loading