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 Bump consul-template 0.32.0 -> 0.33.0 into release/1.14.x #22337

Conversation

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

Backport

This PR is auto-generated from #22322 to be assessed for backporting due to the inclusion of the label backport/1.14.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:
@tomhjp
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.


Bumps consul-template to v0.33.0. Changelog

In particular this pulls in hashicorp/consul-template#1782 to ensure the environment variable VAULT_CACERT_BYTES works equally well in both Vault Agent auto auth and Vault Agent templating, whereas previously it only worked for the former.

I've added a test for VAULT_CACERT_BYTES, and while it used a lot of copy-paste from the test TestAgent_Template_Basic, I also took some time to extract some common AppRole + KV setup from other tests into one consolidated function to reduce duplication.


Overview of commits

@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/bump-consul-template/pleasantly-funky-rat branch from 495f474 to 1e67f3d Compare August 15, 2023 10:52
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Aug 15, 2023
@tomhjp tomhjp closed this Aug 15, 2023
@tomhjp tomhjp deleted the backport/bump-consul-template/pleasantly-funky-rat branch August 15, 2023 10:52
@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