Merge branch 'main' into feature/dynamic-dependencies

Author: ArtemHoruzhenko

.circleci/build/release-docker.sh

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

configs/webpack.config.main.prod.ts

@@ -56,6 +56,7 @@ export default merge(baseConfig, {
       DEBUG_PROD: false,
       START_MINIMIZED: false,
       RI_APP_TYPE: 'electron',
+      RI_AUTO_BOOTSTRAP: false,
       RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
       RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
       RI_SERVE_STATICS: false,

redisinsight/api/config/default.ts

@@ -75,8 +75,10 @@ export default {
     tlsCert: process.env.RI_SERVER_TLS_CERT,
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
+    migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
+    autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.52.0',
+    appVersion: process.env.RI_APP_VERSION || '2.54.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -146,7 +148,7 @@ export default {
   },
   content: {
     updateUrl: process.env.RI_CONTENT_UPDATE_URL
-      || 'https://github.com/RedisInsight/Statics/releases/download/2.42',
+      || 'https://github.com/RedisInsight/Statics/releases/download/2.54',
     zip: process.env.RI_CONTENT_ZIP || dataZipFileName,
     buildInfo: process.env.RI_CONTENT_INFO || buildInfoFileName,
     devMode: !!process.env.RI_CONTENT_PATH,

redisinsight/api/config/features-config.json

@@ -1,9 +1,9 @@
 {
-  "version": 2.5203,
+  "version": 2.5401,
   "features": {
     "redisDataIntegration": {
       "flag": true,
-      "perc": [[0,0]],
+      "perc": [[0,100]],
       "filters": [
         {
           "name": "config.server.buildType",

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

redisinsight/api/package.json

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

redisinsight/api/src/__mocks__/databases.ts

@@ -28,6 +28,8 @@ export const mockDatabaseSentinelMasterPasswordEncrypted = 'database.sentinelMas
 
 export const mockDatabaseSentinelMasterPasswordPlain = 'some sentinel pass';
 
+export const mockDBSize = 1;
+
 export const mockDatabase = Object.assign(new Database(), {
   id: mockDatabaseId,
   name: 'database-name',
@@ -268,6 +270,7 @@ export const mockDatabaseInfoProvider = jest.fn(() => ({
   determineSentinelMasterGroups: jest.fn().mockReturnValue([mockSentinelMasterDto]),
   determineClusterNodes: jest.fn().mockResolvedValue(mockClusterNodes),
   getRedisGeneralInfo: jest.fn().mockResolvedValueOnce(mockRedisGeneralInfo),
+  getRedisDBSize: jest.fn().mockResolvedValue(mockDBSize),
   getClientListInfo: jest.fn().mockReturnValue(mockRedisClientListResult),
 }));
 

redisinsight/api/src/constants/custom-error-codes.ts

@@ -13,6 +13,7 @@ export enum CustomErrorCodes {
   CloudOauthUnknownAuthorizationRequest = 11_007,
   CloudOauthUnexpectedError = 11_008,
   CloudOauthMissedRequiredData = 11_009,
+  CloudOauthCanceled = 11_010,
   CloudCapiUnauthorized = 11_021,
   CloudCapiKeyUnauthorized = 11_022,
   CloudCapiKeyNotFound = 11_023,

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

@@ -86,10 +86,11 @@ export default {
 
   CLOUD_CAPI_KEY_UNAUTHORIZED: 'Unable to authorize such CAPI key',
 
+  CLOUD_OAUTH_CANCELED: 'Authorization request was canceled.',
   CLOUD_OAUTH_MISCONFIGURATION: 'Authorization server misconfiguration.',
   CLOUD_OAUTH_GITHUB_EMAIL_PERMISSION: 'Unable to get an email from the GitHub account. Make sure that it is available.',
   CLOUD_OAUTH_MISSED_REQUIRED_DATA: 'Unable to get required data from the user profile.',
-  CLOUD_OAUTH_GITHUB_UNKNOWN_AUTHORIZATION_REQUEST: 'Unknown authorization request.',
+  CLOUD_OAUTH_UNKNOWN_AUTHORIZATION_REQUEST: 'Unknown authorization request.',
   CLOUD_OAUTH_UNEXPECTED_ERROR: 'Unexpected error.',
 
   CLOUD_JOB_UNEXPECTED_ERROR: 'Unexpected error occurred',

redisinsight/api/src/main.ts

@@ -25,7 +25,9 @@ interface IApp {
 }
 
 export default async function bootstrap(apiPort?: number): Promise<IApp> {
-  await migrateHomeFolder() && await removeOldFolders();
+  if (serverConfig.migrateOldFolders) {
+    await migrateHomeFolder() && await removeOldFolders();
+  }
 
   const { port, host } = serverConfig;
   const logger = WinstonModule.createLogger(LOGGER_CONFIG);
@@ -95,6 +97,6 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
   return { app, gracefulShutdown };
 }
 
-if (process.env.RI_APP_TYPE !== 'electron') {
+if (serverConfig.autoBootstrap) {
   bootstrap();
 }