From 1c455e9e576918bc73793b9a9e29ee02bd16fdde Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 8 Sep 2021 15:17:19 +0200
Subject: [PATCH] [7.x] Improve xpack.security.session deprecation warnings

---
 .../security/server/config_deprecations.ts    | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 81b9a90855f537..3f352dd939e47e 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -162,14 +162,23 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   (settings, fromPath, addDeprecation) => {
     if (settings?.xpack?.security?.session?.idleTimeout === undefined) {
       addDeprecation({
-        message:
-          'Session idle timeout ("xpack.security.session.idleTimeout") will be set to 1 hour by default in the next major version (8.0).',
+        title: i18n.translate('xpack.security.deprecations.idleTimeoutTitle', {
+          defaultMessage: 'Default value of xpack.security.session.idleTimeout is changing',
+        }),
+        message: i18n.translate('xpack.security.deprecations.idleTimeoutMessage', {
+          defaultMessage:
+            'Session idle timeout ("xpack.security.session.idleTimeout") will be set to 1 hour by default in the next major version (8.0).',
+        }),
         documentationUrl:
           'https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html#session-idle-timeout',
         correctiveActions: {
           manualSteps: [
-            `Use "xpack.security.session.idleTimeout" in your Kibana configuration to change default session idle timeout.`,
-            `To disable session idle timeout, set "xpack.security.session.idleTimeout" to 0.`,
+            i18n.translate('xpack.security.deprecations.idleTimeout.manualStepOneMessage', {
+              defaultMessage: `Use "xpack.security.session.idleTimeout" in your Kibana configuration to change default session idle timeout.`,
+            }),
+            i18n.translate('xpack.security.deprecations.idleTimeout.manualStepTwoMessage', {
+              defaultMessage: `To disable session idle timeout, set "xpack.security.session.idleTimeout" to 0.`,
+            }),
           ],
         },
       });
@@ -177,14 +186,23 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
 
     if (settings?.xpack?.security?.session?.lifespan === undefined) {
       addDeprecation({
-        message:
-          'Session lifespan ("xpack.security.session.lifespan") will be set to 30 days by default in the next major version (8.0).',
+        title: i18n.translate('xpack.security.deprecations.lifespanTitle', {
+          defaultMessage: 'Default value of xpack.security.session.lifespan is changing',
+        }),
+        message: i18n.translate('xpack.security.deprecations.lifespanMessage', {
+          defaultMessage:
+            'Session lifespan ("xpack.security.session.lifespan") will be set to 30 days by default in the next major version (8.0).',
+        }),
         documentationUrl:
           'https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html#session-lifespan',
         correctiveActions: {
           manualSteps: [
-            `Use "xpack.security.session.lifespan" in your Kibana configuration to change default session lifespan.`,
-            `To disable session lifespan, set "xpack.security.session.lifespan" to 0.`,
+            i18n.translate('xpack.security.deprecations.lifespan.manualStepOneMessage', {
+              defaultMessage: `Use "xpack.security.session.lifespan" in your Kibana configuration to change default session lifespan.`,
+            }),
+            i18n.translate('xpack.security.deprecations.lifespan.manualStepTwoMessage', {
+              defaultMessage: `To disable session lifespan, set "xpack.security.session.lifespan" to 0.`,
+            }),
           ],
         },
       });