Update api path in main after service account removal (opensearch-pro…

…ject#1444) * Update api path in main after service account removal Signed-off-by: Derek Ho <[email protected]> * Try fix for permissions page Signed-off-by: Derek Ho <[email protected]> * Remove only Signed-off-by: Derek Ho <[email protected]> * Fix the sanity tests Signed-off-by: Derek Ho <[email protected]> * Fix flaky test by differentiation Signed-off-by: Derek Ho <[email protected]> * Remove unused variable Signed-off-by: Derek Ho <[email protected]> --------- Signed-off-by: Derek Ho <[email protected]>
AWSHurneyt · Jul 23, 2024 · 98e90f4 · 98e90f4
1 parent 25f947d
commit 98e90f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/cypress/integration/plugins/security-dashboards-plugin/sanity_tests.spec.js b/cypress/integration/plugins/security-dashboards-plugin/sanity_tests.spec.js
@@ -7,7 +7,7 @@ import {
   BASE_PATH,
   SEC_UI_TENANTS_PATH,
   SEC_INTERNALUSERS_FIXTURES_PATH,
-  SEC_API_INTERNAL_ACCOUNTS_PATH,
+  SEC_API_INTERNAL_USERS_PATH,
 } from '../../../utils/constants';
 
 if (Cypress.env('SECURITY_ENABLED')) {
@@ -65,7 +65,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
       // Navigate to Security/Internal User Database section
 
       cy.visit(`${BASE_PATH}/app/security-dashboards-plugin#/users`);
-      cy.intercept(`${SEC_API_INTERNAL_ACCOUNTS_PATH}*`, {
+      cy.intercept(`${SEC_API_INTERNAL_USERS_PATH}*`, {
         fixture:
           SEC_INTERNALUSERS_FIXTURES_PATH + '/internalusers_info_response.json',
       }).as('listUserResponse');
@@ -81,7 +81,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
       // Submit the form to create the user
       cy.get('button').contains('Create').click();
 
-      cy.intercept(`${SEC_API_INTERNAL_ACCOUNTS_PATH}*`, {
+      cy.intercept(`${SEC_API_INTERNAL_USERS_PATH}*`, {
         fixture:
           SEC_INTERNALUSERS_FIXTURES_PATH +
           '/internalusers_response_post_new_user_creation.json',

diff --git a/cypress/integration/plugins/security/permissions_spec.js b/cypress/integration/plugins/security/permissions_spec.js
@@ -91,7 +91,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
       cy.contains('button', 'Cancel');
       cy.contains('.euiModalHeader__title', 'Create new action group');
 
-      const actionGroupName = 'test';
+      const actionGroupName = 'test-creation';
       cy.get('input[data-test-subj="name-text"]').type(actionGroupName, {
         force: true,
       });
@@ -138,7 +138,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
       cy.contains('button', 'Cancel');
       cy.contains('.euiModalHeader__title', 'Create new action group');
 
-      const actionGroupName = 'test';
+      const actionGroupName = 'test-selection';
       cy.get('input[data-test-subj="name-text"]').type(actionGroupName, {
         force: true,
       });

diff --git a/cypress/utils/plugins/security/commands.js b/cypress/utils/plugins/security/commands.js
@@ -6,12 +6,12 @@
 import {
   SEC_API_CONFIG_PATH,
   SEC_API_ROLES_PATH,
-  SEC_API_INTERNAL_ACCOUNTS_PATH,
   SEC_API_ACTIONGROUPS_PATH,
   SEC_API_TENANTS_PATH,
   SEC_API_AUDIT_PATH,
   SEC_API_AUDIT_CONFIG_PATH,
   SEC_API_CACHE_PURGE_PATH,
+  SEC_API_INTERNAL_USERS_PATH,
 } from '../../constants';
 
 /**
@@ -48,7 +48,7 @@ Cypress.Commands.add(
 Cypress.Commands.add(
   'mockInternalUsersAction',
   function (fixtureFileName, funcMockedOn) {
-    cy.intercept(`${SEC_API_INTERNAL_ACCOUNTS_PATH}*`, {
+    cy.intercept(`${SEC_API_INTERNAL_USERS_PATH}*`, {
       fixture: fixtureFileName,
     }).as('getInternalUsersDetails');
 

diff --git a/cypress/utils/plugins/security/constants.js b/cypress/utils/plugins/security/constants.js
@@ -55,8 +55,6 @@ export const SEC_API_ACTIONGROUPS_PATH = BASE_SEC_API_PATH + '/actiongroups';
 export const SEC_API_TENANTS_PATH = BASE_SEC_API_PATH + '/tenants';
 
 export const SEC_API_INTERNAL_USERS_PATH = BASE_SEC_API_PATH + '/internalusers';
-export const SEC_API_INTERNAL_ACCOUNTS_PATH =
-  BASE_SEC_API_PATH + '/internalaccounts';
 
 export const SEC_API_ACCOUNT_PATH = BASE_SEC_API_PATH + '/account';