Merge branch 'feature/RI-4643-move-to-node-redis' into e2e/feature/RI-5396_SSH_for_clustered_dbs

vlad-dargel · vlad-dargel · commit 0069c237081d · 2024-02-22T09:06:42.000+01:00
diff --git a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts
@@ -165,7 +165,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules']),
         provider: 'RE_CLOUD',
         new: true,
       }, false);
@@ -177,7 +177,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules']),
         name: `${mockDatabase.host}:${mockDatabase.port}`,
         new: true,
       }, false);
@@ -189,7 +189,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules']),
         compressor: Compressor.NONE,
         new: true,
       }, false);
@@ -201,7 +201,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules']),
         compressor: Compressor.GZIP,
         new: true,
       }, false);
@@ -214,7 +214,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor', 'modules']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'compressor', 'modules']),
         connectionType: ConnectionType.CLUSTER,
         new: true,
       }, false);
diff --git a/redisinsight/api/src/modules/database/database-connection.service.ts b/redisinsight/api/src/modules/database/database-connection.service.ts
@@ -35,7 +35,6 @@ export class DatabaseConnectionService {
     const toUpdate: Partial<Database> = {
       new: false,
       lastConnection: new Date(),
-      timeout: client.options.connectTimeout,
       modules: await this.databaseInfoProvider.determineDatabaseModules(client),
       version: await this.databaseInfoProvider.determineDatabaseServer(client),
     };
diff --git a/redisinsight/api/src/modules/database/models/database.ts b/redisinsight/api/src/modules/database/models/database.ts
@@ -21,7 +21,6 @@ import { SentinelMaster } from 'src/modules/redis-sentinel/models/sentinel-maste
 import { Endpoint } from 'src/common/models';
 import { AdditionalRedisModule } from 'src/modules/database/models/additional.redis.module';
 import { SshOptions } from 'src/modules/ssh/models/ssh-options';
-import { Default } from 'src/common/decorators';
 import { CloudDatabaseDetails } from 'src/modules/cloud/database/models/cloud-database-details';
 
 const CONNECTIONS_CONFIG = config.get('connections');
@@ -110,7 +109,6 @@ export class Database {
   @Min(1_000)
   @Max(1_000_000_000)
   @IsInt({ always: true })
-  @Default(CONNECTIONS_CONFIG.timeout)
   timeout?: number = CONNECTIONS_CONFIG.timeout;
 
   @ApiProperty({
diff --git a/redisinsight/api/src/modules/database/providers/database-overview.provider.ts b/redisinsight/api/src/modules/database/providers/database-overview.provider.ts
@@ -35,7 +35,7 @@ export class DatabaseOverviewProvider {
 
     const currentDbIndex = isNumber(clientMetadata.db)
       ? clientMetadata.db
-      : get(client, ['options', 'db'], 0);
+      : await client.getCurrentDbIndex();
 
     if (client.getConnectionType() === RedisClientConnectionType.CLUSTER) {
       nodesInfo = await this.getNodesInfo(client);
diff --git a/redisinsight/api/src/modules/database/repositories/stack.database.repository.spec.ts b/redisinsight/api/src/modules/database/repositories/stack.database.repository.spec.ts
@@ -116,7 +116,6 @@ describe('StackDatabasesRepository', () => {
         port: 6379,
         connectionType: ConnectionType.STANDALONE,
         tls: false,
-        timeout: 30_000,
         verifyServerCert: false,
         lastConnection: null,
       });
diff --git a/redisinsight/api/src/modules/ssh/models/ssh-tunnel.ts b/redisinsight/api/src/modules/ssh/models/ssh-tunnel.ts
@@ -20,7 +20,7 @@ export class SshTunnel {
   ) {
     const address = this.server?.address() as AddressInfo;
     this.serverAddress = {
-      host: address?.address,
+      host: '127.0.0.1',
       port: address?.port,
     };
   }
diff --git a/redisinsight/api/test/api/database/GET-databases.test.ts b/redisinsight/api/test/api/database/GET-databases.test.ts
@@ -13,7 +13,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
   name: Joi.string().required(),
   provider: Joi.string().required(),
   new: Joi.boolean().allow(null).required(),
-  timeout: Joi.number().integer().required(),
+  timeout: Joi.number().integer().allow(null),
   compressor: Joi.string().valid('NONE', 'LZ4', 'GZIP', 'ZSTD', 'SNAPPY').allow(null),
   connectionType: Joi.string().valid('STANDALONE', 'SENTINEL', 'CLUSTER', 'NOT CONNECTED').required(),
   lastConnection: Joi.string().isoDate().allow(null).required(),
diff --git a/redisinsight/api/test/api/database/PATCH-databases-id.test.ts b/redisinsight/api/test/api/database/PATCH-databases-id.test.ts
@@ -854,7 +854,7 @@ describe(`PATCH /databases/:id`, () => {
     });
     describe('TLS AUTH', function () {
       requirements('rte.tls', 'rte.tlsAuth');
-      
+
       it('Should update database with partial sshOptions', async () => {
         await validateApiCall({
           endpoint,
diff --git a/redisinsight/api/test/api/database/constants.ts b/redisinsight/api/test/api/database/constants.ts
@@ -10,7 +10,7 @@ export const databaseSchema = Joi.object().keys({
   connectionType: Joi.string().valid('STANDALONE', 'CLUSTER', 'SENTINEL').required(),
   username: Joi.string().allow(null),
   password: Joi.boolean().allow(null),
-  timeout: Joi.number().integer().required(),
+  timeout: Joi.number().integer().allow(null),
   compressor: Joi.string().valid('NONE', 'LZ4', 'GZIP', 'ZSTD', 'SNAPPY').required(),
   nameFromProvider: Joi.string().allow(null),
   lastConnection: Joi.string().isoDate().allow(null),
diff --git a/redisinsight/api/test/helpers/local-db.ts b/redisinsight/api/test/helpers/local-db.ts
@@ -371,17 +371,20 @@ export const createDatabaseInstances = async () => {
       name: constants.TEST_INSTANCE_NAME_2,
       host: constants.TEST_INSTANCE_HOST_2,
       db: constants.TEST_REDIS_DB_INDEX,
+      timeout: 30000,
     },
     {
       id: constants.TEST_INSTANCE_ID_3,
       name: constants.TEST_INSTANCE_NAME_3,
       host: constants.TEST_INSTANCE_HOST_3,
+      timeout: 30000,
     },
     {
       id: constants.TEST_INSTANCE_ID_4,
       name: constants.TEST_INSTANCE_NAME_4,
       host: constants.TEST_INSTANCE_HOST_4,
       port: constants.TEST_INSTANCE_PORT_4,
+      timeout: 30000,
     }
   ];
 
@@ -414,6 +417,7 @@ export const createIncorrectDatabaseInstances = async () => {
     password: constants.TEST_INCORRECT_PASSWORD,
     modules: '[]',
     version: '7.0',
+    timeout: 30000,
   });
 }
 
@@ -430,6 +434,7 @@ export const createAclInstance = async (rte, server): Promise<void> => {
     tls: false,
     verifyServerCert: false,
     connectionType: rte.env.type,
+    timeout: 30000,
   }
 
   if (rte.env.type === constants.CLUSTER) {
diff --git a/tests/e2e/tests/web/critical-path/cli/cli-critical.e2e.ts b/tests/e2e/tests/web/critical-path/cli/cli-critical.e2e.ts
@@ -30,27 +30,6 @@ fixture `CLI critical`
         // Delete database
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
-test
-    .meta({ rte: rte.ossCluster })
-    .before(async() => {
-        await databaseHelper.acceptLicenseTermsAndAddOSSClusterDatabase(ossClusterConfig);
-    })
-    .after(async() => {
-        // Clear and delete database
-        await browserPage.deleteKeyByName(keyName);
-        await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
-    })('Verify that user is redirected to another node when he works in CLI with OSS Cluster', async t => {
-        keyName = Common.generateWord(10);
-        // Open CLI
-        await t.click(browserPage.Cli.cliExpandButton);
-        // Add key from CLI
-        for ([keyName, value] of pairsToSet) {
-            await t.typeText(browserPage.Cli.cliCommandInput, `SET ${keyName} ${value}`, { replace: true, paste: true });
-            await t.pressKey('enter');
-        }
-        // Check that user is redirected
-        await t.expect(await browserPage.Cli.cliArea.textContent).contains('Redirected to', 'User command was not redirected to another node');
-    });
 test
     .meta({ rte: rte.standalone })('Verify that Redis returns error if command is not correct when user works with CLI', async t => {
         //Open CLI
diff --git a/tests/e2e/tests/web/regression/cli/cli-logical-db.e2e.ts b/tests/e2e/tests/web/regression/cli/cli-logical-db.e2e.ts
@@ -42,11 +42,9 @@ test
             await t.expect(browserPage.Cli.cliArea.textContent).contains(text, 'No DB index is not displayed in the CLI message');
         }
         await t.expect(browserPage.Cli.cliDbIndex.visible).eql(false, 'No DB index before the > character in CLI is not displayed');
-        await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, 'Database index 0 is not displayed in the CLI endpoint');
     });
 test('Verify that working with logical DBs, user can see N DB index in CLI', async t => {
     index = '1';
-    databaseEndpoint = `${ossStandaloneConfig.host}:${ossStandaloneConfig.port}[db${index}]`;
 
     await myRedisDatabasePage.AddRedisDatabase.addLogicalRedisDatabase(ossStandaloneConfig, index);
     await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneConfig.databaseName  } [db${index}]`);
@@ -58,13 +56,10 @@ test('Verify that working with logical DBs, user can see N DB index in CLI', asy
         await t.expect(browserPage.Cli.cliArea.textContent).contains(text, 'DB index is not displayed in the CLI message');
     }
     await t.expect(browserPage.Cli.cliDbIndex.textContent).eql(`[db${index}] `, 'DB index before the > character in CLI is not displayed');
-    await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, 'Database index is not displayed in the CLI endpoint');
 });
 test('Verify that user can see DB index in the endpoint in CLI header is automatically changed when switched to another logical DB', async t => {
     index = '2';
     const indexAfter = '3';
-    databaseEndpoint = `${ossStandaloneConfig.host}:${ossStandaloneConfig.port}[db${index}]`;
-    const databaseEndpointAfter = `${ossStandaloneConfig.host}:${ossStandaloneConfig.port}[db${indexAfter}]`;
 
     await myRedisDatabasePage.AddRedisDatabase.addLogicalRedisDatabase(ossStandaloneConfig, index);
     await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneConfig.databaseName  } [db${index}]`);
@@ -78,18 +73,8 @@ test('Verify that user can see DB index in the endpoint in CLI header is automat
     // Verify that when user re-creates client in CLI the new client is connected to the DB index selected for the DB by default
     await t.expect(browserPage.Cli.cliDbIndex.textContent).eql(`[db${index}] `, 'The new client is not connected to the DB index selected for the DB by default');
 
-    // Open CLI and verify the database index in the endpoint
-    await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, `The endpoint in CLI header not contains ${index} index`);
-    // Minimize and maximize CLI
-    await t.click(browserPage.Cli.minimizeCliButton);
-    await t.click(browserPage.Cli.cliExpandButton);
-    // Verify that user can work with selected logical DB in CLI when he minimazes and then maximizes the CLI
-    await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, `The endpoint in CLI header not contains ${index} index after minimize`);
-
-    // Open CLI and verify the database index in the endpoint
-    await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, `The endpoint in CLI header not contains ${index} index`);
     // Switch to another logical database and check endpoint
     await t.typeText(browserPage.Cli.cliCommandInput, `Select ${indexAfter}`, { paste: true });
     await t.pressKey('enter');
-    await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpointAfter, `The endpoint in CLI header is not automatically changed to the new ${indexAfter}`);
+    await t.expect(browserPage.Cli.cliDbIndex.textContent).eql(`[db${indexAfter}] `, `Db index is not automatically changed to the new ${indexAfter}`);
 });
diff --git a/tests/e2e/tests/web/regression/cli/cli.e2e.ts b/tests/e2e/tests/web/regression/cli/cli.e2e.ts
@@ -97,12 +97,7 @@ test
         // Delete database
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify that user can use "Up" and "Down" keys to view previous commands in CLI in the application', async t => {
-        const databaseEndpoint = `${ossStandaloneConfig.host}:${ossStandaloneConfig.port}`;
-
         await t.click(browserPage.Cli.cliExpandButton);
-        // Verify that user can see DB endpoint in the header of CLI
-        await t.expect(browserPage.Cli.cliEndpoint.textContent).eql(databaseEndpoint, 'The user can not see DB endpoint in the header of CLI');
-
         await t.expect(browserPage.Cli.cliCommandInput.innerText).eql('');
         for (let i = cliCommands.length - 1; i >= 0; i--) {
             await t.pressKey('up');
diff --git a/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts b/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts
@@ -54,7 +54,8 @@ test
         await t.hover(workbenchPage.OverviewPanel.overviewTotalKeys);
         // Verify that user can see total number of keys and number of keys in current logical database
         await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
+        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}`, true);
+        await browserActions.verifyTooltipContainsText(`Total Keys`, true);
         await browserActions.verifyTooltipContainsText(`db1:${keysAmount}Keys`, true);
 
         // Open Database
@@ -63,7 +64,8 @@ test
         await t.hover(workbenchPage.OverviewPanel.overviewTotalKeys);
         // Verify that user can see total number of keys and not it current logical database (if there are no any keys in other logical DBs)
         await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
+        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}`, true);
+        await browserActions.verifyTooltipContainsText(`Total Keys`, true);
         await browserActions.verifyTooltipContainsText('db1', false);
     });
 test
diff --git a/yarn.lock b/yarn.lock
@@ -10642,11 +10642,6 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
-  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
-
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export class SshTunnel {`
`20`	`20`	`) {`
`21`	`21`	`const address = this.server?.address() as AddressInfo;`
`22`	`22`	`this.serverAddress = {`
`23`		`- host: address?.address,`
	`23`	`+ host: '127.0.0.1',`
`24`	`24`	`port: address?.port,`
`25`	`25`	`};`
`26`	`26`	`}`