Merge branch 'release/2.52.0' into fe/bugfix/inline_editor_submit

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.50.0)
+-v - Semver (2.52.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -392,9 +392,18 @@ jobs:
           at: .
       - run: sudo apt-get install net-tools
       - run:
-          name: Clone mocked RDI server
+          name: Install WM
+          command: sudo apt install fluxbox
+      - run:
+          name: Run X11
           command: |
-            git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
+            Xvfb :99 -screen 0 1920x1080x24 &
+            sleep 3
+            fluxbox &
+      # - run:
+      #     name: Clone mocked RDI server
+      #     command: |
+      #       git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
       - run:
           name: .AppImage tests
           command: |
@@ -487,10 +496,10 @@ jobs:
                 name: Load built docker image from workspace
                 command: |
                   docker image load -i /tmp/release/docker/docker-linux-alpine.amd64.tar
-            - run:
-                name: Clone mocked RDI server
-                command: |
-                  git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
+            # - run:
+            #     name: Clone mocked RDI server
+            #     command: |
+            #       git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
             - run:
                 name: Run tests
                 command: |

redisinsight/api/config/default.ts

@@ -76,7 +76,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.50.0',
+    appVersion: process.env.RI_APP_VERSION || '2.52.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.50.0',
+    version: '2.52.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.50.0",
+  "version": "2.52.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {

redisinsight/api/src/constants/error-messages.ts

@@ -111,4 +111,5 @@ export default {
   RDI_DEPLOY_PIPELINE_FAILURE: 'Failed to deploy pipeline',
   RDI_TIMEOUT_ERROR: 'Encountered a timeout error while attempting to retrieve data',
   RDI_VALIDATION_ERROR: 'Validation error',
+  INVALID_RDI_INSTANCE_ID: 'Invalid rdi instance id.',
 };

redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.spec.ts

@@ -633,7 +633,7 @@ describe('Cluster Scanner Strategy', () => {
             scanned: 10,
           },
         ]);
-        expect(strategy.getKeysInfo).toHaveBeenCalledWith(mockClusterRedisClient, [Buffer.from(key)], dto.type);
+        expect(strategy.getKeysInfo).toHaveBeenCalledWith(mockClusterRedisClient, [Buffer.from(key)]);
         expect(strategy['scanNodes']).not.toHaveBeenCalled();
       });
       it('should find exact key when match is escaped glob patter', async () => {
@@ -666,7 +666,6 @@ describe('Cluster Scanner Strategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockClusterRedisClient,
           [Buffer.from(searchPattern)],
-          dto.type,
         );
         expect(strategy['scanNodes']).not.toHaveBeenCalled();
       });
@@ -704,7 +703,6 @@ describe('Cluster Scanner Strategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockClusterRedisClient,
           [Buffer.from(key)],
-          dto.type,
         );
         expect(strategy['scanNodes']).not.toHaveBeenCalled();
       });
@@ -741,7 +739,6 @@ describe('Cluster Scanner Strategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockClusterRedisClient,
           [Buffer.from(key)],
-          dto.type,
         );
         expect(strategy['scanNodes']).not.toHaveBeenCalled();
       });
@@ -779,7 +776,6 @@ describe('Cluster Scanner Strategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockClusterRedisClient,
           [Buffer.from(key)],
-          dto.type,
         );
         expect(strategy['scanNodes']).not.toHaveBeenCalled();
       });

redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.ts

@@ -121,7 +121,7 @@ export class ClusterScannerStrategy extends ScannerStrategy {
         // eslint-disable-next-line no-param-reassign
         node.scanned = isNull(node.total) ? 1 : node.total;
       });
-      nodes[0].keys = await this.getKeysInfo(client, [keyName], args.type);
+      nodes[0].keys = await this.getKeysInfo(client, [keyName]);
       nodes[0].keys = nodes[0].keys.filter((key: GetKeyInfoResponse) => {
         if (key.ttl === -2) {
           return false;

redisinsight/api/src/modules/browser/keys/scanner/strategies/standalone.scanner.strategy.spec.ts

@@ -389,7 +389,6 @@ describe('StandaloneScannerStrategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockStandaloneRedisClient,
           [Buffer.from(key)],
-          dto.type,
         );
         expect(strategy['scan']).not.toHaveBeenCalled();
       });
@@ -413,7 +412,6 @@ describe('StandaloneScannerStrategy', () => {
         expect(strategy.getKeysInfo).toHaveBeenCalledWith(
           mockStandaloneRedisClient,
           [Buffer.from(mockSearchPattern)],
-          dto.type,
         );
         expect(strategy['scan']).not.toHaveBeenCalled();
       });

redisinsight/api/src/modules/browser/keys/scanner/strategies/standalone.scanner.strategy.ts

@@ -126,7 +126,7 @@ export class StandaloneScannerStrategy extends ScannerStrategy {
       const keyName = Buffer.from(unescapeRedisGlob(match));
       node.cursor = 0;
       node.scanned = isNull(node.total) ? 1 : node.total;
-      node.keys = await this.getKeysInfo(client, [keyName], args.type);
+      node.keys = await this.getKeysInfo(client, [keyName]);
       node.keys = node.keys.filter((key: GetKeyInfoResponse) => {
         if (key.ttl === -2) {
           return false;