Merge branch 'main' into feature/RI-3807_Slowlog_change_ms_to_msec

# Conflicts:
#	redisinsight/ui/src/pages/settings/components/cloud-settings/CloudSettings.spec.tsx

Author: egor-zalenski

.circleci/config.yml

@@ -659,6 +659,7 @@ jobs:
             export RI_CLOUD_IDP_GOOGLE_ID=$RI_CLOUD_IDP_GOOGLE_ID_STAGE
             export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
             export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
+            export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
               UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage && yarn package:mas
@@ -724,6 +725,7 @@ jobs:
             export RI_CLOUD_IDP_GOOGLE_ID=$RI_CLOUD_IDP_GOOGLE_ID_STAGE
             export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
             export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
+            export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
               UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage

README.md

@@ -49,6 +49,11 @@ Alternatively you can also build from source. See our wiki for instructions.
 
 * [How to build](https://github.com/RedisInsight/RedisInsight/wiki/How-to-build-and-contribute)
 
+## How to debug
+If you have any issues occurring in RedisInsight, you can follow the steps below to get more information about the errors and find their root cause.
+
+* [How to debug](https://github.com/RedisInsight/RedisInsight/wiki/How-to-debug)
+
 ## Feedback
 
 * Request a new [feature](https://github.com/RedisInsight/RedisInsight/issues/new?assignees=&labels=&template=feature_request.md&title=%5BFeature+Request%5D%3A)

package.json

@@ -129,6 +129,7 @@
     "@types/ioredis": "^4.26.0",
     "@types/is-glob": "^4.0.2",
     "@types/jest": "^27.5.2",
+    "@types/json-bigint": "^1.0.1",
     "@types/jsonpath": "^0.2.0",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",
@@ -224,7 +225,6 @@
   "dependencies": {
     "@elastic/datemath": "^5.0.3",
     "@elastic/eui": "34.6.0",
-    "@msgpack/msgpack": "^2.7.2",
     "@reduxjs/toolkit": "^1.6.2",
     "@stablelib/snappy": "^1.0.2",
     "axios": "^0.25.0",
@@ -246,18 +246,19 @@
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
     "java-object-serialization": "^0.1.1",
-    "jpickle": "^0.4.1",
+    "json-bigint": "^1.0.0",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
+    "msgpackr": "^1.9.7",
     "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
+    "pickleparser": "^0.1.0",
     "rawproto": "^0.7.6",
     "react": "^18.2.0",
     "react-contenteditable": "^3.3.5",
     "react-dom": "^18.2.0",
     "react-hotkeys-hook": "^3.3.1",
-    "react-json-pretty": "^2.2.0",
     "react-jsx-parser": "^1.28.4",
     "react-monaco-editor": "^0.45.0",
     "react-redux": "^7.2.2",

redisinsight/api/config/default.ts

@@ -61,7 +61,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.30.0',
+    appVersion: process.env.APP_VERSION || '2.32.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -212,7 +212,7 @@ export default {
     url: process.env.RI_FEATURES_CONFIG_URL
       // eslint-disable-next-line max-len
       || 'https://raw.githubusercontent.com/RedisInsight/RedisInsight/main/redisinsight/api/config/features-config.json',
-    syncInterval: parseInt(process.env.RI_FEATURES_CONFIG_SYNC_INTERVAL, 10) || 1_000 * 60 * 60 * 4, // 4h
+    syncInterval: parseInt(process.env.RI_FEATURES_CONFIG_SYNC_INTERVAL, 10) || 1_000 * 60 * 60 * 24, // 24h
   },
   cloud: {
     apiUrl: process.env.RI_CLOUD_API_URL || 'https://app-sm.k8s-cloudapi.sm-qa.qa.redislabs.com/api/v1',

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 2.3204,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -39,10 +39,32 @@
                 "provider": "GCP",
                 "regions": ["asia-northeast1"]
               }
+            ],
+            "redisStackPreview": [
+              {
+                "provider": "AWS",
+                "regions": ["us-east-2", "ap-southeast-1", "sa-east-1"]
+              },
+              {
+                "provider": "GCP",
+                "regions": ["asia-northeast1", "europe-west1", "us-central1"]
+              }
             ]
           }
         }
       }
+    },
+    "redisModuleFilter": {
+      "flag": true,
+      "perc": [[0, 100]],
+      "data": {
+        "hideByName": [
+          {
+            "expression": "^RedisGraph.",
+            "options": "i"
+          }
+        ]
+      }
     }
   }
 }

redisinsight/api/config/swagger.ts

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

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.30.0",
+  "version": "2.32.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {

redisinsight/api/src/__mocks__/cloud-capi-key.ts

@@ -1,5 +1,7 @@
 import { CloudCapiAuthDto } from 'src/modules/cloud/common/dto';
 import { CloudCapiKey, ICloudApiCapiAccessKey, ICloudApiCapiKey } from 'src/modules/cloud/capi-key/model';
+import { CloudCapiKeyEntity } from 'src/modules/cloud/capi-key/entity/cloud-capi-key.entity';
+import { EncryptionStrategy } from 'src/modules/encryption/models';
 import { mockServer } from 'src/__mocks__/server';
 
 export const mockCloudCapiAuthDto: CloudCapiAuthDto = {
@@ -31,6 +33,16 @@ export const mockCloudCapiKey = Object.assign(new CloudCapiKey(), {
   lastUsed: new Date(),
 });
 
+export const mockCapiKeyEncrypted = 'cloudCapiKey.capiKey_ENCRYPTED';
+export const mockCapiSecretEncrypted = 'cloudCapiKey.capiSecret_ENCRYPTED';
+
+export const mockCloudCapiKeyEntity = Object.assign(new CloudCapiKeyEntity(), {
+  ...mockCloudCapiKey,
+  capiKey: mockCapiKeyEncrypted,
+  capiSecret: mockCapiSecretEncrypted,
+  encryption: EncryptionStrategy.KEYTAR,
+});
+
 export const mockCloudCapiKeyApiProvider = jest.fn(() => ({
   enableCapi: jest.fn().mockResolvedValue(mockCloudApiCapiAccessKey.accessKey),
   createCapiKey: jest.fn().mockResolvedValue(mockCloudApiCapiKey),

redisinsight/api/src/__mocks__/cloud-common.ts

@@ -4,3 +4,9 @@ export const mockCapiUnauthorizedError = {
     status: 401,
   },
 };
+
+export const mockUtm = {
+  source: 'redisinsight',
+  medium: 'app',
+  campaign: 'workbench',
+};

redisinsight/api/src/__mocks__/cloud-job.ts

@@ -0,0 +1,40 @@
+import { CloudJobStatus, CloudJobStep } from 'src/modules/cloud/job/models/cloud-job-info';
+import { CloudJobName } from 'src/modules/cloud/job/constants';
+import { CloudJobRunMode } from 'src/modules/cloud/job/models';
+import { CloudJob } from 'src/modules/cloud/job/jobs';
+import { mockSessionMetadata } from 'src/__mocks__/common';
+
+export const mockCreateDatabaseCloudJobDataDto = {
+  name: CloudJobName.CreateFreeDatabase,
+  runMode: CloudJobRunMode.Async,
+  data: { planId: 123 },
+};
+
+export const mockCloudJobInfo = {
+  id: 'job-id',
+  name: CloudJobName.CreateFreeDatabase,
+  status: CloudJobStatus.Running,
+  step: CloudJobStep.Database,
+};
+
+export abstract class MockCloudJob extends CloudJob {
+  constructor() {
+    super({
+      abortController: new AbortController(),
+      sessionMetadata: mockSessionMetadata,
+    });
+  }
+}
+
+MockCloudJob['getWriteStream'] = jest.fn();
+MockCloudJob['addProfilerClient'] = jest.fn();
+MockCloudJob['removeProfilerClient'] = jest.fn();
+MockCloudJob['setAlias'] = jest.fn();
+MockCloudJob['destroy'] = jest.fn();
+MockCloudJob['getState'] = jest.fn().mockReturnValue(mockCloudJobInfo);
+
+export const mockCloudJobProvider = jest.fn(() => ({
+  addJob: jest.fn().mockResolvedValue(mockCloudJobInfo),
+  get: jest.fn().mockResolvedValue(MockCloudJob),
+  findUserJobs: jest.fn().mockResolvedValue([MockCloudJob]),
+}));