Merge branch 'master' into tests/unskip-jest-tests-2

elastic · Sep 11, 2020 · 8524866 · 8524866
2 parents 2fae597 + 4c23669
commit 8524866
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts
@@ -116,6 +116,16 @@ test('logs warning if pluginId is not in camelCase format', async () => {
   `);
 });
 
+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 })));
+  });
+
+  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 () => {
   mockReadFile.mockImplementation((path, cb) => {
     cb(null, Buffer.from(JSON.stringify({ id: 'someId' })));

diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.ts
@@ -116,7 +116,7 @@ export async function parseManifest(
     );
   }
 
-  if (!isCamelCase(manifest.id)) {
+  if (!packageInfo.dist && !isCamelCase(manifest.id)) {
     log.warn(`Expect plugin "id" in camelCase, but found: ${manifest.id}`);
   }