From de821166ebcf0b331a2e6583da6575b3bba3668b Mon Sep 17 00:00:00 2001 From: Chris Capurso <1036769+ccapurso@users.noreply.github.com> Date: Wed, 11 May 2022 10:05:38 -0400 Subject: [PATCH] add license termination time to API and CLI docs (#15349) * add license termination time to API and CLI docs * ensure consistent time format --- website/content/api-docs/system/license.mdx | 10 ++++++---- website/content/docs/commands/license/get.mdx | 3 ++- website/content/docs/commands/license/inspect.mdx | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/website/content/api-docs/system/license.mdx b/website/content/api-docs/system/license.mdx index 2164842a98..0689f7bbbd 100644 --- a/website/content/api-docs/system/license.mdx +++ b/website/content/api-docs/system/license.mdx @@ -48,7 +48,7 @@ $ curl \ "data": { "autoloading_used": true, "autoloaded": { - "expiration_time": "2022-05-17T23:59:59.999Z", + "expiration_time": "2022-05-17T23:59:59Z", "features": [ "HSM", "Performance Replication", @@ -68,10 +68,11 @@ $ curl \ ], "license_id": "060d7820-fa59-f95c-832b-395db0aeb9ba", "performance_standby_count": 9999, - "start_time": "2021-05-17T00:00:00Z" + "start_time": "2021-05-17T00:00:00Z", + "termination_time": "2031-05-17T23:59:59Z" }, "persisted_autoload": { - "expiration_time": "2022-05-17T23:59:59.999Z", + "expiration_time": "2022-05-17T23:59:59Z", "features": [ "HSM", "Performance Replication", @@ -91,7 +92,8 @@ $ curl \ ], "license_id": "060d7820-fa59-f95c-832b-395db0aeb9ba", "performance_standby_count": 9999, - "start_time": "2021-05-17T00:00:00Z" + "start_time": "2021-05-17T00:00:00Z", + "termination_time": "2031-05-17T23:59:59Z" } } } diff --git a/website/content/docs/commands/license/get.mdx b/website/content/docs/commands/license/get.mdx index 56ac668b54..abdaedab14 100644 --- a/website/content/docs/commands/license/get.mdx +++ b/website/content/docs/commands/license/get.mdx @@ -19,11 +19,12 @@ Describe current license: $ vault license get Key Value --- ----- -expiration_time 2022-05-17T23:59:59.999Z +expiration_time 2022-05-17T23:59:59Z features [HSM Performance Replication DR Replication MFA Sentinel Seal Wrapping Control Groups Performance Standby Namespaces KMIP Entropy Augmentation Transform Secrets Engine Lease Count Quotas Key Management Secrets Engine Automated Snapshots] license_id 060d7820-fa59-f95c-832b-395db0aeb9ba performance_standby_count 9999 start_time 2021-05-17T00:00:00Z +termination_time 2031-05-17T23:59:59Z ``` Get stored license string: diff --git a/website/content/docs/commands/license/inspect.mdx b/website/content/docs/commands/license/inspect.mdx index 03b1804e9b..3a05960414 100644 --- a/website/content/docs/commands/license/inspect.mdx +++ b/website/content/docs/commands/license/inspect.mdx @@ -24,6 +24,7 @@ Installation ID: * Issue Time: 2021-05-17 19:33:47.93981585 +0000 UTC Start Time: 2021-05-17 00:00:00 +0000 UTC Expiration Time: 2022-05-17 23:59:59.999 +0000 UTC +Termination Time: 2031-05-17 23:59:59.999 +0000 UTC {"license_id":"060d7820-fa59-f95c-832b-395db0aeb9ba","customer_id":"5401ae3b-136b-3e47-3b43-432927fa03e7","installation_id":"*","issue_time":"2021-05-17T19:33:47.93981585Z","start_time":"2021-05-17T00:00:00Z","expiration_time":"2022-05-17T23:59:59.999Z","flags":{"modules":["multi-dc-scale","governance-policy","advanced-data-protection"]},"features":["HSM","Performance Replication","DR Replication","MFA","Sentinel","Seal Wrapping","Control Groups","Performance Standby","Namespaces","KMIP","Entropy Augmentation","Transform Secrets Engine","Lease Count Quotas","Key Management Secrets Engine","Automated Snapshots"],"performance_standby_count":9999} License is valid @@ -41,6 +42,7 @@ Installation ID: * Issue Time: 2021-05-17 19:33:47.93981585 +0000 UTC Start Time: 2021-05-17 00:00:00 +0000 UTC Expiration Time: 2022-05-17 23:59:59.999 +0000 UTC +Termination Time: 2031-05-17 23:59:59.999 +0000 UTC {"license_id":"060d7820-fa59-f95c-832b-395db0aeb9ba","customer_id":"5401ae3b-136b-3e47-3b43-432927fa03e7","installation_id":"*","issue_time":"2021-05-17T19:33:47.93981585Z","start_time":"2021-05-17T00:00:00Z","expiration_time":"2022-05-17T23:59:59.999Z","flags":{"modules":["multi-dc-scale","governance-policy","advanced-data-protection"]},"features":["HSM","Performance Replication","DR Replication","MFA","Sentinel","Seal Wrapping","Control Groups","Performance Standby","Namespaces","KMIP","Entropy Augmentation","Transform Secrets Engine","Lease Count Quotas","Key Management Secrets Engine","Automated Snapshots"],"performance_standby_count":9999} License is valid