Merge pull request #4569 from RedisInsight/bugfix/be/RI-7077-forcestandalone-in-test-connection

RI-7077: do not switch to cluster if force standalone is set

Author: Kristiyan Ivanov

redisinsight/api/src/modules/database/providers/database.factory.spec.ts

@@ -112,6 +112,23 @@ describe('DatabaseFactory', () => {
 
       expect(result).toEqual(mockClusterDatabaseWithTlsAuth);
     });
+    it('should create standalone model when cluster database is passed but with standalone flag on', async () => {
+      mockRedisSentinelUtil.isSentinel.mockResolvedValue(false);
+      mockRedisClusterUtil.isCluster.mockResolvedValue(true);
+
+      const result = await service.createDatabaseModel(mockSessionMetadata, {
+        ...mockClusterDatabaseWithTlsAuth,
+        forceStandalone: true,
+      });
+
+      expect({
+        forceStandalone: result.forceStandalone,
+        connectionType: result.connectionType,
+      }).toEqual({
+        forceStandalone: true,
+        connectionType: ConnectionType.STANDALONE,
+      });
+    });
   });
 
   describe('createStandaloneDatabaseModel', () => {

redisinsight/api/src/modules/database/providers/database.factory.ts

@@ -73,7 +73,7 @@ export class DatabaseFactory {
         database,
         client,
       );
-    } else if (await isCluster(client)) {
+    } else if (!database.forceStandalone && (await isCluster(client))) {
       model = await this.createClusterDatabaseModel(
         sessionMetadata,
         database,
@@ -123,6 +123,7 @@ export class DatabaseFactory {
    * Fetches cluster nodes
    * Creates cluster client to validate connection. Disconnect after check
    * Creates database model for cluster connection type
+   * @param sessionMetadata
    * @param database
    * @param client
    * @private
@@ -164,6 +165,7 @@ export class DatabaseFactory {
    * Fetches sentinel masters and align with defined one
    * Creates sentinel client to validate connection. Disconnect after check
    * Creates database model for cluster connection type
+   * @param sessionMetadata
    * @param database
    * @param client
    * @private