Merge branch 'EMT-146_use_agent_service_for_status' of github.com:nnamdifrankie/kibana into EMT-146_use_agent_service_for_status

Author: nnamdifrankie

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -88,7 +88,6 @@
 |  [SavedQuery](./kibana-plugin-plugins-data-public.savedquery.md) |  |
 |  [SavedQueryService](./kibana-plugin-plugins-data-public.savedqueryservice.md) |  |
 |  [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) |  |
-|  [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) |  |
 |  [TabbedAggColumn](./kibana-plugin-plugins-data-public.tabbedaggcolumn.md) | \* |
 |  [TabbedTable](./kibana-plugin-plugins-data-public.tabbedtable.md) | \* |
 |  [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.id.md

@@ -62,7 +62,7 @@ test('`loadPluginBundles` creates a script tag and loads initializer', async ()
   const fakeScriptTag = createdScriptTags[0];
   expect(fakeScriptTag.setAttribute).toHaveBeenCalledWith(
     'src',
-    '/bundles/plugin/plugin-a/plugin-a.plugin.js'
+    '/bundles/plugin:plugin-a/plugin-a.plugin.js'
   );
   expect(fakeScriptTag.setAttribute).toHaveBeenCalledWith('id', 'kbn-plugin-plugin-a');
   expect(fakeScriptTag.onload).toBeInstanceOf(Function);
@@ -85,7 +85,7 @@ test('`loadPluginBundles` includes the basePath', async () => {
   const fakeScriptTag = createdScriptTags[0];
   expect(fakeScriptTag.setAttribute).toHaveBeenCalledWith(
     'src',
-    '/mybasepath/bundles/plugin/plugin-a/plugin-a.plugin.js'
+    '/mybasepath/bundles/plugin:plugin-a/plugin-a.plugin.js'
   );
 });
 
@@ -96,7 +96,7 @@ test('`loadPluginBundles` rejects if script.onerror is called', async () => {
   fakeScriptTag1.onerror(new Error('Whoa there!'));
 
   await expect(loadPromise).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Failed to load \\"plugin-a\\" bundle (/bundles/plugin/plugin-a/plugin-a.plugin.js)"`
+    `"Failed to load \\"plugin-a\\" bundle (/bundles/plugin:plugin-a/plugin-a.plugin.js)"`
   );
 });
 
@@ -105,7 +105,7 @@ test('`loadPluginBundles` rejects if timeout is reached', async () => {
     // Override the timeout to 1 ms for testi.
     loadPluginBundle(addBasePath, 'plugin-a', { timeoutMs: 1 })
   ).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Timeout reached when loading \\"plugin-a\\" bundle (/bundles/plugin/plugin-a/plugin-a.plugin.js)"`
+    `"Timeout reached when loading \\"plugin-a\\" bundle (/bundles/plugin:plugin-a/plugin-a.plugin.js)"`
   );
 });
 
@@ -115,11 +115,11 @@ test('`loadPluginBundles` rejects if bundle does attach an initializer to window
   const fakeScriptTag1 = createdScriptTags[0];
 
   // Setup a fake initializer as if a plugin bundle had actually been loaded.
-  coreWindow.__kbnBundles__['plugin/plugin-a'] = undefined;
+  coreWindow.__kbnBundles__['plugin:plugin-a'] = undefined;
   // Call the onload callback
   fakeScriptTag1.onload();
 
   await expect(loadPromise).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Definition of plugin \\"plugin-a\\" should be a function (/bundles/plugin/plugin-a/plugin-a.plugin.js)."`
+    `"Definition of plugin \\"plugin-a\\" should be a function (/bundles/plugin:plugin-a/plugin-a.plugin.js)."`
   );
 });

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.isviable.md

@@ -93,7 +93,7 @@ export const loadPluginBundle: LoadPluginBundle = <
 
       const script = document.createElement('script');
       // Assumes that all plugin bundles get put into the bundles/plugins subdirectory
-      const bundlePath = addBasePath(`/bundles/plugin/${pluginName}/${pluginName}.plugin.js`);
+      const bundlePath = addBasePath(`/bundles/plugin:${pluginName}/${pluginName}.plugin.js`);
       script.setAttribute('src', bundlePath);
       script.setAttribute('id', `kbn-plugin-${pluginName}`);
       script.setAttribute('async', '');

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.md

@@ -20,7 +20,7 @@
 import { getIndices } from './get_indices';
 import { IndexPatternCreationConfig } from '../../../../../../../../../plugins/index_pattern_management/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LegacyApiCaller } from '../../../../../../../../../plugins/data/public/search';
+import { LegacyApiCaller } from '../../../../../../../../../plugins/data/public/search/legacy';
 
 export const successfulResponse = {
   hits: {

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.search.md

@@ -78,10 +78,10 @@ if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
           '{{this}}',
         {{/each}}
         '{{regularBundlePath}}/commons.bundle.js',
-        {{!-- '{{regularBundlePath}}/plugin/data/data.plugin.js', --}}
-        '{{regularBundlePath}}/plugin/kibanaUtils/kibanaUtils.plugin.js',
-        '{{regularBundlePath}}/plugin/esUiShared/esUiShared.plugin.js',
-        '{{regularBundlePath}}/plugin/kibanaReact/kibanaReact.plugin.js'
+        {{!-- '{{regularBundlePath}}/plugin:data/data.plugin.js', --}}
+        '{{regularBundlePath}}/plugin:kibanaUtils/kibanaUtils.plugin.js',
+        '{{regularBundlePath}}/plugin:esUiShared/esUiShared.plugin.js',
+        '{{regularBundlePath}}/plugin:kibanaReact/kibanaReact.plugin.js'
     ], function () {
       load([
         '{{regularBundlePath}}/{{appId}}.bundle.js',

src/core/public/plugins/plugin_loader.test.ts

@@ -79,8 +79,8 @@ export function createBundlesRoute({
     ),
     ...npUiPluginPublicDirs.map(({ id, path }) =>
       buildRouteForBundles(
-        `${basePublicPath}/bundles/plugin/${id}/`,
-        `/bundles/plugin/${id}/`,
+        `${basePublicPath}/bundles/plugin:${id}/`,
+        `/bundles/plugin:${id}/`,
         path,
         fileHashCache
       )