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 test: fix drift between enos directories into release/1.13.x #21980

Merged

Conversation

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

Backport

This PR is auto-generated from #21695 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:
@ryancragun
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.


Fix sync issues between oss and enterprise and add a lint check to ensure invalid scenarios aren't accidentally merged.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/ryan/sync-enos/mainly-direct-eel branch 2 times, most recently from 0eaf14d to a420deb Compare July 20, 2023 20:10
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 20, 2023

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 20, 2023
* Sync missing scenarios and modules
* Clean up variables and examples vars
* Add a `lint` make target for enos
* Update enos `fmt` workflow to run the `lint` target.
* Always use ipv4 addresses in target security groups.

Signed-off-by: Ryan Cragun <[email protected]>
@ryancragun ryancragun force-pushed the backport/ryan/sync-enos/mainly-direct-eel branch from 712ceb7 to 28db51b Compare July 20, 2023 20:18
@ryancragun ryancragun marked this pull request as ready for review July 20, 2023 20:18
@ryancragun ryancragun requested a review from a team as a code owner July 20, 2023 20:18
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@ryancragun ryancragun merged commit 3ac2cd3 into release/1.13.x Jul 20, 2023
@ryancragun ryancragun deleted the backport/ryan/sync-enos/mainly-direct-eel branch July 20, 2023 20:36
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants