Move kibana-keystore from data/ to config/

docs/migration/migrate_8_0.asciidoc

@@ -112,4 +112,8 @@ access level.
 been deprecated with warnings that have been logged throughout 7.x. Please use Kibana UI to re-generate the
 POST URL snippets if you depend on these for automated PDF reports.
 
+[float]
+==== bin/kibana-keystore has moved from the `data` folder to `config`
+*Details:* The Kibana keystore is used to add configuration changes.  It has been moved to Kibana's confugration directory.
+
 // end::notable-breaking-changes[]

src/cli_keystore/cli_keystore.js

@@ -22,10 +22,10 @@ import { join } from 'path';
 
 import { pkg } from '../core/server/utils';
 import Command from '../cli/command';
-import { getDataPath } from '../core/server/path';
+import { getConfigDirectory } from '../core/server/path';
 import { Keystore } from '../legacy/server/keystore';
 
-const path = join(getDataPath(), 'kibana.keystore');
+const path = join(getConfigDirectory(), 'kibana.keystore');
 const keystore = new Keystore(path);
 
 import { createCli } from './create';

src/core/server/path/index.test.ts

@@ -18,7 +18,7 @@
  */
 
 import { accessSync, constants } from 'fs';
-import { getConfigPath, getDataPath } from './';
+import { getConfigPath, getDataPath, getConfigDirectory } from './';
 
 describe('Default path finder', () => {
   it('should find a kibana.yml', () => {
@@ -30,4 +30,9 @@ describe('Default path finder', () => {
     const dataPath = getDataPath();
     expect(() => accessSync(dataPath, constants.R_OK)).not.toThrow();
   });
+
+  it('should find a config directory', () => {
+    const configDirectory = getConfigDirectory();
+    expect(() => accessSync(configDirectory, constants.R_OK)).not.toThrow();
+  });
 });

src/core/server/path/index.ts

@@ -31,6 +31,10 @@ const CONFIG_PATHS = [
   '/etc/kibana/kibana.yml',
 ].filter(isString);
 
+const CONFIG_DIRECTORIES = [process.env.KIBANA_PATH_CONF, fromRoot('config'), '/etc/kibana'].filter(
+  isString
+);
+
 const DATA_PATHS = [
   process.env.DATA_PATH, // deprecated
   fromRoot('data'),
@@ -54,6 +58,13 @@ function findFile(paths: string[]) {
  * @internal
  */
 export const getConfigPath = () => findFile(CONFIG_PATHS);
+
+/**
+ * Get the path where the config directories are stored
+ * @internal
+ */
+export const getConfigDirectory = () => findFile(CONFIG_DIRECTORIES);
+
 /**
  * Get the path where the data can be stored
  * @internal