Merge branch 'main' into e2e/feature/RI-4632_cluster_triggered_functions_rev

# Conflicts:
#	tests/e2e/tests/critical-path/triggers-and-functions/libraries.e2e.ts

Author: mariasergeenko

.circleci/config.yml

@@ -790,6 +790,9 @@ jobs:
           root: .
           paths:
             - ./docker-release
+      - store_artifacts:
+          path: docker-release
+          destination: docker-release
 
   # Release jobs
   store-build-artifacts:
@@ -1011,6 +1014,18 @@ workflows:
               only:
                 - /^e2e/feature.*/
                 - /^e2e/bugfix.*/
+      - setup-sign-certificates:
+          name: Setup sign certificates (stage)
+          requires:
+            - Start E2E Tests
+      - setup-build:
+          name: Setup build (stage)
+          requires:
+            - Setup sign certificates (stage)
+      - linux:
+          name: Build app - Linux (stage)
+          requires:
+            - Setup build (stage)
       - docker:
           name: Build docker image
           requires:
@@ -1021,6 +1036,11 @@ workflows:
           parallelism: 4
           requires:
             - Build docker image
+      - e2e-app-image:
+          name: E2ETest (AppImage)
+          parallelism: 2
+          requires:
+            - Build app - Linux (stage)
   # Workflow for feature, bugfix, main branches
   feature-main-branch:
     jobs:

electron-builder.json

@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "50",
+    "bundleVersion": "70",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

package.json

@@ -80,7 +80,9 @@
   "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "resolutions": {
     "**/node-sass": "^8.0.0",
-    "**/trim": "0.0.3"
+    "**/trim": "0.0.3",
+    "word-wrap": "1.2.4",
+    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

redisinsight/api/config/default.ts

@@ -58,7 +58,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.28.1',
+    appVersion: process.env.APP_VERSION || '2.30.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -195,6 +195,11 @@ export default {
       url: process.env.COMMANDS_REDISBLOOM_URL
         || 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json',
     },
+    {
+      name: 'triggers_and_functions',
+      url: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_URL
+        || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json',
+    },
   ],
   connections: {
     timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec

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.28.1',
+    version: '2.30.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -37,6 +37,12 @@
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",
     "typeorm:run": "yarn typeorm migration:run"
   },
+  "resolutions": {
+    "nanoid": "^3.1.31",
+    "word-wrap": "1.2.4",
+    "mocha/minimatch": "^3.0.5",
+    "@nestjs/platform-socket.io/socket.io": "^4.7.1"
+  },
   "dependencies": {
     "@nestjs/common": "^9.0.11",
     "@nestjs/core": "^9.0.11",
@@ -52,7 +58,7 @@
     "axios": "^0.25.0",
     "body-parser": "^1.19.0",
     "class-transformer": "^0.2.3",
-    "class-validator": "^0.12.2",
+    "class-validator": "^0.14.0",
     "connect-timeout": "^1.9.0",
     "date-fns": "^2.29.3",
     "detect-port": "^1.5.1",
@@ -69,7 +75,7 @@
     "node-version-compare": "^1.0.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.6",
-    "socket.io": "^4.4.0",
+    "socket.io": "^4.6.2",
     "source-map-support": "^0.5.19",
     "sqlite3": "5.1.6",
     "ssh2": "^1.14.0",
@@ -85,7 +91,6 @@
     "@nestjs/schematics": "^9.0.3",
     "@nestjs/testing": "^9.0.11",
     "@types/adm-zip": "^0.5.0",
-    "@types/axios": "^0.14.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.167",

redisinsight/api/scripts/default-commands.ts

@@ -8,10 +8,10 @@ const COMMANDS_CONFIG = get('commands');
 
 async function init() {
   try {
-    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url }) => {
+    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url, defaultUrl }) => {
       try {
         console.log(`Trying to get ${name} commands...`);
-        const { data } = await axios.get(url, {
+        const { data } = await axios.get(defaultUrl || url, {
           responseType: 'text',
           transformResponse: [(raw) => raw],
         });

redisinsight/api/src/common/models/client-metadata.ts

@@ -21,7 +21,11 @@ export class ClientMetadata {
   databaseId: string;
 
   @IsNotEmpty()
-  @IsEnum(ClientContext)
+  @IsEnum(ClientContext, {
+    message: `context must be a valid enum value. Valid values: ${Object.values(
+      ClientContext,
+    )}.`,
+  })
   context: ClientContext;
 
   @IsOptional()

redisinsight/api/src/constants/redis-modules.ts

@@ -6,6 +6,7 @@ export enum AdditionalRedisModuleName {
   RedisJSON = 'ReJSON',
   RediSearch = 'search',
   RedisTimeSeries = 'timeseries',
+  'Triggers and Functions' = 'redisgears'
 }
 
 export enum AdditionalSearchModuleName {
@@ -14,9 +15,9 @@ export enum AdditionalSearchModuleName {
   FTL = 'ftl',
 }
 
-export enum AdditionalTriggeredAndFunctionsModuleName {
-  RedisGears = 'redisgears',
-  RedisGears2 = 'redisgears_2',
+export enum AdditionalTriggersAndFunctionsModuleName {
+  TriggersAndFunctions = 'redisgears',
+  TriggersAndFunctions2 = 'redisgears_2',
 }
 
 export const SUPPORTED_REDIS_MODULES = Object.freeze({
@@ -67,6 +68,6 @@ export const REDISEARCH_MODULES: string[] = [
 ];
 
 export const TRIGGERED_AND_FUNCTIONS_MODULES: string[] = [
-  AdditionalTriggeredAndFunctionsModuleName.RedisGears,
-  AdditionalTriggeredAndFunctionsModuleName.RedisGears2,
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions,
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions2,
 ];

redisinsight/api/src/modules/browser/dto/browser-history/create.browser-history.dto.ts

@@ -20,6 +20,10 @@ export class CreateBrowserHistoryDto {
     example: BrowserHistoryMode.Pattern,
   })
   @IsOptional()
-  @IsEnum(BrowserHistoryMode)
+  @IsEnum(BrowserHistoryMode, {
+    message: `mode must be a valid enum value. Valid values: ${Object.values(
+      BrowserHistoryMode,
+    )}.`,
+  })
   mode?: BrowserHistoryMode = BrowserHistoryMode.Pattern;
 }