mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-07 07:07:05 +02:00
3611b8b709
Add a new `pipeline github sync branches` command that can synchronize two branches. We'll use this to synchronize the `hashicorp/vault-enterprise/ce/*` branches with `hashicorp/vault/*`. As the community repository is effectively a mirror of what is hosted in Enterprise, a scheduled sync cadence is probably fine. Eventually we'll hook the workflow and sync into the release pipeline to ensure that `hashicorp/vault` branches are up-to-date when cutting community releases. As part of this I also fixed a few static analysis issues that popped up when running `golangci-lint` and fixed a few smaller bugs. Signed-off-by: Ryan Cragun <me@ryan.ec>
76 lines
2.9 KiB
Go
76 lines
2.9 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"math"
|
|
"strconv"
|
|
|
|
"github.com/hashicorp/vault/tools/pipeline/internal/pkg/github"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var copyGithubPullRequestReq = github.CopyPullRequestReq{}
|
|
|
|
func newCopyGithubPullRequestCmd() *cobra.Command {
|
|
copyPRCmd := &cobra.Command{
|
|
Use: "pr [number]",
|
|
Short: "Copy a pull request",
|
|
Long: "Copy a pull request from the Community repository to the Enterprise repository",
|
|
RunE: runCopyGithubPullRequestCmd,
|
|
Args: func(cmd *cobra.Command, args []string) error {
|
|
switch len(args) {
|
|
case 1:
|
|
pr, err := strconv.ParseUint(args[0], 10, 0)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid pull number: %s: %w", args[0], err)
|
|
}
|
|
if pr <= math.MaxUint32 {
|
|
copyGithubPullRequestReq.PullNumber = uint(pr)
|
|
} else {
|
|
return fmt.Errorf("invalid pull number: %s: number is too large", args[0])
|
|
}
|
|
return nil
|
|
case 0:
|
|
return errors.New("no pull request number has been provided")
|
|
default:
|
|
return fmt.Errorf("invalid arguments: only pull request number is expected, received %d arguments: %v", len(args), args)
|
|
}
|
|
},
|
|
}
|
|
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.FromOrigin, "from-origin", "ce", "The name to use for the base remote origin")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.FromOwner, "from-owner", "hashicorp", "The Github organization")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.FromRepo, "from-repo", "vault", "The CE Github repository to copy the PR from")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.ToOrigin, "to-origin", "origin", "The name to use for the base remote origin")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.ToOwner, "to-owner", "hashicorp", "The Github organization")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.ToRepo, "to-repo", "vault-enterprise", "The Github repository. Private repositories require auth via a GITHUB_TOKEN env var")
|
|
copyPRCmd.PersistentFlags().StringVarP(©GithubPullRequestReq.RepoDir, "repo-dir", "d", "", "The path to the vault repository dir. If not set a temporary directory will be used")
|
|
copyPRCmd.PersistentFlags().StringVar(©GithubPullRequestReq.EntBranchSuffix, "ent-branch-suffix", "+ent", "The release branch suffix for enterprise branches")
|
|
|
|
return copyPRCmd
|
|
}
|
|
|
|
func runCopyGithubPullRequestCmd(cmd *cobra.Command, args []string) error {
|
|
cmd.SilenceUsage = true // Don't spam the usage on failure
|
|
|
|
res, err := copyGithubPullRequestReq.Run(context.TODO(), githubCmdState.Github, githubCmdState.Git)
|
|
|
|
switch rootCfg.format {
|
|
case "json":
|
|
b, err1 := res.ToJSON()
|
|
if err1 != nil {
|
|
return errors.Join(err, err1)
|
|
}
|
|
fmt.Println(string(b))
|
|
default:
|
|
fmt.Println(res.ToTable(err).Render())
|
|
}
|
|
|
|
return err
|
|
}
|