[7.x] [Plugins Discovery] Enforce camelCase plugin IDs (#90752) (#91140)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
2025-04-24 17:59:23 -04:00 · 2021-02-11 16:41:22 +00:00 · 2021-02-11 16:41:22 +00:00 · 8aaf168347
commit 8aaf168347
parent 52497660a9
42 changed files with 86 additions and 100 deletions
--- a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts
+++ b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts
@ -9,12 +9,10 @@
 import { mockReadFile } from './plugin_manifest_parser.test.mocks';

 import { PluginDiscoveryErrorType } from './plugin_discovery_error';
-import { loggingSystemMock } from '../../logging/logging_system.mock';

 import { resolve } from 'path';
 import { parseManifest } from './plugin_manifest_parser';

-const logger = loggingSystemMock.createLogger();
 const pluginPath = resolve('path', 'existent-dir');
 const pluginManifestPath = resolve(pluginPath, 'kibana.json');
 const packageInfo = {
@ -34,7 +32,7 @@ test('return error when manifest is empty', async () => {
    cb(null, Buffer.from(''));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Unexpected end of JSON input (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -46,7 +44,7 @@ test('return error when manifest content is null', async () => {
    cb(null, Buffer.from('null'));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin manifest must contain a JSON encoded object. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -58,7 +56,7 @@ test('return error when manifest content is not a valid JSON', async () => {
    cb(null, Buffer.from('not-json'));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Unexpected token o in JSON at position 1 (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -70,7 +68,7 @@ test('return error when plugin id is missing', async () => {
    cb(null, Buffer.from(JSON.stringify({ version: 'some-version' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin manifest must contain an "id" property. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -82,37 +80,24 @@ test('return error when plugin id includes `.` characters', async () => {
    cb(null, Buffer.from(JSON.stringify({ id: 'some.name', version: 'some-version' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin "id" must not include \`.\` characters. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
  });
 });

-test('logs warning if pluginId is not in camelCase format', async () => {
+test('return error when pluginId is not in camelCase format', async () => {
+  expect.assertions(1);
  mockReadFile.mockImplementation((path, cb) => {
    cb(null, Buffer.from(JSON.stringify({ id: 'some_name', version: 'kibana', server: true })));
  });

-  expect(loggingSystemMock.collect(logger).warn).toHaveLength(0);
-  await parseManifest(pluginPath, packageInfo, logger);
-  expect(loggingSystemMock.collect(logger).warn).toMatchInlineSnapshot(`
-    Array [
-      Array [
-        "Expect plugin \\"id\\" in camelCase, but found: some_name",
-      ],
-    ]
-  `);
-});
-
-test('does not log pluginId format warning in dist mode', async () => {
-  mockReadFile.mockImplementation((path, cb) => {
-    cb(null, Buffer.from(JSON.stringify({ id: 'some_name', version: 'kibana', server: true })));
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
+    message: `Plugin "id" must be camelCase, but found: some_name. (invalid-manifest, ${pluginManifestPath})`,
+    type: PluginDiscoveryErrorType.InvalidManifest,
+    path: pluginManifestPath,
  });
-
-  expect(loggingSystemMock.collect(logger).warn).toHaveLength(0);
-  await parseManifest(pluginPath, { ...packageInfo, dist: true }, logger);
-  expect(loggingSystemMock.collect(logger).warn.length).toBe(0);
 });

 test('return error when plugin version is missing', async () => {
@ -120,7 +105,7 @@ test('return error when plugin version is missing', async () => {
    cb(null, Buffer.from(JSON.stringify({ id: 'someId' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin manifest for "someId" must contain a "version" property. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -132,7 +117,7 @@ test('return error when plugin expected Kibana version is lower than actual vers
    cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '6.4.2' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin "someId" is only compatible with Kibana version "6.4.2", but used Kibana version is "7.0.0-alpha1". (incompatible-version, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.IncompatibleVersion,
    path: pluginManifestPath,
@ -147,7 +132,7 @@ test('return error when plugin expected Kibana version cannot be interpreted as
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin "someId" is only compatible with Kibana version "non-sem-ver", but used Kibana version is "7.0.0-alpha1". (incompatible-version, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.IncompatibleVersion,
    path: pluginManifestPath,
@ -159,7 +144,7 @@ test('return error when plugin config path is not a string', async () => {
    cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '7.0.0', configPath: 2 })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `The "configPath" in plugin manifest for "someId" should either be a string or an array of strings. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -174,7 +159,7 @@ test('return error when plugin config path is an array that contains non-string
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `The "configPath" in plugin manifest for "someId" should either be a string or an array of strings. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -186,7 +171,7 @@ test('return error when plugin expected Kibana version is higher than actual ver
    cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '7.0.1' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Plugin "someId" is only compatible with Kibana version "7.0.1", but used Kibana version is "7.0.0-alpha1". (incompatible-version, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.IncompatibleVersion,
    path: pluginManifestPath,
@ -198,7 +183,7 @@ test('return error when both `server` and `ui` are set to `false` or missing', a
    cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '7.0.0' })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Both "server" and "ui" are missing or set to "false" in plugin manifest for "someId", but at least one of these must be set to "true". (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -211,7 +196,7 @@ test('return error when both `server` and `ui` are set to `false` or missing', a
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Both "server" and "ui" are missing or set to "false" in plugin manifest for "someId", but at least one of these must be set to "true". (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -234,7 +219,7 @@ test('return error when manifest contains unrecognized properties', async () =>
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).rejects.toMatchObject({
+  await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({
    message: `Manifest for plugin "someId" contains the following unrecognized properties: unknownOne,unknownTwo. (invalid-manifest, ${pluginManifestPath})`,
    type: PluginDiscoveryErrorType.InvalidManifest,
    path: pluginManifestPath,
@ -247,20 +232,20 @@ describe('configPath', () => {
      cb(null, Buffer.from(JSON.stringify({ id: 'plugin', version: '7.0.0', server: true })));
    });

-    const manifest = await parseManifest(pluginPath, packageInfo, logger);
+    const manifest = await parseManifest(pluginPath, packageInfo);
    expect(manifest.configPath).toBe(manifest.id);
  });

  test('falls back to plugin id in snakeCase format', async () => {
    mockReadFile.mockImplementation((path, cb) => {
-      cb(null, Buffer.from(JSON.stringify({ id: 'SomeId', version: '7.0.0', server: true })));
+      cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '7.0.0', server: true })));
    });

-    const manifest = await parseManifest(pluginPath, packageInfo, logger);
+    const manifest = await parseManifest(pluginPath, packageInfo);
    expect(manifest.configPath).toBe('some_id');
  });

-  test('not formated to snakeCase if defined explicitly as string', async () => {
+  test('not formatted to snakeCase if defined explicitly as string', async () => {
    mockReadFile.mockImplementation((path, cb) => {
      cb(
        null,
@ -270,11 +255,11 @@ describe('configPath', () => {
      );
    });

-    const manifest = await parseManifest(pluginPath, packageInfo, logger);
+    const manifest = await parseManifest(pluginPath, packageInfo);
    expect(manifest.configPath).toBe('somePath');
  });

-  test('not formated to snakeCase if defined explicitly as an array of strings', async () => {
+  test('not formatted to snakeCase if defined explicitly as an array of strings', async () => {
    mockReadFile.mockImplementation((path, cb) => {
      cb(
        null,
@ -284,7 +269,7 @@ describe('configPath', () => {
      );
    });

-    const manifest = await parseManifest(pluginPath, packageInfo, logger);
+    const manifest = await parseManifest(pluginPath, packageInfo);
    expect(manifest.configPath).toEqual(['somePath']);
  });
 });
@ -294,7 +279,7 @@ test('set defaults for all missing optional fields', async () => {
    cb(null, Buffer.from(JSON.stringify({ id: 'someId', version: '7.0.0', server: true })));
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).resolves.toEqual({
+  await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({
    id: 'someId',
    configPath: 'some_id',
    version: '7.0.0',
@ -325,7 +310,7 @@ test('return all set optional fields as they are in manifest', async () => {
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).resolves.toEqual({
+  await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({
    id: 'someId',
    configPath: ['some', 'path'],
    version: 'some-version',
@ -355,7 +340,7 @@ test('return manifest when plugin expected Kibana version matches actual version
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).resolves.toEqual({
+  await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({
    id: 'someId',
    configPath: 'some-path',
    version: 'some-version',
@ -385,7 +370,7 @@ test('return manifest when plugin expected Kibana version is `kibana`', async ()
    );
  });

-  await expect(parseManifest(pluginPath, packageInfo, logger)).resolves.toEqual({
+  await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({
    id: 'someId',
    configPath: 'some_id',
    version: 'some-version',
--- a/src/core/server/plugins/discovery/plugin_manifest_parser.ts
+++ b/src/core/server/plugins/discovery/plugin_manifest_parser.ts
@ -12,7 +12,6 @@ import { coerce } from 'semver';
 import { promisify } from 'util';
 import { snakeCase } from 'lodash';
 import { isConfigPath, PackageInfo } from '../../config';
-import { Logger } from '../../logging';
 import { PluginManifest } from '../types';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 import { isCamelCase } from './is_camel_case';
@ -63,8 +62,7 @@ const KNOWN_MANIFEST_FIELDS = (() => {
 */
 export async function parseManifest(
  pluginPath: string,
-  packageInfo: PackageInfo,
-  log: Logger
+  packageInfo: PackageInfo
 ): Promise<PluginManifest> {
  const manifestPath = resolve(pluginPath, MANIFEST_FILE_NAME);

@ -105,8 +103,11 @@ export async function parseManifest(
    );
  }

-  if (!packageInfo.dist && !isCamelCase(manifest.id)) {
-    log.warn(`Expect plugin "id" in camelCase, but found: ${manifest.id}`);
+  if (!isCamelCase(manifest.id)) {
+    throw PluginDiscoveryError.invalidManifest(
+      manifestPath,
+      new Error(`Plugin "id" must be camelCase, but found: ${manifest.id}.`)
+    );
  }

  if (!manifest.version || typeof manifest.version !== 'string') {
--- a/src/core/server/plugins/discovery/plugins_discovery.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.ts
@ -179,7 +179,7 @@ function createPlugin$(
  coreContext: CoreContext,
  instanceInfo: InstanceInfo
 ) {
-  return from(parseManifest(path, coreContext.env.packageInfo, log)).pipe(
+  return from(parseManifest(path, coreContext.env.packageInfo)).pipe(
    map((manifest) => {
      log.debug(`Successfully discovered plugin "${manifest.id}" at "${path}"`);
      const opaqueId = Symbol(manifest.id);
--- a/test/common/fixtures/plugins/newsfeed/kibana.json
+++ b/test/common/fixtures/plugins/newsfeed/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "newsfeed-fixtures",
+  "id": "newsfeedFixtures",
  "version": "kibana",
  "server": true,
  "ui": false
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/kibana.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "kbn_tp_run_pipeline",
+  "id": "kbnTpRunPipeline",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "requiredPlugins": [
--- a/test/plugin_functional/plugins/app_link_test/kibana.json
+++ b/test/plugin_functional/plugins/app_link_test/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "app_link_test",
+  "id": "appLinkTest",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "server": false,
--- a/test/plugin_functional/plugins/core_app_status/kibana.json
+++ b/test/plugin_functional/plugins/core_app_status/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_app_status",
+  "id": "coreAppStatus",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_app_status"],
--- a/test/plugin_functional/plugins/core_plugin_a/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_a/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_plugin_a",
+  "id": "corePluginA",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_a"],
--- a/test/plugin_functional/plugins/core_plugin_appleave/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_appleave/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_plugin_appleave",
+  "id": "corePluginAppleave",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_appleave"],
--- a/test/plugin_functional/plugins/core_plugin_b/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_b/kibana.json
@ -1,10 +1,10 @@
 {
-  "id": "core_plugin_b",
+  "id": "corePluginB",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_b"],
  "server": true,
  "ui": true,
-  "requiredPlugins": ["core_plugin_a"],
-  "optionalPlugins": ["core_plugin_c"]
+  "requiredPlugins": ["corePluginA"],
+  "optionalPlugins": ["corePluginC"]
 }
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@ -16,7 +16,7 @@ declare global {
 }

 export interface CorePluginBDeps {
-  core_plugin_a: CorePluginAPluginSetup;
+  corePluginA: CorePluginAPluginSetup;
 }

 export class CorePluginBPlugin
@ -37,7 +37,7 @@ export class CorePluginBPlugin

    return {
      sayHi() {
-        return `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
+        return `Plugin A said: ${deps.corePluginA.getGreeting()}`;
      },
    };
  }
--- a/test/plugin_functional/plugins/core_plugin_chromeless/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_plugin_chromeless",
+  "id": "corePluginChromeless",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_chromeless"],
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_plugin_helpmenu",
+  "id": "corePluginHelpmenu",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_helpmenu"],
--- a/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "core_plugin_route_timeouts",
+  "id": "corePluginRouteTimeouts",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["core_plugin_route_timeouts"],
--- a/test/plugin_functional/plugins/core_provider_plugin/kibana.json
+++ b/test/plugin_functional/plugins/core_provider_plugin/kibana.json
@ -1,8 +1,8 @@
 {
-  "id": "core_provider_plugin",
+  "id": "coreProviderPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
-  "optionalPlugins": ["core_plugin_a", "core_plugin_b", "licensing", "globalSearchTest"],
+  "optionalPlugins": ["corePluginA", "corePluginB", "licensing", "globalSearchTest"],
  "server": false,
  "ui": true
 }
--- a/test/plugin_functional/plugins/data_search/kibana.json
+++ b/test/plugin_functional/plugins/data_search/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "data_search_plugin",
+  "id": "dataSearchPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["data_search_test_plugin"],
--- a/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "elasticsearch_client_plugin",
+  "id": "elasticsearchClientPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "server": true,
--- a/test/plugin_functional/plugins/index_patterns/kibana.json
+++ b/test/plugin_functional/plugins/index_patterns/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "index_patterns_test_plugin",
+  "id": "indexPatternsTestPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["index_patterns_test_plugin"],
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/kibana.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "kbn_sample_panel_action",
+  "id": "kbnSamplePanelAction",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["kbn_sample_panel_action"],
--- a/test/plugin_functional/plugins/kbn_top_nav/kibana.json
+++ b/test/plugin_functional/plugins/kbn_top_nav/kibana.json
@ -1,9 +1,9 @@
 {
-  "id": "kbn_top_nav",
+  "id": "kbnTopNav",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["kbn_top_nav"],
  "server": false,
  "ui": true,
  "requiredPlugins": ["navigation"]
-}
+}
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/kibana.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "kbn_tp_custom_visualizations",
+  "id": "kbnTpCustomVisualizations",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "requiredPlugins": [
--- a/test/plugin_functional/plugins/management_test_plugin/kibana.json
+++ b/test/plugin_functional/plugins/management_test_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "management_test_plugin",
+  "id": "managementTestPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["management_test_plugin"],
--- a/test/plugin_functional/plugins/rendering_plugin/kibana.json
+++ b/test/plugin_functional/plugins/rendering_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "rendering_plugin",
+  "id": "renderingPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["rendering_plugin"],
--- a/test/plugin_functional/plugins/session_notifications/kibana.json
+++ b/test/plugin_functional/plugins/session_notifications/kibana.json
@ -1,9 +1,9 @@
 {
-  "id": "session_notifications",
+  "id": "sessionNotifications",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["session_notifications"],
  "server": false,
  "ui": true,
  "requiredPlugins": ["data", "navigation"]
-}
+}
--- a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
+++ b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "ui_settings_plugin",
+  "id": "uiSettingsPlugin",
  "version": "0.0.1",
  "kibanaVersion": "kibana",
  "configPath": ["ui_settings_plugin"],
--- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
      it('should run the new platform plugins', async () => {
        expect(
          await browser.execute(() => {
-            return window._coreProvider.setup.plugins.core_plugin_b.sayHi();
+            return window._coreProvider.setup.plugins.corePluginB.sayHi();
          })
        ).to.be('Plugin A said: Hello from Plugin A!');
      });
@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
      it('should send kbn-system-request header when asSystemRequest: true', async () => {
        expect(
          await browser.executeAsync(async (cb) => {
-            window._coreProvider.start.plugins.core_plugin_b.sendSystemRequest(true).then(cb);
+            window._coreProvider.start.plugins.corePluginB.sendSystemRequest(true).then(cb);
          })
        ).to.be('/core_plugin_b/system_request says: "System request? true"');
      });
@ -73,7 +73,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
      it('should not send kbn-system-request header when asSystemRequest: false', async () => {
        expect(
          await browser.executeAsync(async (cb) => {
-            window._coreProvider.start.plugins.core_plugin_b.sendSystemRequest(false).then(cb);
+            window._coreProvider.start.plugins.corePluginB.sendSystemRequest(false).then(cb);
          })
        ).to.be('/core_plugin_b/system_request says: "System request? false"');
      });
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/kibana.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "aad-fixtures",
+  "id": "aadFixtures",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/kibana.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "actions_simulators",
+  "id": "actionsSimulators",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/kibana.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "task_manager_fixture",
+  "id": "taskManagerFixture",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/functional_cors/plugins/kibana_cors_test/kibana.json
+++ b/x-pack/test/functional_cors/plugins/kibana_cors_test/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "kibana_cors_test",
+  "id": "kibanaCorsTest",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["test", "cors"],
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "iframe_embedded",
+  "id": "iframeEmbedded",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "server": true,
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/kibana.json
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "alerting_fixture",
+  "id": "alertingFixture",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "elasticsearch_client_xpack",
+  "id": "elasticsearchClientXpack",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "server": true,
--- a/x-pack/test/plugin_api_integration/plugins/event_log/kibana.json
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "event_log_fixture",
+  "id": "eventLogFixture",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/kibana.json
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "feature_usage_test",
+  "id": "featureUsageTest",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack", "feature_usage_test"],
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/kibana.json
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "sample_task_plugin",
+  "id": "sampleTaskPlugin",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/kibana.json
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "task_manager_performance",
+  "id": "taskManagerPerformance",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack"],
--- a/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "resolver_test",
+  "id": "resolverTest",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "configPath": ["xpack", "resolverTest"],
--- a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/kibana.json
+++ b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "oidc_provider_plugin",
+  "id": "oidcProviderPlugin",
  "version": "8.0.0",
  "kibanaVersion": "kibana",
  "server": true,
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/kibana.json
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "saml_provider_plugin",
+  "id": "samlProviderPlugin",
  "version": "8.0.0",
  "kibanaVersion": "kibana",
  "server": true,
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json
@ -1,5 +1,5 @@
 {
-  "id": "foo_plugin",
+  "id": "fooPlugin",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
  "requiredPlugins": ["features"],
--- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/kibana.json
+++ b/x-pack/test/usage_collection/plugins/stack_management_usage_test/kibana.json
@ -1,8 +1,8 @@
 {
-  "id": "StackManagementUsageTest",
+  "id": "stackManagementUsageTest",
  "version": "1.0.0",
  "kibanaVersion": "kibana",
-  "configPath": ["xpack", "StackManagementUsageTest"],
+  "configPath": ["xpack", "stackManagementUsageTest"],
  "requiredPlugins": [],
  "server": false,
  "ui": true