USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: [CODE-2380]: add error message to rebase api (#2701) 

* add error message to rebase api
CODE-2402
Marko Gaćeša 2024-09-18 12:25:58 +00:00 committed by Harness
parent 93b642b2ba
commit fb58f8c04f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/controller/repo/rebase.go
View File

@ -99,7 +99,10 @@ func (c *Controller) Rebase(
}
if protection.IsCritical(violations) {
return nil, &types.MergeViolations{RuleViolations: violations}, nil
return nil, &types.MergeViolations{
RuleViolations: violations,
Message: protection.GenerateErrorMessageForBlockingViolations(violations),
}, nil
}
readParams := git.CreateReadParams(repo)
@ -162,10 +165,11 @@ func (c *Controller) Rebase(
return nil, nil, fmt.Errorf("rebase execution failed: %w", err)
}
if mergeOutput.MergeSHA.String() == "" || len(mergeOutput.ConflictFiles) > 0 {
if mergeOutput.MergeSHA.IsEmpty() || len(mergeOutput.ConflictFiles) > 0 {
return nil, &types.MergeViolations{
ConflictFiles: mergeOutput.ConflictFiles,
RuleViolations: violations,
Message: fmt.Sprintf("Rebase blocked by conflicting files: %v", mergeOutput.ConflictFiles),
}, nil
}