fix x-pack tests

elastic · May 31, 2021 · 9e0d661 · 9e0d661
1 parent 2e98cd5
commit 9e0d661
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts
@@ -46,7 +46,9 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       message:
         'Kibana plugin functional tests will no longer allow corePluginDeprecations.secret config to be set to anything except 42.',
       correctiveActions: {
-        manualSteps: ['Step a', 'Step b'],
+        manualSteps: [
+          'This is an intentional deprecation for testing with no intention for having it fixed!',
+        ],
       },
       documentationUrl: 'config-secret-doc-url',
       deprecationType: 'config',

diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -58,6 +58,52 @@ export const deprecations = ({
       }
       return config;
     },
+    (config, fromPath, addDeprecation) => {
+      const es: Record<string, any> = get(config, 'elasticsearch');
+      if (es) {
+        if (es.username === 'elastic') {
+          addDeprecation({
+            message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
+            correctiveActions: {
+              manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
+            },
+          });
+        } else if (es.username === 'kibana') {
+          addDeprecation({
+            message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
+            correctiveActions: {
+              manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
+            },
+          });
+        }
+      }
+      return config;
+    },
+    (config, fromPath, addDeprecation) => {
+      const ssl: Record<string, any> = get(config, 'elasticsearch.ssl');
+      if (ssl) {
+        if (ssl.key !== undefined && ssl.certificate === undefined) {
+          addDeprecation({
+            message: `Setting [${fromPath}.key] without [${fromPath}.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+            correctiveActions: {
+              manualSteps: [
+                `Set [${fromPath}.ssl.certificate] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+              ],
+            },
+          });
+        } else if (ssl.certificate !== undefined && ssl.key === undefined) {
+          addDeprecation({
+            message: `Setting [${fromPath}.certificate] without [${fromPath}.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+            correctiveActions: {
+              manualSteps: [
+                `Set [${fromPath}.ssl.key] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+              ],
+            },
+          });
+        }
+      }
+      return config;
+    },
     rename('xpack_api_polling_frequency_millis', 'licensing.api_polling_frequency'),
   ];
 };
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts
@@ -45,7 +45,7 @@ describe('Overview page', () => {
 
     const kibanaDeprecationsMockResponse: DomainDeprecationDetails[] = [
       {
-        correctiveActions: {},
+        correctiveActions: { manualSteps: ['test-step'] },
         domainId: 'xpack.spaces',
         level: 'critical',
         message: