mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-10 00:27:02 +02:00
After the merge workflow has been reversed and branches hosted in `hashicorp/vault` are downstream from community branches hosted in `hashicorp/vault-enterprise`, most contributions to the source code will originate in `hashicorp/vault-enterprise` and be backported to a community branch in hosted in `hashicorp/vault-enterprise`. These community branches will be considered the primary source of truth and we'll automatically push changes from them to mirrors hosted in `hashicorp/vault`. This workflow ought to yield a massive efficiency boost for HashiCorp contributors with access to `hashicorp/vault-enterprise`. Before the workflow would look something like: - Develop a change in vault-enterprise - Manually extract relevant changes from your vault-enterprise branch into a new community vault branch. - Add any stubs that might be required so as to support any enterprise only changes. - Get the community change reviewed. If changes are necessary it often means changing and testing them on both the enteprise and community branches. - Merge the community change - Wait for it to sync to enterprise - *Hope you changes have not broken the build*. If they have, fix the build. - Update your enterprise branch - Get the enterprise branch reviewed again - Merge enterprise change - Deal with complicated backports. After the workflow will look like: - Develop the change on enterprise - Get the change reviewed - Address feedback and test on the same branch - Merge the change - Automation will extract community changes and create a community backport PR for you depending on changes files and branch activeness. - Automation will create any enterprise backports for you. - Fix any backport as necessary - Merge the changes - The pipeline will automatically push the changes to the community branch mirror hosted in hashicorp/vault. No more - Duplicative reviews - Risky merges - Waiting for changes to sync from community to enterprise - Manual decompistion of changes from enterprise and community - *Doing the same PR 3 times* - Dealing with a different backport process depending on which branches are active or not. These changes do come at cost however. Since they always originate from `vault-enterprise` only HashiCorp employees can take advatange of the workflow. We need to be able to support community contributions that originate from the mirrors but retain attribution. That's what this PR is designed to do. The community will be able to open a pull request as normal and have it reviewed as such, but rather than merging it into the mirror we'll instead copy the PR and open it against the corresponding enterprise base branch and have it merged it from there. The change will automatically get backported to the community branch if necessary, which eventually makes it back to the mirror in hashicorp/vault. To handle our squash merge workflow while retaining the correct attribution, we'll automatically create merge commits in the copied PR that include `Co-Authored-By:` trailers for all commit authors on the original PR. We also take care to ensure that the HashiCorp maitainers that approve the PR and/or are assigned to it are also assigned to the copied PR. This change is only the tooling to enable it. The workflow that drives it will be implemented in VAULT-34827. Signed-off-by: Ryan Cragun <me@ryan.ec>
325 lines
8.8 KiB
Go
325 lines
8.8 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
type (
|
|
// RebaseMerges is the strategy for handling merge commits in rebases
|
|
RebaseMerges = string
|
|
// RebaseMerges is the strategy for rebasing
|
|
RebaseStrategy = string
|
|
// RebaseMerges is the strategy for handling whitespace during rebasing
|
|
WhitespaceAction = string
|
|
)
|
|
|
|
const (
|
|
RebaseMergesCousins RebaseMerges = "rebase-cousins"
|
|
RebaseMergesNoCousins RebaseMerges = "no-rebase-cousins"
|
|
|
|
RebaseStrategyTrue RebaseStrategy = "true"
|
|
RebaseStrategyFalse RebaseStrategy = "false"
|
|
RebaseStrategyMerges RebaseStrategy = "merges"
|
|
RebaseStrategyInteractive RebaseStrategy = "interactive"
|
|
|
|
WhitespaceActionNoWarn WhitespaceAction = "nowarn"
|
|
WhitespaceActionWarn WhitespaceAction = "warn"
|
|
WhitespaceActionFix WhitespaceAction = "fix"
|
|
WhitespaceActionError WhitespaceAction = "error"
|
|
WhitespaceActionErrorAll WhitespaceAction = "error-all"
|
|
)
|
|
|
|
// RebaseOpts are the git rebase flags and arguments
|
|
// See: https://git-scm.com/docs/git-rebase
|
|
type RebaseOpts struct {
|
|
// Options
|
|
AllowEmptyMessage bool // --allow-empty-message
|
|
Apply bool // --apply
|
|
Autosquash bool // --autosquash
|
|
Autostash bool // --autostash
|
|
CommitterDateIsAuthorDate bool // --committer-date-is-author-date
|
|
Context uint // -C
|
|
Empty EmptyCommit // --empty=
|
|
Exec string // --exec=
|
|
ForceRebase bool // --force-rebase
|
|
ForkPoint bool // --fork-point
|
|
GPGSign bool // --gpgsign
|
|
GPGSignKeyID string // --gpgsign=<key-id>
|
|
IgnoreDate bool // --ignore-date
|
|
IgnoreWhitespace bool // --ignore-whitespace
|
|
KeepBase string // --keep-base <upstream|branch>
|
|
KeepEmpty bool // --keep-empty
|
|
Merge bool // --merge
|
|
NoAutosquash bool // --no-autosquash
|
|
NoAutostash bool // --no-autostash
|
|
NoKeepEmpty bool // --no-keep-empty
|
|
NoReapplyCherryPicks bool // --no-reapply-cherry-picks
|
|
NoRebaseMerges bool // --no-rebase-merges
|
|
NoRescheduleFailedExec bool // --no-reschedule-failed-exec
|
|
NoReReReAutoupdate bool // --no-rerere-autoupdate
|
|
NoStat bool // --no-stat
|
|
NoUpdateRefs bool // --no-update-refs
|
|
NoVerify bool // --no-verify
|
|
Onto string // --onto
|
|
Quiet bool // --quiet
|
|
ReapplyCherryPicks bool // --reapply-cherry-picks
|
|
RebaseMerges RebaseMerges // --rebase-merges=<strategy>
|
|
RescheduleFailedExec bool // --reschedule-failed-exec
|
|
ResetAuthorDate bool // --reset-author-date
|
|
ReReReAutoupdate bool // --rerere-autoupdate
|
|
Root bool // --root
|
|
Stat bool // --stat
|
|
Strategy MergeStrategy // --strategy
|
|
StrategyOptions []MergeStrategyOption // --strategy-option=<option>
|
|
UpdateRefs bool // --update-refs
|
|
Verbose bool // --verbose
|
|
Verify bool // --verify
|
|
Whitespace WhitespaceAction //--whitespace=<handler>
|
|
|
|
// Args
|
|
Branch string // <branch>
|
|
|
|
// Mode Options
|
|
Continue bool // --continue
|
|
Skip bool // --skip
|
|
Abort bool // --abort
|
|
Quit bool // --quit
|
|
ShowCurrentPatch bool // --show-current-patch
|
|
}
|
|
|
|
// Rebase runs the git rebase command
|
|
func (c *Client) Rebase(ctx context.Context, opts *RebaseOpts) (*ExecResponse, error) {
|
|
return c.Exec(ctx, "rebase", opts)
|
|
}
|
|
|
|
// RebaseAbort aborts an in-progress rebase
|
|
func (c *Client) RebaseAbort(ctx context.Context) (*ExecResponse, error) {
|
|
return c.Rebase(ctx, &RebaseOpts{Abort: true})
|
|
}
|
|
|
|
// RebaseContinue continues an in-progress rebase
|
|
func (c *Client) RebaseContinue(ctx context.Context) (*ExecResponse, error) {
|
|
return c.Rebase(ctx, &RebaseOpts{Continue: true})
|
|
}
|
|
|
|
// RebaseQuit quits an in-progress rebase
|
|
func (c *Client) RebaseQuit(ctx context.Context) (*ExecResponse, error) {
|
|
return c.Rebase(ctx, &RebaseOpts{Quit: true})
|
|
}
|
|
|
|
// RebaseSkip skips an in-progress rebase
|
|
func (c *Client) RebaseSkip(ctx context.Context) (*ExecResponse, error) {
|
|
return c.Rebase(ctx, &RebaseOpts{Skip: true})
|
|
}
|
|
|
|
// RebaseShowCurrentPatch shows the current patch an in-progress rebase
|
|
func (c *Client) RebaseShowCurrentPatch(ctx context.Context) (*ExecResponse, error) {
|
|
return c.Rebase(ctx, &RebaseOpts{ShowCurrentPatch: true})
|
|
}
|
|
|
|
// String returns the options as a string
|
|
func (o *RebaseOpts) String() string {
|
|
return strings.Join(o.Strings(), " ")
|
|
}
|
|
|
|
// Strings returns the set options as a string slice
|
|
func (o *RebaseOpts) Strings() []string {
|
|
if o == nil {
|
|
return nil
|
|
}
|
|
|
|
switch {
|
|
case o.Abort:
|
|
return []string{"--abort"}
|
|
case o.Continue:
|
|
return []string{"--continue"}
|
|
case o.Quit:
|
|
return []string{"--quit"}
|
|
case o.Skip:
|
|
return []string{"--skip"}
|
|
case o.ShowCurrentPatch:
|
|
return []string{"--show-current-patch"}
|
|
}
|
|
|
|
opts := []string{}
|
|
|
|
if o.AllowEmptyMessage {
|
|
opts = append(opts, "--allow-empty-message")
|
|
}
|
|
if o.Apply {
|
|
opts = append(opts, "--apply")
|
|
}
|
|
|
|
if o.Autosquash {
|
|
opts = append(opts, "--autosquash")
|
|
}
|
|
|
|
if o.Autostash {
|
|
opts = append(opts, "--autostash")
|
|
}
|
|
|
|
if o.CommitterDateIsAuthorDate {
|
|
opts = append(opts, "--committer-date-is-author-date")
|
|
}
|
|
|
|
if o.Context > 0 {
|
|
opts = append(opts, "-C", strconv.FormatUint(uint64(o.Context), 10))
|
|
}
|
|
|
|
if o.Empty != "" {
|
|
opts = append(opts, fmt.Sprintf("--empty=%s", string(o.Empty)))
|
|
}
|
|
|
|
if o.Exec != "" {
|
|
opts = append(opts, fmt.Sprintf("--exec=%s", o.Exec))
|
|
}
|
|
|
|
if o.ForceRebase {
|
|
opts = append(opts, "--force-rebase")
|
|
}
|
|
|
|
if o.ForkPoint {
|
|
opts = append(opts, "--fork-point")
|
|
}
|
|
|
|
if o.GPGSign {
|
|
opts = append(opts, "--gpg-sign")
|
|
}
|
|
|
|
if o.GPGSignKeyID != "" {
|
|
opts = append(opts, fmt.Sprintf("--gpg-sign=%s", o.GPGSignKeyID))
|
|
}
|
|
|
|
if o.IgnoreDate {
|
|
opts = append(opts, "--ignore-date")
|
|
}
|
|
|
|
if o.IgnoreWhitespace {
|
|
opts = append(opts, "--ignore-whitespace")
|
|
}
|
|
|
|
if o.KeepBase != "" {
|
|
opts = append(opts, fmt.Sprintf("--keep-base=%s", o.KeepBase))
|
|
}
|
|
|
|
if o.KeepEmpty {
|
|
opts = append(opts, "--keep-empty")
|
|
}
|
|
|
|
if o.Merge {
|
|
opts = append(opts, "--merge")
|
|
}
|
|
|
|
if o.NoAutosquash {
|
|
opts = append(opts, "--no-autosquash")
|
|
}
|
|
|
|
if o.NoAutostash {
|
|
opts = append(opts, "--no-autostash")
|
|
}
|
|
|
|
if o.NoKeepEmpty {
|
|
opts = append(opts, "--no-keep-empty")
|
|
}
|
|
|
|
if o.NoReapplyCherryPicks {
|
|
opts = append(opts, "--no-reapply-cherry-picks")
|
|
}
|
|
|
|
if o.NoRebaseMerges {
|
|
opts = append(opts, "--no-rebase-merges")
|
|
}
|
|
|
|
if o.NoRescheduleFailedExec {
|
|
opts = append(opts, "--no-reschedule-failed-exec")
|
|
}
|
|
|
|
if o.NoReReReAutoupdate {
|
|
opts = append(opts, "--no-rerere-autoupdate")
|
|
}
|
|
|
|
if o.NoStat {
|
|
opts = append(opts, "--no-stat")
|
|
}
|
|
|
|
if o.NoUpdateRefs {
|
|
opts = append(opts, "--no-update-refs")
|
|
}
|
|
|
|
if o.NoVerify {
|
|
opts = append(opts, "--no-verify")
|
|
}
|
|
|
|
if o.Onto != "" {
|
|
opts = append(opts, fmt.Sprintf("--onto=%s", o.Onto))
|
|
}
|
|
|
|
if o.Quiet {
|
|
opts = append(opts, "--quiet")
|
|
}
|
|
|
|
if o.ReapplyCherryPicks {
|
|
opts = append(opts, "--reapply-cherry-picks")
|
|
}
|
|
|
|
if o.RebaseMerges != "" {
|
|
opts = append(opts, fmt.Sprintf("--rebase-merges=%s", string(o.RebaseMerges)))
|
|
}
|
|
|
|
if o.RescheduleFailedExec {
|
|
opts = append(opts, "--reschedule-failed-exec")
|
|
}
|
|
|
|
if o.ResetAuthorDate {
|
|
opts = append(opts, "--reset-author-date")
|
|
}
|
|
|
|
if o.ReReReAutoupdate {
|
|
opts = append(opts, "--rerere-autoupdate")
|
|
}
|
|
|
|
if o.Root {
|
|
opts = append(opts, "--root")
|
|
}
|
|
|
|
if o.Stat {
|
|
opts = append(opts, "--stat")
|
|
}
|
|
|
|
if o.Strategy != "" {
|
|
opts = append(opts, fmt.Sprintf("--strategy=%s", string(o.Strategy)))
|
|
}
|
|
|
|
for _, opt := range o.StrategyOptions {
|
|
opts = append(opts, fmt.Sprintf("--strategy-option=%s", string(opt)))
|
|
}
|
|
|
|
if o.UpdateRefs {
|
|
opts = append(opts, "--update-refs")
|
|
}
|
|
|
|
if o.Verbose {
|
|
opts = append(opts, "--verbose")
|
|
}
|
|
|
|
if o.Verify {
|
|
opts = append(opts, "--verify")
|
|
}
|
|
|
|
if o.Whitespace != "" {
|
|
opts = append(opts, fmt.Sprintf("--whitespace=%s", string(o.Whitespace)))
|
|
}
|
|
|
|
if o.Branch != "" {
|
|
opts = append(opts, o.Branch)
|
|
}
|
|
|
|
return opts
|
|
}
|