Merge pull request #3075 from RedisInsight/e2e/feature/RI-5396_SSH_for_clustered_dbs

E2e/feature/ri 5396 ssh for clustered dbs

Author: vlad-dargel

tests/e2e/helpers/conf.ts

@@ -120,6 +120,14 @@ export const ossStandaloneForSSHConfig = {
     databasePassword: process.env.OSS_STANDALONE_SSH_PASSWORD
 };
 
+export const ossClusterForSSHConfig = {
+    host: process.env.OSS_STANDALONE_SSH_HOST || '172.33.100.211',
+    port: process.env.OSS_STANDALONE_SSH_PORT || '6379',
+    databaseName: `${process.env.OSS_STANDALONE_SSH_DATABASE_NAME || 'oss-cluster-for-ssh'}-${uniqueId}`,
+    databaseUsername: process.env.OSS_STANDALONE_SSH_USERNAME,
+    databasePassword: process.env.OSS_STANDALONE_SSH_PASSWORD
+};
+
 export const ossStandaloneTlsConfig = {
     host: process.env.OSS_STANDALONE_TLS_HOST || 'oss-standalone-tls',
     port: process.env.OSS_STANDALONE_TLS_PORT || '6379',

tests/e2e/rte.docker-compose.yml

@@ -137,6 +137,8 @@ services:
     networks:
       default:
         ipv4_address: 172.31.100.211
+      ssh:
+        ipv4_address: 172.33.100.211
   master-plain-7-2:
     logging: *logging
     build: *cluster-plain-7-build

tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts

@@ -1,6 +1,6 @@
 import { rte } from '../../../../helpers/constants';
 import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
-import { commonUrl, ossStandaloneForSSHConfig } from '../../../../helpers/conf';
+import { commonUrl, ossClusterForSSHConfig, ossStandaloneForSSHConfig } from '../../../../helpers/conf';
 import { DatabaseHelper } from '../../../../helpers/database';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { sshPrivateKey, sshPrivateKeyWithPasscode } from '../../../../test-data/sshPrivateKeys';
@@ -31,6 +31,10 @@ const sshDbPasscode = {
     ...ossStandaloneForSSHConfig,
     databaseName: `SSH_${Common.generateWord(5)}`
 };
+const sshDbClusterPass = {
+    ...ossClusterForSSHConfig,
+    databaseName: `SSH_Cluster_${Common.generateWord(5)}`
+};
 
 fixture `Adding database with SSH`
     .meta({ type: 'critical_path', rte: rte.standalone })
@@ -118,3 +122,13 @@ test('Adding database with SSH', async t => {
     await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
     await Common.checkURLContainsText('browser');
 });
+test('Adding OSS Cluster database with SSH', async t => {
+    const sshWithPass = {
+        ...sshParams,
+        sshPassword: 'pass'
+    };
+    // Verify that user can add SSH tunnel with Password for OSS Cluster database
+    await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
+    await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
+    await Common.checkURLContainsText('browser');
+});

tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts

@@ -1,6 +1,6 @@
 import { rte } from '../../../../helpers/constants';
 import { BrowserPage, MyRedisDatabasePage, WelcomePage } from '../../../../pageObjects';
-import { commonUrl, invalidOssStandaloneConfig, ossStandaloneForSSHConfig } from '../../../../helpers/conf';
+import { commonUrl, invalidOssStandaloneConfig, ossClusterForSSHConfig, ossStandaloneForSSHConfig } from '../../../../helpers/conf';
 import { DatabaseHelper } from '../../../../helpers/database';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { sshPrivateKey, sshPrivateKeyWithPasscode } from '../../../../test-data/sshPrivateKeys';
@@ -32,6 +32,10 @@ const sshDbPasscode = {
     ...ossStandaloneForSSHConfig,
     databaseName: `SSH_${Common.generateWord(5)}`
 };
+const sshDbClusterPass = {
+    ...ossClusterForSSHConfig,
+    databaseName: `SSH_Cluster_${Common.generateWord(5)}`
+};
 
 fixture `Connecting to the databases verifications`
     .meta({ type: 'critical_path' })
@@ -170,3 +174,18 @@ test
         await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
         await Common.checkURLContainsText('browser');
     });
+test
+    .meta({ rte: rte.ossCluster })
+    .after(async() => {
+        // Delete databases
+        await databaseAPIRequests.deleteStandaloneDatabaseApi(sshDbClusterPass);
+    })('Adding OSS Cluster database with SSH', async() => {
+        const sshWithPass = {
+            ...sshParams,
+            sshPassword: 'pass'
+        };
+        // Verify that user can add SSH tunnel with Password for OSS Cluster database
+        await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
+        await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
+        await Common.checkURLContainsText('browser');
+    });