Merge pull request #3074 from RedisInsight/be/feature/RI-4643-move-to-node-redis-bugfix

Be/feature/ri 4643 move to node redis bugfix

Author: Artem

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);

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),
     };

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({

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);

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,
       });

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,
     };
   }

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(),

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,

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),

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) {