Skip to content

[VAULT-32028] pipeline(github): add sync branches sub-command - #31252

Merged
ryancragun merged 1 commit into
mainfrom
ryan/vault-38028
Jul 11, 2025
Merged

[VAULT-32028] pipeline(github): add sync branches sub-command#31252
ryancragun merged 1 commit into
mainfrom
ryan/vault-38028

Conversation

@ryancragun

Copy link
Copy Markdown
Collaborator

Description

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.

TODO only if you're a HashiCorp employee

  • Backport Labels: If this fix needs to be backported, use the appropriate backport/ label that matches the desired release branch. Note that in the CE repo, the latest release branch will look like backport/x.x.x, but older release branches will be backport/ent/x.x.x+ent.
    • LTS: If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

PCI review checklist

  • I have documented a clear reason for, and description of, the change I am making.
  • If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
  • If applicable, I've documented the impact of any changes to security controls.

Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.

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>
@ryancragun
ryancragun requested a review from a team as a code owner July 10, 2025 23:26
@ryancragun
ryancragun requested a review from hashievv July 10, 2025 23:26
@github-actions github-actions Bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 10, 2025
@github-actions

Copy link
Copy Markdown

CI Results:
All Go tests succeeded! ✅

@github-actions

Copy link
Copy Markdown

Build Results:
All builds succeeded! ✅

@ryancragun
ryancragun merged commit 3611b8b into main Jul 11, 2025
102 checks passed
@ryancragun
ryancragun deleted the ryan/vault-38028 branch July 11, 2025 20:08
Erfankam pushed a commit to Erfankam/vault that referenced this pull request Sep 1, 2025
…icorp#31252)

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog pr/no-milestone

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants