github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-04 20:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

return want&got for rule violations (#704)

Browse Source
This commit is contained in:
Marko Gacesa 2023-10-26 07:57:52 +00:00 committed by Harness
parent adeb965723
commit 02b36d0f73
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/protection/rule_branch.go
View File

@ -101,8 +101,9 @@ func (v *Branch) CanMerge(_ context.Context, in CanMergeInput) (CanMergeOutput,
if len(v.PullReq.Merge.StrategiesAllowed) > 0 { // Note: Empty allowed strategies list means all are allowed if len(v.PullReq.Merge.StrategiesAllowed) > 0 { // Note: Empty allowed strategies list means all are allowed
if !slices.Contains(v.PullReq.Merge.StrategiesAllowed, in.Method) { if !slices.Contains(v.PullReq.Merge.StrategiesAllowed, in.Method) {
violations.Add("pullreq.merge.strategies_allowed", violations.Addf("pullreq.merge.strategies_allowed",
"The requested merge strategy is not allowed.") "The requested merge strategy %q is not allowed. Allowed strategies are %v.",
in.Method, v.PullReq.Merge.StrategiesAllowed)
} }
} }

3
types/rule.go
View File

@ -57,6 +57,7 @@ type RuleFilter struct {
type Violation struct { type Violation struct {
Code string `json:"code"` Code string `json:"code"`
Message string `json:"message"` Message string `json:"message"`
Params []any `json:"params"`
} }
// RuleViolations holds several violations of a rule. // RuleViolations holds several violations of a rule.
@ -69,6 +70,7 @@ func (violations *RuleViolations) Add(code, message string) {
violations.Violations = append(violations.Violations, Violation{ violations.Violations = append(violations.Violations, Violation{
Code: code, Code: code,
Message: message, Message: message,
Params: nil,
}) })
} }
@ -76,6 +78,7 @@ func (violations *RuleViolations) Addf(code, format string, params ...any) {
violations.Violations = append(violations.Violations, Violation{ violations.Violations = append(violations.Violations, Violation{
Code: code, Code: code,
Message: fmt.Sprintf(format, params...), Message: fmt.Sprintf(format, params...),
Params: params,
}) })
} }