Revert security & spaces changes.

elastic · Sep 20, 2021 · a182670 · a182670
1 parent 06cdaba
commit a182670
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -342,13 +342,12 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(config);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Configuring \\"xpack.security.enabled\\" is deprecated and will be removed in 8.0.0.",
         "Disabling the security plugin \\"xpack.security.enabled\\" will only be supported by disable security in Elasticsearch.",
       ]
     `);
   });
 
-  it('warns when the security plugin is enabled', () => {
+  it('does not warn when the security plugin is enabled', () => {
     const config = {
       xpack: {
         security: {
@@ -358,21 +357,6 @@ describe('Config Deprecations', () => {
     };
     const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
     expect(migrated).toEqual(config);
-    expect(messages).toMatchInlineSnapshot(`
-      Array [
-        "Configuring \\"xpack.security.enabled\\" is deprecated and will be removed in 8.0.0.",
-      ]
-    `);
-  });
-
-  it('does not warn with default config', () => {
-    const config = {
-      xpack: {
-        security: {},
-      },
-    };
-    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
-    expect(migrated).toEqual(config);
     expect(messages).toHaveLength(0);
   });
 });
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
@@ -9,11 +9,9 @@ import { i18n } from '@kbn/i18n';
 import type { ConfigDeprecationProvider } from 'src/core/server';
 
 export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
-  deprecate,
   rename,
   unused,
 }) => [
-  deprecate('enabled', '8.0.0'),
   rename('sessionTimeout', 'session.idleTimeout'),
   rename('authProviders', 'authc.providers'),
 

diff --git a/x-pack/plugins/spaces/server/config.ts b/x-pack/plugins/spaces/server/config.ts
@@ -35,8 +35,8 @@ const disabledDeprecation: ConfigDeprecation = (config, fromPath, addDeprecation
   }
 };
 
-export const spacesConfigDeprecationProvider: ConfigDeprecationProvider = ({ deprecate }) => {
-  return [deprecate('enabled', '8.0.0'), disabledDeprecation];
+export const spacesConfigDeprecationProvider: ConfigDeprecationProvider = () => {
+  return [disabledDeprecation];
 };
 
 export type ConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>