Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of VAULT-17590 Enterprise-side changes (using CI Vault over GH Secret) into release/1.13.x #21997

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #21587 to be assessed for backporting due to the inclusion of the label backport/1.13.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@VioletHynes
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


I thought this approach, of making two jobs, one running on OSS, one on Ent, was probably best, since we can keep both in the OSS repo and avoid merge conflicts if we need to change them.

Sorry about the commit history, I accidentally included the commits from the old PR. Should be good, though, and naturally, will be squashed.


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jul 21, 2023

CLA assistant check
All committers have signed the CLA.

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/violethynes/VAULT-17590-ent-changes/rightly-brief-mouse branch 2 times, most recently from 15fc72c to 6392634 Compare July 21, 2023 11:44
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 21, 2023
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

* VAULT-17590 Add failure notifications for OSS builds

* VAULT-17590 Incur build failure for testing purposes

* VAULT-17590 head_ref for testing

* VAULT-17590 rework to rely on completed status checks

* VAULT-17590 Use slackapi/slack-github-action

* VAULT-17590 Remember dollar sign

* VAULT-17590 finalize PR

* VAULT-17590 add extra empty line

* Update .github/workflows/build.yml

Co-authored-by: Kuba Wieczorek <[email protected]>

* Update .github/workflows/ci.yml

Co-authored-by: Kuba Wieczorek <[email protected]>

* VAULT-17590 fix typo

* VAULT-17590 ent workflow

* VAULT-17590 typo

---------

Co-authored-by: Kuba Wieczorek <[email protected]>
@miagilepner miagilepner force-pushed the backport/violethynes/VAULT-17590-ent-changes/rightly-brief-mouse branch from 3fcb8ab to dd22fea Compare July 21, 2023 12:36
@miagilepner miagilepner marked this pull request as ready for review July 21, 2023 12:42
@miagilepner miagilepner requested a review from a team as a code owner July 21, 2023 12:42
@VioletHynes VioletHynes enabled auto-merge (squash) July 21, 2023 12:50
@VioletHynes VioletHynes merged commit 46a72c0 into release/1.13.x Jul 21, 2023
@VioletHynes VioletHynes deleted the backport/violethynes/VAULT-17590-ent-changes/rightly-brief-mouse branch July 21, 2023 12:56
@github-actions
Copy link

CI Results:
All Go tests succeeded! ✅

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