Flaky cypress

.github/CODEOWNERS

@@ -1 +1 @@
-* @cliu123 @cwperks @DarshitChanpura @davidlago @derek-ho @peternied @RyanL1997 @scrawfor99
+* @cliu123 @cwperks @DarshitChanpura @derek-ho @peternied @RyanL1997 @scrawfor99

.github/workflows/cypress-test-multidatasources-enabled-e2e.yml

@@ -17,6 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
+        iteration: [1, 2, 3, 4, 5, 6, 7, 8, 9]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -123,4 +124,4 @@ jobs:
         uses: ./.github/actions/run-cypress-tests
         with:
           dashboards_config_file: opensearch_dashboards_multidatasources.yml
-          yarn_command: 'yarn cypress:run --browser chrome --headed --env LOGIN_AS_ADMIN=true --spec "test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js"'
+          yarn_command: 'yarn cypress:run --browser electron --headless --env LOGIN_AS_ADMIN=true --spec "test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js"'

.github/workflows/integration-test.yml

@@ -6,7 +6,7 @@ env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
   PLUGIN_NAME: opensearch-security
-  OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
+  OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin
 
 jobs:
   tests:

MAINTAINERS.md

@@ -8,7 +8,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | ---------------- | ----------------------------------------------------- | ----------- |
 | Chang Liu        | [cliu123](https://github.com/cliu123)                 | Amazon      |
 | Darshit Chanpura | [DarshitChanpura](https://github.com/DarshitChanpura) | Amazon      |
-| Dave Lago        | [davidlago](https://github.com/davidlago)             | Amazon      |
 | Peter Nied       | [peternied](https://github.com/peternied)             | Amazon      |
 | Craig Perkins    | [cwperks](https://github.com/cwperks)                 | Amazon      |
 | Ryan Liang       | [RyanL1997](https://github.com/RyanL1997)             | Amazon      |
@@ -22,3 +21,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Yan Zeng      | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon      |
 | Bandini Bhopi | [bandinib-amzn](https://github.com/bandinib-amzn)   | Amazon      |
 | Tianle Huang  | [tianleh](https://github.com/tianleh)               | Amazon      |
+| Dave Lago     | [davidlago](https://github.com/davidlago)           | Contributor |

common/index.ts

@@ -34,6 +34,7 @@ export const OPENID_AUTH_LOGIN_WITH_FRAGMENT = '/auth/openid/captureUrlFragment'
 export const SAML_AUTH_LOGIN = '/auth/saml/login';
 export const SAML_AUTH_LOGIN_WITH_FRAGMENT = '/auth/saml/captureUrlFragment';
 export const ANONYMOUS_AUTH_LOGIN = '/auth/anonymous';
+export const AUTH_TYPE_PARAM = 'auth_type';
 
 export const OPENID_AUTH_LOGOUT = '/auth/openid/logout';
 export const SAML_AUTH_LOGOUT = '/auth/saml/logout';

cypress.config.js

@@ -21,6 +21,8 @@ module.exports = defineConfig({
   defaultCommandTimeout: 60000,
   requestTimeout: 60000,
   responseTimeout: 60000,
+  experimentalMemoryManagement: true,
+  numTestsKeptInMemory: 0,
   e2e: {
     setupNodeEvents(on, config) {},
     supportFile: 'test/cypress/support/e2e.js',

public/apps/configuration/app-router.tsx

@@ -17,7 +17,7 @@ import { EuiBreadcrumb, EuiPage, EuiPageBody, EuiPageSideBar } from '@elastic/eu
 import { flow, partial } from 'lodash';
 import React, { createContext, useState } from 'react';
 import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
-import { DataSourceOption } from '../../../../../src/plugins/data_source_management/public/components/data_source_selector/data_source_selector';
+import { DataSourceOption } from 'src/plugins/data_source_management/public/components/data_source_menu/types';
 import { AppDependencies } from '../types';
 import { AuditLogging } from './panels/audit-logging/audit-logging';
 import { AuditLoggingEditSettings } from './panels/audit-logging/audit-logging-edit-settings';
@@ -41,6 +41,7 @@ import { Action, RouteItem, SubAction } from './types';
 import { ResourceType } from '../../../common';
 import { buildHashUrl, buildUrl } from './utils/url-builder';
 import { CrossPageToast } from './cross-page-toast';
+import { getDataSourceFromUrl } from '../../utils/datasource-utils';
 
 const LANDING_PAGE_URL = '/getstarted';
 
@@ -155,7 +156,9 @@ export const DataSourceContext = createContext<DataSourceContextType | null>(nul
 
 export function AppRouter(props: AppDependencies) {
   const setGlobalBreadcrumbs = flow(getBreadcrumbs, props.coreStart.chrome.setBreadcrumbs);
-  const [dataSource, setDataSource] = useState<DataSourceOption>(LocalCluster);
+  const dataSourceFromUrl = getDataSourceFromUrl();
+
+  const [dataSource, setDataSource] = useState<DataSourceOption>(dataSourceFromUrl);
 
   return (
     <DataSourceContext.Provider value={{ dataSource, setDataSource }}>

public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap

@@ -241,7 +241,7 @@ exports[`Audit logs render when AuditLoggingSettings.enabled is true 1`] = `
 <div
   className="panel-restrict-width"
 >
-  <SecurityPluginTopNavMenu
+  <Memo()
     coreStart={
       Object {
         "http": 1,

public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx

@@ -75,6 +75,7 @@ export function InternalUserEdit(props: InternalUserEditDeps) {
   const [toasts, addToast, removeToast] = useToastState();
 
   const [isFormValid, setIsFormValid] = useState<boolean>(true);
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   React.useEffect(() => {
@@ -135,7 +136,13 @@ export function InternalUserEdit(props: InternalUserEditDeps) {
       setCrossPageToast(buildUrl(ResourceType.users), {
         id: 'updateUserSucceeded',
         color: 'success',
-        title: getSuccessToastMessage('User', props.action, userName),
+        title: `${getSuccessToastMessage(
+          'User',
+          props.action,
+          userName,
+          dataSourceEnabled,
+          dataSource
+        )}`,
       });
       // Redirect to user listing
       window.location.href = buildHashUrl(ResourceType.users);

public/apps/configuration/panels/internal-user-edit/test/internal-user-edit.test.tsx

@@ -56,7 +56,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -77,7 +77,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -98,7 +98,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -118,7 +118,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -140,7 +140,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />

public/apps/configuration/panels/permission-list/permission-list.tsx

@@ -192,6 +192,7 @@ export function PermissionList(props: AppDependencies) {
   const [selection, setSelection] = React.useState<PermissionListingItem[]>([]);
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<ExpandedRowMapInterface>({});
 
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   // Modal state
@@ -305,7 +306,13 @@ export function PermissionList(props: AppDependencies) {
             fetchData();
             addToast({
               id: 'saveSucceeded',
-              title: getSuccessToastMessage('Action group', action, groupName),
+              title: `${getSuccessToastMessage(
+                'Action group',
+                action,
+                groupName,
+                dataSourceEnabled,
+                dataSource
+              )}`,
               color: 'success',
             });
           } catch (e) {

public/apps/configuration/panels/permission-list/test/permission-list.test.tsx

@@ -109,7 +109,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -123,7 +123,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -145,7 +145,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -159,7 +159,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -186,7 +186,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -203,7 +203,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -223,7 +223,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />

public/apps/configuration/panels/role-edit/index-permission-panel.tsx

@@ -23,7 +23,7 @@ import {
   EuiSuperSelect,
   EuiTextArea,
 } from '@elastic/eui';
-import React, { Dispatch, Fragment, SetStateAction } from 'react';
+import React, { Dispatch, Fragment, SetStateAction, useEffect } from 'react';
 import { isEmpty } from 'lodash';
 import { RoleIndexPermission } from '../../types';
 import { ResourceType } from '../../../../../common';
@@ -320,9 +320,11 @@ export function IndexPermissionPanel(props: {
 }) {
   const { state, optionUniverse, setState } = props;
   // Show one empty row if there is no data.
-  if (isEmpty(state)) {
-    setState([getEmptyIndexPermission()]);
-  }
+  useEffect(() => {
+    if (isEmpty(state)) {
+      setState([getEmptyIndexPermission()]);
+    }
+  }, [state, setState]);
   return (
     <PanelWithHeader
       headerText="Index permissions"

public/apps/configuration/panels/role-edit/role-edit.tsx

@@ -89,6 +89,7 @@ export function RoleEdit(props: RoleEditDeps) {
 
   const [isFormValid, setIsFormValid] = useState<boolean>(true);
 
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   React.useEffect(() => {
@@ -174,7 +175,13 @@ export function RoleEdit(props: RoleEditDeps) {
       setCrossPageToast(buildUrl(ResourceType.roles, Action.view, roleName), {
         id: 'updateRoleSucceeded',
         color: 'success',
-        title: getSuccessToastMessage('Role', props.action, roleName),
+        title: `${getSuccessToastMessage(
+          'Role',
+          props.action,
+          roleName,
+          dataSourceEnabled,
+          dataSource
+        )}`,
       });
       // Redirect to role view
       window.location.href = buildHashUrl(ResourceType.roles, Action.view, roleName);

public/apps/configuration/panels/role-edit/tenant-panel.tsx

@@ -14,7 +14,7 @@
  */
 
 import { EuiButton, EuiComboBox, EuiFlexGroup, EuiFlexItem, EuiSuperSelect } from '@elastic/eui';
-import React, { Dispatch, Fragment, SetStateAction } from 'react';
+import React, { Dispatch, Fragment, SetStateAction, useEffect } from 'react';
 import { isEmpty } from 'lodash';
 import { RoleTenantPermission, TenantPermissionType, ComboBoxOptions } from '../../types';
 import {
@@ -129,9 +129,12 @@ export function TenantPanel(props: {
 }) {
   const { state, optionUniverse, setState } = props;
   // Show one empty row if there is no data.
-  if (isEmpty(state)) {
-    setState([getEmptyTenantPermission()]);
-  }
+
+  useEffect(() => {
+    if (isEmpty(state)) {
+      setState([getEmptyTenantPermission()]);
+    }
+  }, [state, setState]);
   return (
     <PanelWithHeader
       headerText="Tenant permissions"

public/apps/configuration/panels/role-edit/test/index-permission-panel.test.tsx

@@ -14,6 +14,7 @@
  */
 
 import { shallow } from 'enzyme';
+import { render } from '@testing-library/react';
 import React from 'react';
 import { RoleIndexPermission, ComboBoxOptions, FieldLevelSecurityMethod } from '../../../types';
 import { stringToComboBoxOption } from '../../../utils/combo-box-utils';
@@ -180,7 +181,7 @@ describe('Role edit - index permission panel', () => {
       const state: RoleIndexPermissionStateClass[] = [];
       const optionUniverse: ComboBoxOptions = [];
 
-      shallow(<IndexPermissionPanel {...{ state, optionUniverse, setState }} />);
+      render(<IndexPermissionPanel {...{ state, optionUniverse, setState }} />);
 
       expect(setState).toHaveBeenCalledTimes(1);
     });

public/apps/configuration/panels/role-edit/test/role-edit.test.tsx

@@ -63,7 +63,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -89,7 +89,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -112,7 +112,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />

public/apps/configuration/panels/role-edit/test/tenant-panel.test.tsx

@@ -24,6 +24,7 @@ import {
 import { shallow } from 'enzyme';
 import React from 'react';
 import { EuiComboBox, EuiButton, EuiSuperSelect } from '@elastic/eui';
+import { render } from '@testing-library/react';
 
 jest.mock('../../../utils/array-state-utils');
 // eslint-disable-next-line
@@ -76,7 +77,7 @@ describe('Role edit - tenant panel', () => {
     const setState = jest.fn();
 
     it('render an empty row if data is empty', () => {
-      shallow(<TenantPanel state={[]} optionUniverse={optionUniverse} setState={setState} />);
+      render(<TenantPanel state={[]} optionUniverse={optionUniverse} setState={setState} />);
 
       expect(setState).toHaveBeenCalledWith([
         {