Adding Acceptance test for Auto Reload Config #1135
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmurret
force-pushed
the
jm/auto-reload
branch
2 times, most recently
from
7c02b61
to
48e5885
Compare
jmurret
commented
Apr 14, 2022
| @@ -264,7 +264,7 @@ func (c *CLICluster) SetupConsulClient(t *testing.T, secure bool) *api.Client { | |||
| consulClient, err := api.NewClient(config) | |||
| require.NoError(t, err) | |||
|
|
|||
| return consulClient | |||
| return consulClient, config.Address | |||
There was a problem hiding this comment.
Now also returning the address so that we can dial it in the test to get the cert and check the expiration.
jmurret
commented
Apr 14, 2022
| @@ -211,12 +211,38 @@ func (h *HelmCluster) Upgrade(t *testing.T, helmValues map[string]string) { | |||
| k8s.WaitForAllPodsToBeReady(t, h.kubernetesClient, h.helmOptions.KubectlOptions.Namespace, fmt.Sprintf("release=%s", h.releaseName)) | |||
| } | |||
|
|
|||
| func (h *HelmCluster) SetupConsulClient(t *testing.T, secure bool) *api.Client { | |||
| func (h *HelmCluster) CreatePortForwardTunnel(t *testing.T, remotePort int) string { | |||
There was a problem hiding this comment.
Extracted this out so that we can set up a tunnel without having to get another client.
jmurret
commented
Apr 14, 2022
jmurret
commented
Apr 14, 2022
jmurret
commented
Apr 14, 2022
| // TestVault_TlsAutoReload installs Vault, bootstraps it with secrets, policies, and Kube Auth Method. | ||
| // It then gets certs for https and rpc on the server. It then waits for the certs to rotate and checks | ||
| // that certs have different expirations. | ||
| func TestVault_TlsAutoReload(t *testing.T) { |
There was a problem hiding this comment.
This is essentially the TestVault() test, but we make the certificate expiration very short and then we also get HTTPS and RPC certs before and after the time we expect them to expire to confirm that they have been rotated, as indicated by a new NotAfter value.
jmurret
commented
Apr 14, 2022
|
|
||
| // verify that a previous cert expired and that a new one has been issued | ||
| // by comparing the NotAfter on the two certs. | ||
| require.NotEqual(t, httpsCert.NotAfter, httpsCert2.NotAfter) |
There was a problem hiding this comment.
These are the main assertion and how it differs from TestVault().
jmurret
requested review from
a team,
curtbushko and
t-eckert
and removed request for
a team
curtbushko
reviewed
Apr 14, 2022
| @@ -211,12 +211,38 @@ func (h *HelmCluster) Upgrade(t *testing.T, helmValues map[string]string) { | |||
| k8s.WaitForAllPodsToBeReady(t, h.kubernetesClient, h.helmOptions.KubectlOptions.Namespace, fmt.Sprintf("release=%s", h.releaseName)) | |||
| } | |||
|
|
|||
| func (h *HelmCluster) SetupConsulClient(t *testing.T, secure bool) *api.Client { | |||
| func (h *HelmCluster) CreatePortForwardTunnel(t *testing.T, remotePort int) string { | |||
| @@ -194,7 +194,7 @@ func (c *CLICluster) Destroy(t *testing.T) { | |||
| require.NoError(t, err) | |||
| } | |||
|
|
|||
| func (c *CLICluster) SetupConsulClient(t *testing.T, secure bool) *api.Client { | |||
| func (c *CLICluster) SetupConsulClient(t *testing.T, secure bool) (*api.Client, string) { | |||
There was a problem hiding this comment.
Maybe name the returns so that the signature is clearer when looking up the function
`func (c *CLICluster) SetupConsulClient(t *testing.T, secure bool) (client *api.Client, configAddress string)
t-eckert
reviewed
Apr 14, 2022
t-eckert
reviewed
Apr 14, 2022
t-eckert
reviewed
Apr 14, 2022
t-eckert
reviewed
Apr 14, 2022
t-eckert
approved these changes
Apr 19, 2022
thisisnotashwin
approved these changes
Apr 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: This looks like more files at first glance but there are many files that changed because of a signature change to
SetupConsulClientChanges proposed in this PR:
SetupConsulClientto also return the portward addressHow I've tested this PR:
How I expect reviewers to test this PR:
Checklist: