xxq250
/
harness
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: [CODE-4429]: remove rules check from branch sync (#4548) 

* 485017 remove rules check from branch sync
This commit is contained in:
Marko Gaćeša 2025-09-18 10:55:56 +00:00 committed by Harness
parent f7cb589df7
commit 374139b0f3
3 changed files with 31 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
app/api/controller/repo/fork_sync.go
View File

@ -21,7 +21,6 @@ import (
"github.com/harness/gitness/app/api/controller"
"github.com/harness/gitness/app/auth"
"github.com/harness/gitness/app/services/protection"
"github.com/harness/gitness/errors"
"github.com/harness/gitness/git"
gitenum "github.com/harness/gitness/git/enum"
@ -35,10 +34,6 @@ type ForkSyncInput struct {
BranchCommitSHA sha.SHA `json:"branch_commit_sha"`
BranchUpstream string `json:"branch_upstream"` // Can be omitted, defaults to the value of Branch
DryRun bool `json:"dry_run"`
DryRunRules bool `json:"dry_run_rules"`
BypassRules bool `json:"bypass_rules"`
}
func (in *ForkSyncInput) validate() error {
@ -59,14 +54,14 @@ func (c *Controller) ForkSync(
session *auth.Session,
repoRef string,
in *ForkSyncInput,
) (*types.ForkSyncOutput, *types.MergeViolations, error) {
) (*types.ForkSyncOutput, error) {
if err := in.validate(); err != nil {
return nil, nil, err
return nil, err
}
repoForkCore, err := c.getRepoCheckAccess(ctx, session, repoRef, enum.PermissionRepoPush)
if err != nil {
return nil, nil, err
return nil, err
}
branchUpstreamName := in.BranchUpstream
@ -80,11 +75,11 @@ func (c *Controller) ForkSync(
Type: gitenum.RefTypeBranch,
})
if err != nil {
return nil, nil, fmt.Errorf("failed to get repo branch: %w", err)
return nil, fmt.Errorf("failed to get repo branch: %w", err)
}
if !branchForkInfo.SHA.Equal(in.BranchCommitSHA) {
return nil, nil, errors.InvalidArgument("The commit %s isn't the latest commit on the branch %s",
return nil, errors.InvalidArgument("The commit %s isn't the latest commit on the branch %s",
in.BranchCommitSHA, in.Branch)
}
@ -95,7 +90,7 @@ func (c *Controller) ForkSync(
branchUpstreamName,
)
if err != nil {
return nil, nil, fmt.Errorf("failed to fetch upstream branch: %w", err)
return nil, fmt.Errorf("failed to fetch upstream branch: %w", err)
}
ancestorResult, err := c.git.IsAncestor(ctx, git.IsAncestorParams{
@ -104,14 +99,14 @@ func (c *Controller) ForkSync(
DescendantCommitSHA: branchForkInfo.SHA,
})
if err != nil {
return nil, nil, fmt.Errorf("failed to check if the upstream commit is ancestor: %w", err)
return nil, fmt.Errorf("failed to check if the upstream commit is ancestor: %w", err)
}
if ancestorResult.Ancestor {
// The branch already contains the latest commit from the upstream repository branch - nothing to do.
return &types.ForkSyncOutput{
AlreadyAncestor: true,
}, nil, nil
}, nil
}
mergeBase, err := c.git.MergeBase(ctx, git.MergeBaseParams{
@ -120,7 +115,7 @@ func (c *Controller) ForkSync(
Ref2: branchForkInfo.SHA.String(),
})
if err != nil {
return nil, nil, fmt.Errorf("failed to find merge base: %w", err)
return nil, fmt.Errorf("failed to find merge base: %w", err)
}
var (
@ -139,59 +134,24 @@ func (c *Controller) ForkSync(
author = controller.IdentityFromPrincipalInfo(*session.Principal.ToPrincipalInfo())
}
protectionRules, isRepoOwner, err := c.fetchBranchRules(ctx, session, repoForkCore)
if err != nil {
return nil, nil, fmt.Errorf("failed to fetch rules: %w", err)
}
violations, err := protectionRules.RefChangeVerify(ctx, protection.RefChangeVerifyInput{
ResolveUserGroupID: c.userGroupService.ListUserIDsByGroupIDs,
Actor: &session.Principal,
AllowBypass: in.BypassRules,
IsRepoOwner: isRepoOwner,
Repo: repoForkCore,
RefAction: protection.RefActionUpdate,
RefType: protection.RefTypeBranch,
RefNames: []string{in.Branch},
})
if err != nil {
return nil, nil, fmt.Errorf("failed to verify protection rules: %w", err)
}
if in.DryRunRules {
// DryRunRules is true: Just return rule violations and don't attempt to rebase.
return &types.ForkSyncOutput{
RuleViolations: violations,
DryRunRules: true,
}, nil, nil
}
if protection.IsCritical(violations) {
return nil, &types.MergeViolations{
RuleViolations: violations,
Message: protection.GenerateErrorMessageForBlockingViolations(violations),
}, nil
}
var refs []git.RefUpdate
if !in.DryRun {
headBranchRef, err := git.GetRefPath(in.Branch, gitenum.RefTypeBranch)
if err != nil {
return nil, nil, fmt.Errorf("failed to generate ref name: %w", err)
}
refs = append(refs, git.RefUpdate{
Name: headBranchRef,
Old: branchForkInfo.SHA,
New: sha.SHA{}, // update to the result of the merge
})
headBranchRef, err := git.GetRefPath(in.Branch, gitenum.RefTypeBranch)
if err != nil {
return nil, fmt.Errorf("failed to generate ref name: %w", err)
}
refs = append(refs, git.RefUpdate{
Name: headBranchRef,
Old: branchForkInfo.SHA,
New: sha.SHA{}, // update to the result of the merge
})
now := time.Now()
writeParams, err := controller.CreateRPCSystemReferencesWriteParams(ctx, c.urlProvider, session, repoForkCore)
if err != nil {
return nil, nil, fmt.Errorf("failed to create RPC write params: %w", err)
return nil, fmt.Errorf("failed to create RPC write params: %w", err)
}
mergeOutput, err := c.git.Merge(ctx, &git.MergeParams{
@ -208,29 +168,18 @@ func (c *Controller) ForkSync(
Method: mergeMethod,
})
if err != nil {
return nil, nil, fmt.Errorf("fork branch sync merge failed: %w", err)
}
if in.DryRun {
// DryRun is true: Just return rule violations and list of conflicted files.
// No reference is updated, so don't return the resulting commit SHA.
return &types.ForkSyncOutput{
RuleViolations: violations,
DryRun: true,
ConflictFiles: mergeOutput.ConflictFiles,
}, nil, nil
return nil, fmt.Errorf("fork branch sync merge failed: %w", err)
}
if mergeOutput.MergeSHA.IsEmpty() || len(mergeOutput.ConflictFiles) > 0 {
return nil, &types.MergeViolations{
ConflictFiles: mergeOutput.ConflictFiles,
RuleViolations: violations,
Message: fmt.Sprintf("Fork sync blocked by conflicting files: %v", mergeOutput.ConflictFiles),
return &types.ForkSyncOutput{
ConflictFiles: mergeOutput.ConflictFiles,
Message: fmt.Sprintf("Branch synchronization blocked by conflicting files: %v",
mergeOutput.ConflictFiles),
}, nil
}
return &types.ForkSyncOutput{
NewCommitSHA: mergeOutput.MergeSHA,
RuleViolations: violations,
}, nil, nil
NewCommitSHA: mergeOutput.MergeSHA,
}, nil
}

6
app/api/handler/repo/fork_sync.go
View File

@ -41,15 +41,11 @@ func HandleForkSync(repoCtrl *repo.Controller) http.HandlerFunc {
return
}
result, violation, err := repoCtrl.ForkSync(ctx, session, repoRef, in)
result, err := repoCtrl.ForkSync(ctx, session, repoRef, in)
if err != nil {
render.TranslatedUserError(ctx, w, err)
return
}
if violation != nil {
render.Unprocessable(w, violation)
return
}
render.JSON(w, http.StatusOK, result)
}

12
types/fork.go
View File

@ -17,12 +17,8 @@ package types
import "github.com/harness/gitness/git/sha"
type ForkSyncOutput struct {
AlreadyAncestor bool `json:"already_ancestor,omitempty"`
NewCommitSHA sha.SHA `json:"new_commit_sha,omitzero"`
RuleViolations []RuleViolations `json:"rule_violations,omitempty"`
DryRunRules bool `json:"dry_run_rules,omitempty"`
DryRun bool `json:"dry_run,omitempty"`
ConflictFiles []string `json:"conflict_files,omitempty"`
AlreadyAncestor bool `json:"already_ancestor,omitempty"`
NewCommitSHA sha.SHA `json:"new_commit_sha,omitzero"`
ConflictFiles []string `json:"conflict_files,omitempty"`
Message string `json:"message,omitempty"`
}