github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

be more specific

Browse Source
pull/15661/head
R.B. Boyer 2 years ago
parent e3b26c40b5
commit 0bf754af30
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
agent/connect/ca/provider_vault_test.go
Unescape View File

@ -947,7 +947,7 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
var origIntermediate string var origIntermediate string
testutil.RunStep(t, "initialize secondary provider", func(t *testing.T) { testutil.RunStep(t, "initialize secondary provider", func(t *testing.T) {
// Get the intermediate CSR from provider. // Get the intermediate CSR from provider.
csrPEM, opaque, err := provider.GenerateIntermediateCSR() csrPEM, issuerID, err := provider.GenerateIntermediateCSR()
require.NoError(t, err) require.NoError(t, err)
csr, err := connect.ParseCSR(csrPEM) csr, err := connect.ParseCSR(csrPEM)
require.NoError(t, err) require.NoError(t, err)
@ -960,7 +960,7 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
rootPEM := root.PEM rootPEM := root.PEM
// Give the new intermediate to provider to use. // Give the new intermediate to provider to use.
require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, opaque)) require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, issuerID))
origIntermediate, err = provider.ActiveIntermediate() origIntermediate, err = provider.ActiveIntermediate()
require.NoError(t, err) require.NoError(t, err)
@ -968,7 +968,7 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
testutil.RunStep(t, "renew secondary provider", func(t *testing.T) { testutil.RunStep(t, "renew secondary provider", func(t *testing.T) {
// Get the intermediate CSR from provider. // Get the intermediate CSR from provider.
csrPEM, opaque, err := provider.GenerateIntermediateCSR() csrPEM, issuerID, err := provider.GenerateIntermediateCSR()
require.NoError(t, err) require.NoError(t, err)
csr, err := connect.ParseCSR(csrPEM) csr, err := connect.ParseCSR(csrPEM)
require.NoError(t, err) require.NoError(t, err)
@ -981,7 +981,7 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
rootPEM := root.PEM rootPEM := root.PEM
// Give the new intermediate to provider to use. // Give the new intermediate to provider to use.
require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, opaque)) require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, issuerID))
// This test was created to ensure that our calls to Vault // This test was created to ensure that our calls to Vault
// returns a new Intermediate certificate and further calls // returns a new Intermediate certificate and further calls

Write Preview
Loading…
Cancel
Save