Test change

Signed-off-by: Craig Perkins <[email protected]>
cwperks · May 23, 2024 · 018cc7f · 018cc7f
1 parent e3cb5d4
commit 018cc7f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/.github/actions/setup-opensearch-dashboards/action.yml b/.github/actions/setup-opensearch-dashboards/action.yml
@@ -115,8 +115,8 @@ runs:
       if: ${{ runner.os == 'Linux' }}
       shell: bash
       run: |
-        rm ./OpenSearch-Dashboards/plugins/security-admin-dashboards-plugin/opensearch_dashboards.json
-        cat << 'EOT' > ./OpenSearch-Dashboards/plugins/security-admin-dashboards-plugin/opensearch_dashboards.json
+        rm ./OpenSearch-Dashboards/plugins/security-dashboards-plugin/opensearch_dashboards.json
+        cat << 'EOT' > ./OpenSearch-Dashboards/plugins/security-dashboards-plugin/opensearch_dashboards.json
         {
           "id": "securityAdminDashboards",
           "version": "3.0.0.0",

diff --git a/common/index.ts b/common/index.ts
@@ -13,8 +13,8 @@
  *   permissions and limitations under the License.
  */
 
-export const PLUGIN_ID = 'opensearchDashboardsSecurityAdmin';
-export const PLUGIN_NAME = 'security-admin-dashboards-plugin';
+export const PLUGIN_ID = 'opensearchDashboardsSecurity';
+export const PLUGIN_NAME = 'security-dashboards-plugin';
 
 export const APP_ID_LOGIN = 'login';
 export const APP_ID_CUSTOMERROR = 'customerror';

diff --git a/test/cypress/e2e/multi-datasources/multi_datasources_disabled.spec.js b/test/cypress/e2e/multi-datasources/multi_datasources_disabled.spec.js
@@ -27,7 +27,7 @@ describe('Multi-datasources disabled', () => {
 
   it('Checks Get Started Tab', () => {
     // Remote cluster purge cache
-    cy.visit(`http://localhost:5601/app/security-admin-dashboards-plugin#/getstarted`);
+    cy.visit(`http://localhost:5601/app/security-dashboards-plugin#/getstarted`);
 
     cy.contains('h1', 'Get started');
     cy.get('[data-test-subj="dataSourceSelectableButton"]').should('not.exist');

diff --git a/test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js b/test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js
@@ -93,7 +93,7 @@ describe('Multi-datasources enabled', () => {
   it('Checks Get Started Tab', () => {
     // Remote cluster purge cache
     cy.visit(
-      `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/getstarted`
+      `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/getstarted`
     );
 
     cy.contains('h1', 'Get started');
@@ -106,9 +106,7 @@ describe('Multi-datasources enabled', () => {
   });
 
   it('Checks Auth Tab', () => {
-    cy.visit(
-      `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/auth`
-    );
+    cy.visit(`http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/auth`);
 
     cy.get('.panel-header-count').first().invoke('text').should('contain', '(1)');
   });
@@ -127,7 +125,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/users`
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/users`
       );
 
       cy.get('[data-test-subj="tableHeaderCell_username_0"]').click();
@@ -147,7 +145,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/permissions`
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/permissions`
       );
 
       // Permission exists on the remote data source
@@ -158,9 +156,7 @@ describe('Multi-datasources enabled', () => {
 
   it('Checks Tenancy Tab', () => {
     // Datasource is locked to local cluster for tenancy tab
-    cy.visit(
-      `http://localhost:5601/app/security-admin-dashboards-plugin${localDataSourceUrl}#/tenants`
-    );
+    cy.visit(`http://localhost:5601/app/security-dashboards-plugin${localDataSourceUrl}#/tenants`);
 
     cy.contains('h1', 'Dashboards multi-tenancy');
     cy.get('[data-test-subj="dataSourceViewButton"]').should('contain', 'Local cluster');
@@ -169,7 +165,7 @@ describe('Multi-datasources enabled', () => {
   it('Checks Service Accounts Tab', () => {
     // Datasource is locked to local cluster for service accounts tab
     cy.visit(
-      `http://localhost:5601/app/security-admin-dashboards-plugin${localDataSourceUrl}#/serviceAccounts`
+      `http://localhost:5601/app/security-dashboards-plugin${localDataSourceUrl}#/serviceAccounts`
     );
 
     cy.get('[data-test-subj="dataSourceViewButton"]').should('contain', 'Local cluster');
@@ -211,7 +207,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/auditLogging`
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/auditLogging`
       );
       cy.get('[class="euiSwitch__label"]').should('contain', 'Disabled');
     });
@@ -231,7 +227,7 @@ describe('Multi-datasources enabled', () => {
       },
     }).then(() => {
       cy.visit(
-        `http://localhost:5601/app/security-admin-dashboards-plugin${externalDataSourceUrl}#/roles`
+        `http://localhost:5601/app/security-dashboards-plugin${externalDataSourceUrl}#/roles`
       );
 
       cy.get('[data-test-subj="dataSourceSelectableButton"]').should('contain', '9202');

diff --git a/test/cypress/e2e/oidc/oidc_auth_test.spec.js b/test/cypress/e2e/oidc/oidc_auth_test.spec.js
@@ -69,7 +69,7 @@ describe('Log in via OIDC', () => {
   });
 
   it('Login to Dashboard with Hash', () => {
-    const urlWithHash = `http://localhost:5601${basePath}/app/security-admin-dashboards-plugin#/getstarted`;
+    const urlWithHash = `http://localhost:5601${basePath}/app/security-dashboards-plugin#/getstarted`;
 
     cy.visit(urlWithHash, {
       failOnStatusCode: false,

diff --git a/test/cypress/e2e/saml/saml_auth_test.spec.js b/test/cypress/e2e/saml/saml_auth_test.spec.js
@@ -82,7 +82,7 @@ describe('Log in via SAML', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    const urlWithHash = `http://localhost:5601${basePath}/app/security-admin-dashboards-plugin#/getstarted`;
+    const urlWithHash = `http://localhost:5601${basePath}/app/security-dashboards-plugin#/getstarted`;
 
     cy.visit(urlWithHash, {
       failOnStatusCode: false,