Merge pull request #2516 from RedisInsight/release/2.32.0

Release/2.32.0 to latest

Author: mariasergeenko

.circleci/config.yml

@@ -565,6 +565,16 @@ jobs:
               exit 0;
             fi
 
+            export RI_CLOUD_IDP_AUTHORIZE_URL=$RI_CLOUD_IDP_AUTHORIZE_URL_STAGE
+            export RI_CLOUD_IDP_TOKEN_URL=$RI_CLOUD_IDP_TOKEN_URL_STAGE
+            export RI_CLOUD_IDP_ISSUER=$RI_CLOUD_IDP_ISSUER_STAGE
+            export RI_CLOUD_IDP_CLIENT_ID=$RI_CLOUD_IDP_CLIENT_ID_STAGE
+            export RI_CLOUD_IDP_REDIRECT_URI=$RI_CLOUD_IDP_REDIRECT_URI_STAGE
+            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
               exit 0;
@@ -641,6 +651,16 @@ jobs:
               exit 0;
             fi
 
+            export RI_CLOUD_IDP_AUTHORIZE_URL=$RI_CLOUD_IDP_AUTHORIZE_URL_STAGE
+            export RI_CLOUD_IDP_TOKEN_URL=$RI_CLOUD_IDP_TOKEN_URL_STAGE
+            export RI_CLOUD_IDP_ISSUER=$RI_CLOUD_IDP_ISSUER_STAGE
+            export RI_CLOUD_IDP_CLIENT_ID=$RI_CLOUD_IDP_CLIENT_ID_STAGE
+            export RI_CLOUD_IDP_REDIRECT_URI=$RI_CLOUD_IDP_REDIRECT_URI_STAGE
+            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
               rm -rf release/mac
@@ -697,6 +717,16 @@ jobs:
               exit 0;
             fi
 
+            export RI_CLOUD_IDP_AUTHORIZE_URL=$RI_CLOUD_IDP_AUTHORIZE_URL_STAGE
+            export RI_CLOUD_IDP_TOKEN_URL=$RI_CLOUD_IDP_TOKEN_URL_STAGE
+            export RI_CLOUD_IDP_ISSUER=$RI_CLOUD_IDP_ISSUER_STAGE
+            export RI_CLOUD_IDP_CLIENT_ID=$RI_CLOUD_IDP_CLIENT_ID_STAGE
+            export RI_CLOUD_IDP_REDIRECT_URI=$RI_CLOUD_IDP_REDIRECT_URI_STAGE
+            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
               rm -rf release/win-unpacked
@@ -1014,6 +1044,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:
@@ -1024,6 +1066,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:

configs/webpack.config.main.prod.ts

@@ -69,6 +69,16 @@ export default merge(baseConfig, {
       CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
         ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
         : toString(30 * 1000), // 30 sec
+      // cloud auth
+      RI_CLOUD_IDP_AUTHORIZE_URL: 'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env ? process.env.RI_CLOUD_IDP_AUTHORIZE_URL: '',
+      RI_CLOUD_IDP_TOKEN_URL: 'RI_CLOUD_IDP_TOKEN_URL' in process.env ? process.env.RI_CLOUD_IDP_TOKEN_URL: '',
+      RI_CLOUD_IDP_ISSUER: 'RI_CLOUD_IDP_ISSUER' in process.env ? process.env.RI_CLOUD_IDP_ISSUER: '',
+      RI_CLOUD_IDP_CLIENT_ID: 'RI_CLOUD_IDP_CLIENT_ID' in process.env ? process.env.RI_CLOUD_IDP_CLIENT_ID: '',
+      RI_CLOUD_IDP_REDIRECT_URI: 'RI_CLOUD_IDP_REDIRECT_URI' in process.env ? process.env.RI_CLOUD_IDP_REDIRECT_URI: '',
+      RI_CLOUD_IDP_GOOGLE_ID: 'RI_CLOUD_IDP_GOOGLE_ID' in process.env ? process.env.RI_CLOUD_IDP_GOOGLE_ID: '',
+      RI_CLOUD_IDP_GH_ID: 'RI_CLOUD_IDP_GH_ID' in process.env ? process.env.RI_CLOUD_IDP_GH_ID: '',
+      RI_CLOUD_API_URL: 'RI_CLOUD_API_URL' in process.env ? process.env.RI_CLOUD_API_URL: '',
+      RI_CLOUD_CAPI_URL: 'RI_CLOUD_CAPI_URL' in process.env ? process.env.RI_CLOUD_CAPI_URL: '',
     }),
 
     new webpack.DefinePlugin({

electron-builder.json

@@ -15,6 +15,12 @@
     "node_modules/sqlite3",
     "node_modules/cpu-features"
   ],
+  "protocols": [{
+    "name": "RedisInsight",
+    "role": "Viewer",
+    "schemes": ["redisinsight"]
+  }
+  ],
   "mac": {
     "target": [
       {
@@ -29,7 +35,6 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "88678",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",
@@ -99,6 +104,11 @@
       "Redis Labs Inc."
     ]
   },
+  "nsis": {
+    "oneClick": false,
+    "perMachine": false,
+    "allowToChangeInstallationDirectory": true
+  },
   "linux": {
     "icon": "./resources/icons",
     "target": [

jest.config.js

@@ -1,4 +1,4 @@
-const { TextDecoder, TextEncoder } = require('util');
+const { TextDecoder, TextEncoder } = require('util')
 
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
@@ -54,10 +54,10 @@ module.exports = {
   ],
   coverageThreshold: {
     global: {
-      statements: 78,
-      branches: 61,
-      functions: 70,
-      lines: 79,
+      statements: 80,
+      branches: 63,
+      functions: 72,
+      lines: 80,
     },
     // './redisinsight/ui/src/slices/**/*.ts': {
     //   statements: 90,
@@ -67,4 +67,4 @@ module.exports = {
     TextDecoder,
     TextEncoder,
   },
-};
+}

package.json

@@ -25,8 +25,8 @@
     "lint:e2e": "yarn --cwd tests/e2e lint",
     "package": "yarn package:dev",
     "package:prod": "ts-node ./scripts/prebuild.js dist && yarn build:prod && electron-builder build -p never",
-    "package:stage": "ts-node ./scripts/prebuild.js dist && yarn build:stage && electron-builder build -p never",
-    "package:mas": "electron-builder build -p never -m mas:universal -c ./electron-builder-mas.js",
+    "package:stage": "ts-node ./scripts/prebuild.js dist && yarn build:stage && electron-builder build -p never -c.mac.bundleVersion=$CIRCLE_BUILD_NUM",
+    "package:mas": "electron-builder build -p never -m mas:universal -c.mac.bundleVersion=$CIRCLE_BUILD_NUM -c ./electron-builder-mas.js",
     "package:mas:dev": "electron-builder build -p never -m mas-dev:universal -c ./electron-builder-mas.js",
     "package:dev": "yarn build && cross-env DEBUG=electron-builder electron-builder build -p never",
     "package:win": "yarn build:prod && electron-builder build --win --x64 -p never",
@@ -80,7 +80,11 @@
   "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",
+    "**/semver": "^7.5.2",
+    "rawproto/protobufjs": "^7.2.4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -125,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",
@@ -243,6 +248,7 @@
     "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",
@@ -253,7 +259,6 @@
     "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/.eslintrc.js

@@ -18,4 +18,12 @@ module.exports = {
   parserOptions: {
     project: './tsconfig.json',
   },
+  overrides: [
+    {
+      files: [ '**/*.spec.ts' ],
+      rules: {
+        'no-duplicate-string': 'off',
+      }
+    }
+  ]
 };

redisinsight/api/config/default.ts

@@ -1,5 +1,7 @@
 import { join } from 'path';
 import * as os from 'os';
+import { RequestMethod } from '@nestjs/common';
+import { version } from '../package.json';
 
 const homedir = join(__dirname, '..');
 
@@ -38,6 +40,7 @@ export default {
     clientCertificates: join(homedir, 'client_certificates'),
   },
   server: {
+    version,
     env: 'development',
     listenInterface: process.env.RI_HOSTNAME ?? '0.0.0.0',
     port: 5000,
@@ -58,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: [],
@@ -72,11 +75,6 @@ export default {
     synchronize: process.env.DB_SYNC ? process.env.DB_SYNC === 'true' : false,
     migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : true,
   },
-  redis_cloud: {
-    url: process.env.REDIS_CLOUD_URL || 'https://api-cloudapi.qa.redislabs.com/v1',
-    cloudDiscoveryTimeout: parseInt(process.env.RI_CLOUD_DISCOVERY_TIMEOUT, 10) || 60 * 1000, // 1 min
-    cloudDatabaseConnectionTimeout: parseInt(process.env.RI_CLOUD_DATABASE_CONNECTION_TIMEOUT, 10) || 30 * 1000,
-  },
   redis_clients: {
     idleSyncInterval: parseInt(process.env.CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr
     maxIdleThreshold: parseInt(process.env.CLIENTS_MAX_IDLE_THRESHOLD, 10) || 1000 * 60 * 60, // 1hr
@@ -199,8 +197,6 @@ export default {
       name: 'triggers_and_functions',
       url: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_URL
         || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json',
-      defaultUrl: process.env.COMMANDS_TRIGGERS_AND_FUNCTIONS_DEFAULT_URL
-        || 'https://s3.amazonaws.com/redisinsight.download/public/commands/triggers_and_functions.json',
     },
   ],
   connections: {
@@ -218,4 +214,33 @@ export default {
       || '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
   },
+  cloud: {
+    apiUrl: process.env.RI_CLOUD_API_URL || 'https://app-sm.k8s-cloudapi.sm-qa.qa.redislabs.com/api/v1',
+    capiUrl: process.env.RI_CLOUD_CAPI_URL || 'https://api-k8s-cloudapi.qa.redislabs.com/v1',
+    capiKeyName: process.env.RI_CLOUD_CAPI_KEY_NAME || 'RedisInsight',
+    freeSubscriptionName: process.env.RI_CLOUD_FREE_SUBSCRIPTION_NAME || 'My free subscription',
+    freeDatabaseName: process.env.RI_CLOUD_FREE_DATABASE_NAME || 'Redis-Stack-in-Redis-Enterprise-Cloud',
+    defaultPlanRegion: process.env.RI_CLOUD_DEFAULT_PLAN_REGION || 'eu-west-1',
+    jobIterationInterval: parseInt(process.env.RI_CLOUD_JOB_ITERATION_INTERVAL, 10) || 10_000, // 10 sec
+    discoveryTimeout: parseInt(process.env.RI_CLOUD_DISCOVERY_TIMEOUT, 10) || 60 * 1000, // 1 min
+    databaseConnectionTimeout: parseInt(process.env.RI_CLOUD_DATABASE_CONNECTION_TIMEOUT, 10) || 30 * 1000,
+    idp: {
+      google: {
+        authorizeUrl: process.env.RI_CLOUD_IDP_GOOGLE_AUTHORIZE_URL || process.env.RI_CLOUD_IDP_AUTHORIZE_URL,
+        tokenUrl: process.env.RI_CLOUD_IDP_GOOGLE_TOKEN_URL || process.env.RI_CLOUD_IDP_TOKEN_URL,
+        issuer: process.env.RI_CLOUD_IDP_GOOGLE_ISSUER || process.env.RI_CLOUD_IDP_ISSUER,
+        clientId: process.env.RI_CLOUD_IDP_GOOGLE_CLIENT_ID || process.env.RI_CLOUD_IDP_CLIENT_ID,
+        redirectUri: process.env.RI_CLOUD_IDP_GOOGLE_REDIRECT_URI || process.env.RI_CLOUD_IDP_REDIRECT_URI,
+        idp: process.env.RI_CLOUD_IDP_GOOGLE_ID,
+      },
+      github: {
+        authorizeUrl: process.env.RI_CLOUD_IDP_GH_AUTHORIZE_URL || process.env.RI_CLOUD_IDP_AUTHORIZE_URL,
+        tokenUrl: process.env.RI_CLOUD_IDP_GH_TOKEN_URL || process.env.RI_CLOUD_IDP_TOKEN_URL,
+        issuer: process.env.RI_CLOUD_IDP_GH_ISSUER || process.env.RI_CLOUD_IDP_ISSUER,
+        clientId: process.env.RI_CLOUD_IDP_GH_CLIENT_ID || process.env.RI_CLOUD_IDP_CLIENT_ID,
+        redirectUri: process.env.RI_CLOUD_IDP_GH_REDIRECT_URI || process.env.RI_CLOUD_IDP_REDIRECT_URI,
+        idp: process.env.RI_CLOUD_IDP_GH_ID,
+      },
+    },
+  },
 };

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 2.3201,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -16,6 +16,45 @@
           "cond": "eq"
         }
       ]
+    },
+    "cloudSso": {
+      "flag": true,
+      "perc": [[0,100]],
+      "filters": [
+        {
+          "name": "config.server.buildType",
+          "value": "ELECTRON",
+          "cond": "eq"
+        }
+      ],
+      "data": {
+        "selectPlan": {
+          "components": {
+            "triggersAndFunctions": [
+              {
+                "provider": "AWS",
+                "regions": ["ap-southeast-1"]
+              },
+              {
+                "provider": "GCP",
+                "regions": ["asia-northeast1"]
+              }
+            ]
+          }
+        }
+      }
+    },
+    "redisModuleFilter": {
+      "flag": true,
+      "perc": [[0, 100]],
+      "data": {
+        "hideByName": [
+          {
+            "expression": "^RedisGraph.",
+            "options": "i"
+          }
+        ]
+      }
     }
   }
 }

redisinsight/api/config/ormconfig.ts

@@ -17,9 +17,10 @@ import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-histo
 import { CustomTutorialEntity } from 'src/modules/custom-tutorial/entities/custom-tutorial.entity';
 import { FeatureEntity } from 'src/modules/feature/entities/feature.entity';
 import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
-import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/autodiscovery/entities/cloud-database-details.entity';
+import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/database/entities/cloud-database-details.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
+import { CloudCapiKeyEntity } from 'src/modules/cloud/capi-key/entity/cloud-capi-key.entity';
 
 const dbConfig = config.get('db');
 
@@ -46,6 +47,7 @@ const ormConfig = {
     FeatureEntity,
     FeaturesConfigEntity,
     CloudDatabaseDetailsEntity,
+    CloudCapiKeyEntity,
   ],
   migrations,
 };

redisinsight/api/config/production.ts

@@ -30,7 +30,7 @@ export default {
   db: {
     database: join(homedir, 'redisinsight.db'),
   },
-  redis_cloud: {
-    url: process.env.REDIS_CLOUD_URL || 'https://api.redislabs.com/v1',
+  cloud: {
+    cApiUrl: process.env.RI_CLOUD_CAPI_URL || 'https://api.redislabs.com/v1',
   },
 };