rollback CircleCI configs + fix PR comments + fix bug when unable to descover sentinel databases with existing certs

Author: Artem

.circleci/config.yml

@@ -896,11 +896,10 @@ workflows:
           matrix:
             alias: itest-code
             parameters:
-#              rte: *iTestsNamesShort
-              rte: *iTestsNames
+              rte: *iTestsNamesShort
           name: ITest - << matrix.rte >> (code)
-#          requires:
-#            - UTest - API
+          requires:
+            - UTest - API
   # E2E tests for "e2e/feature" or "e2e/bugfix" branches only
   e2e-tests:
     jobs:

redisinsight/api/src/modules/database-import/database-import.service.ts

@@ -90,8 +90,6 @@ export class DatabaseImportService {
         fail: [],
       };
 
-      console.log('___ items', items);
-
       // it is very important to insert databases on-by-one to avoid db constraint errors
       await items.reduce((prev, item, index) => prev.finally(() => this.createDatabase(item, index)
         .then((result) => {
@@ -260,16 +258,9 @@ export class DatabaseImportService {
    */
   static determineConnectionType(data: any = {}): ConnectionType {
     if (data?.connectionType) {
-      switch (data.connectionType) {
-        case ConnectionType.CLUSTER:
-          return ConnectionType.CLUSTER;
-        case ConnectionType.SENTINEL:
-          return ConnectionType.SENTINEL;
-        case ConnectionType.STANDALONE:
-          return ConnectionType.STANDALONE;
-        default:
-          return ConnectionType.NOT_CONNECTED;
-      }
+      return (data.connectionType in ConnectionType)
+        ? ConnectionType[data.connectionType]
+        : ConnectionType.NOT_CONNECTED;
     }
 
     if (data?.type) {

redisinsight/api/src/modules/redis-sentinel/redis-sentinel.service.spec.ts

@@ -3,6 +3,7 @@ import { BadRequestException } from '@nestjs/common';
 import ERROR_MESSAGES from 'src/constants/error-messages';
 import { RedisService } from 'src/modules/redis/redis.service';
 import {
+  mockDatabaseFactory,
   mockDatabaseInfoProvider,
   mockDatabaseService,
   mockIORedisClient,
@@ -15,6 +16,7 @@ import { RedisSentinelService } from 'src/modules/redis-sentinel/redis-sentinel.
 import { RedisSentinelAnalytics } from 'src/modules/redis-sentinel/redis-sentinel.analytics';
 import { DatabaseService } from 'src/modules/database/database.service';
 import { DatabaseInfoProvider } from 'src/modules/database/providers/database-info.provider';
+import { DatabaseFactory } from 'src/modules/database/providers/database.factory';
 
 describe('RedisSentinelService', () => {
   let service: RedisSentinelService;
@@ -38,6 +40,10 @@ describe('RedisSentinelService', () => {
           provide: DatabaseService,
           useFactory: mockDatabaseService,
         },
+        {
+          provide: DatabaseFactory,
+          useFactory: mockDatabaseFactory,
+        },
         {
           provide: DatabaseInfoProvider,
           useFactory: mockDatabaseInfoProvider,

redisinsight/api/src/modules/redis-sentinel/redis-sentinel.service.ts

@@ -12,6 +12,7 @@ import { getRedisConnectionException } from 'src/utils';
 import { SentinelMaster } from 'src/modules/redis-sentinel/models/sentinel-master';
 import { RedisSentinelAnalytics } from 'src/modules/redis-sentinel/redis-sentinel.analytics';
 import { DatabaseInfoProvider } from 'src/modules/database/providers/database-info.provider';
+import { DatabaseFactory } from 'src/modules/database/providers/database.factory';
 
 @Injectable()
 export class RedisSentinelService {
@@ -20,6 +21,7 @@ export class RedisSentinelService {
   constructor(
     private readonly redisService: RedisService,
     private readonly databaseService: DatabaseService,
+    private readonly databaseFactory: DatabaseFactory,
     private readonly databaseInfoProvider: DatabaseInfoProvider,
     private readonly redisSentinelAnalytics: RedisSentinelAnalytics,
   ) {}
@@ -113,7 +115,8 @@ export class RedisSentinelService {
     this.logger.log('Connection and getting sentinel masters.');
     let result: SentinelMaster[];
     try {
-      const client = await this.redisService.createStandaloneClient(dto, AppTool.Common, false);
+      const database = await this.databaseFactory.createStandaloneDatabaseModel(dto);
+      const client = await this.redisService.createStandaloneClient(database, AppTool.Common, false);
       result = await this.databaseInfoProvider.determineSentinelMasterGroups(client);
       this.redisSentinelAnalytics.sendGetSentinelMastersSucceedEvent(result);