From 881fe7de064f923bf8a58ca33c2e52e096652a56 Mon Sep 17 00:00:00 2001 From: Ian Yenien Serrano Date: Wed, 14 Feb 2024 10:36:23 +0100 Subject: [PATCH 1/2] Change order of security in left menu --- public/plugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/plugin.ts b/public/plugin.ts index 7ac039fb1..6c33710ce 100644 --- a/public/plugin.ts +++ b/public/plugin.ts @@ -100,7 +100,7 @@ export class SecurityPlugin core.application.register({ id: PLUGIN_NAME, title: 'Security', - order: 9050, + order: 9030, mount: async (params: AppMountParameters) => { const { renderApp } = await import('./apps/configuration/configuration-app'); const [coreStart, depsStart] = await core.getStartServices(); @@ -121,7 +121,7 @@ export class SecurityPlugin deps.managementOverview.register({ id: PLUGIN_NAME, title: 'Security', - order: 9050, + order: 9030, description: i18n.translate('security.securityDescription', { defaultMessage: 'Configure how users access data in OpenSearch with authentication, access control and audit logging.', From 56e9a66e455570f4d97b3dbd86d2c8329eca2f2e Mon Sep 17 00:00:00 2001 From: Ian Yenien Serrano Date: Mon, 19 Feb 2024 17:10:43 +0100 Subject: [PATCH 2/2] Fix cypress test --- .github/workflows/cypress-test-tenancy-disabled.yml | 4 ++-- .github/workflows/cypress-test.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index 0f1150c0b..3336301cd 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -72,7 +72,7 @@ jobs: echo 'opensearch_security.cookie.secure: false' >> ./config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch & sleep 500 - git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git + git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git -b ${{ env.OPENSEARCH_VERSION }} cd opensearch-dashboards-functional-test npm install cypress --save-dev - yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js" + yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js" diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index e144bbe11..7d9f5edad 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -74,9 +74,9 @@ jobs: echo 'opensearch_security.multitenancy.enable_aggregation_view: true' >> ./config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch & sleep 500 - git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git + git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git -b ${{ env.OPENSEARCH_VERSION }} cd opensearch-dashboards-functional-test npm install cypress --save-dev - yarn cypress:run-with-security-and-aggregation-view --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js" - yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/multi_tenancy.js" - yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/default_tenant.js" + yarn cypress:run-with-security-and-aggregation-view --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js" + yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/multi_tenancy.js" + yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/default_tenant.js"