Merge remote-tracking branch 'upstream/master' into kbn-54375-migrate…

…-bootstrap-endpoint

package.json

@@ -712,7 +712,7 @@
     "json5": "^1.0.1",
     "jsondiffpatch": "0.4.1",
     "jsts": "^1.6.2",
-    "kea": "^2.2.0",
+    "kea": "^2.3.0",
     "keymirror": "0.1.1",
     "leaflet": "1.5.1",
     "leaflet-draw": "0.4.14",

packages/kbn-pm/dist/index.js

@@ -14759,14 +14759,15 @@ var isWin32 = __webpack_require__(121).platform() === 'win32';
 
 var slash = '/';
 var backslash = /\\/g;
-var enclosure = /[\{\[].*[\/]*.*[\}\]]$/;
+var enclosure = /[\{\[].*[\}\]]$/;
 var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
 var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
 
 /**
  * @param {string} str
  * @param {Object} opts
  * @param {boolean} [opts.flipBackslashes=true]
+ * @returns {string}
  */
 module.exports = function globParent(str, opts) {
   var options = Object.assign({ flipBackslashes: true }, opts);

src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile

@@ -70,6 +70,8 @@ RUN groupadd --gid 1000 kibana && \
       --home-dir /usr/share/kibana --no-create-home \
       kibana
 
+USER kibana
+
 ENTRYPOINT ["/bin/tini", "--"]
 
 CMD ["/usr/local/bin/kibana-docker"]

src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts

@@ -46,11 +46,18 @@ export function getTopNavConfig(
       const navItems: TopNavMenuData[] = [
         getOptionsConfig(actions[TopNavIds.OPTIONS], disableButton),
         getShareConfig(actions[TopNavIds.SHARE], disableButton),
-        getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE], disableButton),
-        getSaveConfig(actions[TopNavIds.SAVE], options.isNewDashboard, disableButton),
       ];
       if (!options.isNewDashboard) {
+        navItems.push(
+          getSaveConfig(actions[TopNavIds.SAVE], options.isNewDashboard, disableButton)
+        );
+        navItems.push(getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE], disableButton));
         navItems.push(getQuickSave(actions[TopNavIds.QUICK_SAVE], disableButton, options.isDirty));
+      } else {
+        navItems.push(getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE], true));
+        navItems.push(
+          getSaveConfig(actions[TopNavIds.SAVE], options.isNewDashboard, disableButton)
+        );
       }
       return navItems;
     default:
@@ -151,7 +158,7 @@ function getViewConfig(action: NavAction, disableButton?: boolean) {
     disableButton,
     id: 'cancel',
     label: i18n.translate('dashboard.topNave.cancelButtonAriaLabel', {
-      defaultMessage: 'Cancel',
+      defaultMessage: 'Switch to view mode',
     }),
     description: i18n.translate('dashboard.topNave.viewConfigDescription', {
       defaultMessage: 'Switch to view-only mode',

test/functional/apps/dashboard/dashboard_listing.ts

@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const listingTable = getService('listingTable');
 
   // FLAKY: https://github.com/elastic/kibana/issues/86948
-  describe.skip('dashboard listing page', function describeIndexTests() {
+  describe('dashboard listing page', function describeIndexTests() {
     const dashboardName = 'Dashboard Listing Test';
 
     before(async function () {
@@ -126,7 +126,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(onDashboardLandingPage).to.equal(false);
       });
 
-      it.skip('title match is case insensitive', async function () {
+      it('title match is case insensitive', async function () {
         await PageObjects.dashboard.gotoDashboardLandingPage();
         const currentUrl = await browser.getCurrentUrl();
         const newUrl = currentUrl + '&title=two%20words';

x-pack/plugins/actions/README.md

@@ -137,10 +137,9 @@ This is the primary function for an action type. Whenever the action needs to ex
 | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | actionId                                | The action saved object id that the action type is executing for.                                                                                                                                                                                                                                                                               |
 | config                                  | The action configuration. If you would like to validate the config before being passed to the executor, define `validate.config` within the action type.                                                              |
-| secrets                                  | The decrypted secrets object given to an action. This comes from the action saved object that is partially or fully encrypted within the data store. If you would like to validate the secrets object before being passed to the executor, define `validate.secrets` within the action type.                                                              |
+| secrets                                 | The decrypted secrets object given to an action. This comes from the action saved object that is partially or fully encrypted within the data store. If you would like to validate the secrets object before being passed to the executor, define `validate.secrets` within the action type.                                                              |
 | params                                  | Parameters for the execution. These will be given at execution time by either an alert or manually provided when calling the plugin provided execute function.                                                                                                                                                                                  |
-| services.callCluster(path, opts)        | Use this to do Elasticsearch queries on the cluster Kibana connects to. This function is the same as any other `callCluster` in Kibana but runs in the context of the user who is calling the action when security is enabled.                                                                                                                  |
-| services.getLegacyScopedClusterClient   | This function returns an instance of the LegacyScopedClusterClient scoped to the user who is calling the action when security is enabled.                                                                                                                                                                                                       |
+| services.scopedClusterClient            | Use this to do Elasticsearch queries on the cluster Kibana connects to. Serves the same purpose as the normal IClusterClient, but exposes an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead.|
 | services.savedObjectsClient             | This is an instance of the saved objects client. This provides the ability to do CRUD on any saved objects within the same space the alert lives in.<br><br>The scope of the saved objects client is tied to the user in context calling the execute API or the API key provided to the execute plugin function (only when security isenabled). |
 | services.log(tags, [data], [timestamp]) | Use this to create server logs. (This is the same function as server.log) 
 

x-pack/plugins/actions/server/actions_client.test.ts

@@ -27,6 +27,8 @@ import { actionExecutorMock } from './lib/action_executor.mock';
 import uuid from 'uuid';
 import { ActionsAuthorization } from './authorization/actions_authorization';
 import { actionsAuthorizationMock } from './authorization/actions_authorization.mock';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { elasticsearchClientMock } from '../../../../src/core/server/elasticsearch/client/mocks';
 
 jest.mock('../../../../src/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
@@ -36,7 +38,7 @@ jest.mock('../../../../src/core/server/saved_objects/service/lib/utils', () => (
 
 const defaultKibanaIndex = '.kibana';
 const unsecuredSavedObjectsClient = savedObjectsClientMock.create();
-const scopedClusterClient = elasticsearchServiceMock.createLegacyScopedClusterClient();
+const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
 const actionExecutor = actionExecutorMock.create();
 const authorization = actionsAuthorizationMock.create();
 const executionEnqueuer = jest.fn();
@@ -741,12 +743,14 @@ describe('getAll()', () => {
         ],
       };
       unsecuredSavedObjectsClient.find.mockResolvedValueOnce(expectedResult);
-      scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-        aggregations: {
-          '1': { doc_count: 6 },
-          testPreconfigured: { doc_count: 2 },
-        },
-      });
+      scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+        elasticsearchClientMock.createSuccessTransportRequestPromise({
+          aggregations: {
+            '1': { doc_count: 6 },
+            testPreconfigured: { doc_count: 2 },
+          },
+        })
+      );
 
       actionsClient = new ActionsClient({
         actionTypeRegistry,
@@ -812,12 +816,14 @@ describe('getAll()', () => {
           },
         ],
       });
-      scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-        aggregations: {
-          '1': { doc_count: 6 },
-          testPreconfigured: { doc_count: 2 },
-        },
-      });
+      scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+        elasticsearchClientMock.createSuccessTransportRequestPromise({
+          aggregations: {
+            '1': { doc_count: 6 },
+            testPreconfigured: { doc_count: 2 },
+          },
+        })
+      );
 
       await actionsClient.getAll();
 
@@ -870,12 +876,14 @@ describe('getAll()', () => {
       ],
     };
     unsecuredSavedObjectsClient.find.mockResolvedValueOnce(expectedResult);
-    scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-      aggregations: {
-        '1': { doc_count: 6 },
-        testPreconfigured: { doc_count: 2 },
-      },
-    });
+    scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        aggregations: {
+          '1': { doc_count: 6 },
+          testPreconfigured: { doc_count: 2 },
+        },
+      })
+    );
 
     actionsClient = new ActionsClient({
       actionTypeRegistry,
@@ -940,12 +948,14 @@ describe('getBulk()', () => {
           },
         ],
       });
-      scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-        aggregations: {
-          '1': { doc_count: 6 },
-          testPreconfigured: { doc_count: 2 },
-        },
-      });
+      scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+        elasticsearchClientMock.createSuccessTransportRequestPromise({
+          aggregations: {
+            '1': { doc_count: 6 },
+            testPreconfigured: { doc_count: 2 },
+          },
+        })
+      );
 
       actionsClient = new ActionsClient({
         actionTypeRegistry,
@@ -1008,12 +1018,14 @@ describe('getBulk()', () => {
           },
         ],
       });
-      scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-        aggregations: {
-          '1': { doc_count: 6 },
-          testPreconfigured: { doc_count: 2 },
-        },
-      });
+      scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+        elasticsearchClientMock.createSuccessTransportRequestPromise({
+          aggregations: {
+            '1': { doc_count: 6 },
+            testPreconfigured: { doc_count: 2 },
+          },
+        })
+      );
 
       await actionsClient.getBulk(['1']);
 
@@ -1063,12 +1075,14 @@ describe('getBulk()', () => {
         },
       ],
     });
-    scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
-      aggregations: {
-        '1': { doc_count: 6 },
-        testPreconfigured: { doc_count: 2 },
-      },
-    });
+    scopedClusterClient.asInternalUser.search.mockResolvedValueOnce(
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        aggregations: {
+          '1': { doc_count: 6 },
+          testPreconfigured: { doc_count: 2 },
+        },
+      })
+    );
 
     actionsClient = new ActionsClient({
       actionTypeRegistry,

x-pack/plugins/actions/server/actions_client.ts

@@ -10,7 +10,7 @@ import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 import { omitBy, isUndefined } from 'lodash';
 import {
-  ILegacyScopedClusterClient,
+  IScopedClusterClient,
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObject,
@@ -62,7 +62,7 @@ export interface CreateOptions {
 
 interface ConstructorOptions {
   defaultKibanaIndex: string;
-  scopedClusterClient: ILegacyScopedClusterClient;
+  scopedClusterClient: IScopedClusterClient;
   actionTypeRegistry: ActionTypeRegistry;
   unsecuredSavedObjectsClient: SavedObjectsClientContract;
   preconfiguredActions: PreConfiguredAction[];
@@ -80,7 +80,7 @@ export interface UpdateOptions {
 
 export class ActionsClient {
   private readonly defaultKibanaIndex: string;
-  private readonly scopedClusterClient: ILegacyScopedClusterClient;
+  private readonly scopedClusterClient: IScopedClusterClient;
   private readonly unsecuredSavedObjectsClient: SavedObjectsClientContract;
   private readonly actionTypeRegistry: ActionTypeRegistry;
   private readonly preconfiguredActions: PreConfiguredAction[];
@@ -506,7 +506,7 @@ function actionFromSavedObject(savedObject: SavedObject<RawAction>): ActionResul
 
 async function injectExtraFindData(
   defaultKibanaIndex: string,
-  scopedClusterClient: ILegacyScopedClusterClient,
+  scopedClusterClient: IScopedClusterClient,
   actionResults: ActionResult[]
 ): Promise<FindActionResult[]> {
   const aggs: Record<string, unknown> = {};
@@ -543,7 +543,7 @@ async function injectExtraFindData(
       },
     };
   }
-  const aggregationResult = await scopedClusterClient.callAsInternalUser('search', {
+  const { body: aggregationResult } = await scopedClusterClient.asInternalUser.search({
     index: defaultKibanaIndex,
     body: {
       aggs,