enhance executable check

Author: ArtemHoruzhenko

redisinsight/api/src/utils/hosting-provider-helper.spec.ts

@@ -37,7 +37,7 @@ const getHostingProviderTests = [
     hello: [
       'server', 'redis',
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'executable:/opt/redis/bin/redis-server',
     output: HostingProvider.REDIS_COMMUNITY_EDITION,
   },
@@ -46,7 +46,16 @@ const getHostingProviderTests = [
     hello: [
       'server', 'redis',
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
+      + 'executable:/data/redis-server',
+    output: HostingProvider.REDIS_COMMUNITY_EDITION,
+  },
+  {
+    input: 'localhost',
+    hello: [
+      'server', 'redis',
+    ],
+    info: '# Server\r\n'
       + 'executable:/opt/redis-stack/bin/redis-server',
     output: HostingProvider.REDIS_STACK,
   },
@@ -61,7 +70,7 @@ const getHostingProviderTests = [
         ],
       ],
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'redis_version: 7.2.0',
     output: HostingProvider.REDIS_ENTERPRISE,
   },
@@ -80,49 +89,49 @@ const getHostingProviderTests = [
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'server_name:valkey',
     output: HostingProvider.VALKEY,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'dragonfly_version:df-7.0.0',
     output: HostingProvider.DRAGONFLY,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'garnet_version:gr-7.0.0',
     output: HostingProvider.GARNET,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'kvrocks_version:kv-7.0.0',
     output: HostingProvider.KVROCKS,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'redict_version:rd-7.0.0',
     output: HostingProvider.REDICT,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'upstash_version:up-7.0.0',
     output: HostingProvider.UPSTASH,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'ElastiCache:sometinhg',
     output: HostingProvider.AWS_ELASTICACHE,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'MemoryDB:sometinhg',
     output: HostingProvider.AWS_MEMORYDB,
   },

redisinsight/api/src/utils/hosting-provider-helper.ts

@@ -1,6 +1,7 @@
 import { IP_ADDRESS_REGEX, PRIVATE_IP_ADDRESS_REGEX } from 'src/constants';
 import { HostingProvider } from 'src/modules/database/entities/database.entity';
 import { RedisClient } from 'src/modules/redis/client';
+import { convertRedisInfoReplyToObject } from 'src/utils/redis-reply-converter';
 
 const PROVIDER_HOST_REGEX = {
   RLCP: /\.rlrcp\.com$/,
@@ -97,12 +98,13 @@ export const getHostingProvider = async (client: RedisClient, databaseHost: stri
         return HostingProvider.UPSTASH;
       }
 
-      if (info.includes('executable:/opt/redis/bin/redis-server')) {
-        return HostingProvider.REDIS_COMMUNITY_EDITION;
-      }
+      const infoObj = convertRedisInfoReplyToObject(info);
 
-      if (info.includes('executable:/opt/redis-stack/bin/redis-server')) {
-        return HostingProvider.REDIS_STACK;
+      if (infoObj.server.executable.includes('redis-server')) {
+        if (infoObj.server.executable.includes('redis-stack')) {
+          return HostingProvider.REDIS_STACK;
+        }
+        return HostingProvider.REDIS_COMMUNITY_EDITION;
       }
     } catch (e) {
       // ignore error