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

Bump consul-template 0.32.0 -> 0.33.0 #22322

Merged
merged 6 commits into from
Aug 14, 2023
Merged

Bump consul-template 0.32.0 -> 0.33.0 #22322

merged 6 commits into from
Aug 14, 2023

Conversation

tomhjp
Copy link
Contributor

@tomhjp tomhjp commented Aug 14, 2023

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.

@tomhjp tomhjp added agent dependencies Pull requests that update a dependency file backport/1.14.x labels Aug 14, 2023
@tomhjp tomhjp added this to the 1.14.2 milestone Aug 14, 2023
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Aug 14, 2023
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@github-actions
Copy link

CI Results:
All Go tests succeeded! ✅

Copy link
Contributor

@VioletHynes VioletHynes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Just some tiny nitpicks but neither are blockers. Thanks a bunch for the contribution!

secretIDPath := makeTempFile(t, "secret_id.txt", secretID+"\n")
defer os.Remove(roleIDPath)
defer os.Remove(secretIDPath)
roleIDPath, secretIDPath := setupAppRole(t, serverClient)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love to see this kind of refactoring!

command/agent_test.go Outdated Show resolved Hide resolved
command/agent_test.go Outdated Show resolved Hide resolved
@tomhjp tomhjp merged commit b07f919 into main Aug 14, 2023
97 checks passed
@tomhjp tomhjp deleted the bump-consul-template branch August 14, 2023 20:31
tomhjp added a commit that referenced this pull request Aug 15, 2023
Also adds a test to ensure the new VAULT_CACERT_BYTES functionality works.
Conflicts:
	go.mod
	go.sum
tomhjp added a commit that referenced this pull request Aug 15, 2023
Also adds a test to ensure the new VAULT_CACERT_BYTES functionality works.
Conflicts:
	go.mod
	go.sum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent dependencies Pull requests that update a dependency file 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.

2 participants