check for sentinel with pass

Author: vlad-dargel

.circleci/config.yml

@@ -1146,36 +1146,36 @@ workflows:
               only:
                 - /^e2e/feature.*/
                 - /^e2e/bugfix.*/
-      - setup-sign-certificates:
-          name: Setup sign certificates (stage)
-          requires:
-            - Start E2E Tests
-      - setup-build:
-          name: Setup build (stage)
-          requires:
-            - Setup sign certificates (stage)
-      - linux:
-          name: Build app - Linux (stage)
-          env: stage
-          redisstack: false
-          target: AppImage
-          requires:
-            - Setup build (stage)
+      # - setup-sign-certificates:
+      #     name: Setup sign certificates (stage)
+      #     requires:
+      #       - Start E2E Tests
+      # - setup-build:
+      #     name: Setup build (stage)
+      #     requires:
+      #       - Setup sign certificates (stage)
+      # - linux:
+      #     name: Build app - Linux (stage)
+      #     env: stage
+      #     redisstack: false
+      #     target: AppImage
+      #     requires:
+      #       - Setup build (stage)
       - docker:
           name: Build docker image
           requires:
             - Start E2E Tests
       - e2e-tests:
           name: E2ETest
           build: docker
-          parallelism: 4
+          parallelism: 1
           requires:
             - Build docker image
-      - e2e-app-image:
-          name: E2ETest (AppImage)
-          parallelism: 2
-          requires:
-            - Build app - Linux (stage)
+      # - e2e-app-image:
+      #     name: E2ETest (AppImage)
+      #     parallelism: 2
+      #     requires:
+      #       - Build app - Linux (stage)
   # Workflow for feature, bugfix, main branches
   feature-main-branch:
     <<: *ignore-for-manual-build

tests/e2e/tests/web/critical-path/database/encryption.e2e.ts

@@ -2,7 +2,7 @@ import { rte } from '../../../../helpers/constants';
 import { MyRedisDatabasePage } from '../../../../pageObjects';
 import {
     commonUrl,
-    ossStandaloneTlsConfig
+    ossSentinelConfig
 } from '../../../../helpers/conf';
 import { DatabaseHelper } from '../../../../helpers/database';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
@@ -14,27 +14,27 @@ const databaseAPIRequests = new DatabaseAPIRequests();
 
 const dbTableParams: DbTableParameters = {
     tableName: 'database_instance',
-    columnName: 'caCertId',
+    columnName: 'password',
     rowValue: 'invalid',
     conditionWhereColumnName: 'name',
-    conditionWhereColumnValue: ossStandaloneTlsConfig.databaseName
+    conditionWhereColumnValue: ossSentinelConfig.masters[1].alias
 };
 
 fixture `Encryption`
     .meta({ type: 'critical_path', rte: rte.none })
     .page(commonUrl)
     .beforeEach(async() => {
         await databaseHelper.acceptLicenseTerms();
-        await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneTlsConfig);
+        await databaseAPIRequests.discoverSentinelDatabaseApi(ossSentinelConfig);
         await myRedisDatabasePage.reloadPage();
     })
     .afterEach(async() => {
-        await databaseHelper.deleteDatabase(ossStandaloneTlsConfig.databaseName);
+        await databaseHelper.deleteDatabase(ossSentinelConfig.masters[1].alias);
     });
-test('Verify that data encrypted using KEY', async t => {
+test.only('Verify that data encrypted using KEY', async t => {
     const decryptionError = 'Unable to decrypt data';
     // Connect to DB
-    await myRedisDatabasePage.clickOnDBByName(ossStandaloneTlsConfig.databaseName);
+    await myRedisDatabasePage.clickOnDBByName(ossSentinelConfig.masters[1].alias);
     // Return back to db list page
     await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
 
@@ -43,6 +43,6 @@ test('Verify that data encrypted using KEY', async t => {
     await t
         .expect(await DatabaseScripts.getColumnValueFromTableInDB({ ...dbTableParams, columnName: 'encryption' }))
         .eql('KEY', 'Encryption is not applied by RI_ENCRYPTION_KEY');
-    await databaseHelper.clickOnEditDatabaseByName(ossStandaloneTlsConfig.databaseName);
+    await databaseHelper.clickOnEditDatabaseByName(ossSentinelConfig.masters[1].alias);
     await t.expect(myRedisDatabasePage.Toast.toastError.textContent).contains(decryptionError, 'Invalid encrypted field is decrypted');
 });