From ca5c60642e5a17623c364c49658e4a0fc1f8825c Mon Sep 17 00:00:00 2001 From: Balazs Nagy Date: Tue, 30 Oct 2018 00:29:35 +0100 Subject: [PATCH] Use tidy_revoked_certs instead of tidy_revocation_list (#5608) --- builtin/logical/pki/ca_test.go | 18 +++++++++--------- .../guides/secret-mgmt/pki-engine.html.md | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/logical/pki/ca_test.go b/builtin/logical/pki/ca_test.go index 7329b43af..3956fa671 100644 --- a/builtin/logical/pki/ca_test.go +++ b/builtin/logical/pki/ca_test.go @@ -507,9 +507,9 @@ func runSteps(t *testing.T, rootB, intB *backend, client *api.Client, rootName, // Run with a high safety buffer, nothing should happen { resp, err := client.Logical().Write(rootName+"tidy", map[string]interface{}{ - "safety_buffer": "3h", - "tidy_cert_store": true, - "tidy_revocation_list": true, + "safety_buffer": "3h", + "tidy_cert_store": true, + "tidy_revoked_certs": true, }) if err != nil { t.Fatal(err) @@ -528,9 +528,9 @@ func runSteps(t *testing.T, rootB, intB *backend, client *api.Client, rootName, // Run with both values set false, nothing should happen { resp, err := client.Logical().Write(rootName+"tidy", map[string]interface{}{ - "safety_buffer": "1s", - "tidy_cert_store": false, - "tidy_revocation_list": false, + "safety_buffer": "1s", + "tidy_cert_store": false, + "tidy_revoked_certs": false, }) if err != nil { t.Fatal(err) @@ -549,9 +549,9 @@ func runSteps(t *testing.T, rootB, intB *backend, client *api.Client, rootName, // Run with a short safety buffer and both set to true, both should be cleared { resp, err := client.Logical().Write(rootName+"tidy", map[string]interface{}{ - "safety_buffer": "1s", - "tidy_cert_store": true, - "tidy_revocation_list": true, + "safety_buffer": "1s", + "tidy_cert_store": true, + "tidy_revoked_certs": true, }) if err != nil { t.Fatal(err) diff --git a/website/source/guides/secret-mgmt/pki-engine.html.md b/website/source/guides/secret-mgmt/pki-engine.html.md index 55ffc87f0..c863ea5fb 100644 --- a/website/source/guides/secret-mgmt/pki-engine.html.md +++ b/website/source/guides/secret-mgmt/pki-engine.html.md @@ -673,7 +673,7 @@ expired and are past a certain buffer period beyond their expiration time. To remove revoked certificate and clean the CRL. ```plaintext -$ vault write pki_int/tidy tidy_cert_store=true tidy_revocation_list=true +$ vault write pki_int/tidy tidy_cert_store=true tidy_revoked_certs=true ``` #### API call using cURL @@ -686,7 +686,7 @@ the CRL. ```plaintext $ curl --header "X-Vault-Token: ..." \ --request POST \ - --data '{"tidy_cert_store": true, "tidy_revocation_list": true}' \ + --data '{"tidy_cert_store": true, "tidy_revoked_certs": true}' \ https://127.0.0.1:8200/v1/pki_int/tidy ```