Merge pull request #595 from RedisInsight/release/2.0.6

Release/2.0.6

Author: arthosofteq

.circleci/config.yml

@@ -302,7 +302,7 @@ jobs:
           name: .AppImage tests
           command: |
             cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
-            .circleci/scripts/e2e/app-image.e2e.sh
+            .circleci/e2e/test.app-image.sh
       - when:
           condition:
             equal: [ true, << parameters.report >> ]
@@ -315,6 +315,42 @@ jobs:
                   curl -H "Content-type: application/json" --data @e2e.report.json -H "Authorization: Bearer $SLACK_TEST_REPORT_KEY" -X POST https://slack.com/api/chat.postMessage
       - store_test_results:
           path: ./tests/e2e/results
+  e2e-exe:
+    executor:
+      name: win/default
+    parameters:
+      report:
+        description: Send report for test run to slack
+        type: boolean
+        default: false
+      parallelism:
+        description: Number of threads to run tests
+        type: integer
+        default: 1
+    parallelism: << parameters.parallelism >>
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run: choco install nodejs --version=15.14.0
+      - run:
+          command: |
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+            .circleci/e2e/test.exe.cmd
+          shell: bash.exe
+      - when:
+          condition:
+            equal: [ true, << parameters.report >> ]
+          steps:
+            - run:
+                name: Send report
+                when: always
+                command: |
+                  APP_BUILD_TYPE="Electron (Windows)" node ./.circleci/e2e-results.js
+                  curl -H "Content-type: application/json" --data @e2e.report.json -H "Authorization: Bearer $SLACK_TEST_REPORT_KEY" -X POST https://slack.com/api/chat.postMessage
+                shell: bash.exe
+      - store_test_results:
+          path: ./tests/e2e/results
 
   e2e-tests:
     executor: linux-executor
@@ -756,41 +792,50 @@ jobs:
             aws s3 mv s3://${AWS_BUCKET_NAME}/private/${applicationVersion}/ \
               s3://${AWS_BUCKET_NAME}/${upgradeLatestFolderPath} --recursive
 
+            # invalidate cloudfront cash
+            aws cloudfront create-invalidation --distribution-id ${AWS_DISTRIBUTION_ID} --paths "/*"
+
       - run:
           name: Add tags for all objects and create S3 metrics
           command: |
 
             # declare all tags
             declare -A tag0=(
-                [key]='platform'
-                [value]='macos'
+                [arch]='x64'
+                [platform]='macos'
                 [objectDownload]=${applicationName}'-mac-x64.dmg'
                 [objectUpgrade]=${applicationName}'-mac-x64.zip'
             )
 
             declare -A tag1=(
-                [key]='platform'
-                [value]='macos'
+                [arch]='arm64'
+                [platform]='macos'
                 [objectDownload]=${applicationName}'-mac-arm64.dmg'
                 [objectUpgrade]=${applicationName}'-mac-arm64.zip'
             )
 
             declare -A tag2=(
-                [key]='platform'
-                [value]='windows'
+                [arch]='x64'
+                [platform]='windows'
                 [objectDownload]=${applicationName}'-win-installer.exe'
             )
 
             declare -A tag3=(
-                [key]='platform'
-                [value]='linux_AppImage'
-                [objectDownload]=${applicationName}'-x86_64.AppImage'
+                [arch]='x64'
+                [platform]='linux_AppImage'
+                [objectDownload]=${applicationName}'-linux-x86_64.AppImage'
             )
 
             declare -A tag4=(
-                [key]='platform'
-                [value]='linux_deb'
-                [objectDownload]=${applicationName}'-amd64.deb'
+                [arch]='x64'
+                [platform]='linux_deb'
+                [objectDownload]=${applicationName}'-linux-amd64.deb'
+            )
+
+            declare -A tag5=(
+                [arch]='x64'
+                [platform]='linux_rpm'
+                [objectDownload]=${applicationName}'-linux-x86_64.rpm'
             )
 
             # loop for add all tags to each app and create metrics
@@ -800,32 +845,32 @@ jobs:
                 designation0="downloads"
                 designation1="upgrades"
 
-                id0="${tag[value]}_${designation0}_${applicationVersion}"
-                id1="${tag[value]}_${designation1}_${applicationVersion}"
+                id0="${tag[platform]}_${tag[arch]}_${designation0}_${applicationVersion}"
+                id1="${tag[platform]}_${tag[arch]}_${designation1}_${applicationVersion}"
 
                 # add tags to each app for download
                 aws s3api put-object-tagging \
                   --bucket ${AWS_BUCKET_NAME} \
                   --key ${downloadLatestFolderPath}/${tag[objectDownload]} \
-                  --tagging '{"TagSet": [{ "Key": "version", "Value": "'"${applicationVersion}"'" }, {"Key": "'"${tag[key]}"'", "Value": "'"${tag[value]}"'"}, { "Key": "designation", "Value": "'"${designation0}"'" }]}'
+                  --tagging '{"TagSet": [{ "Key": "version", "Value": "'"${applicationVersion}"'" }, {"Key": "platform", "Value": "'"${tag[platform]}"'"}, {"Key": "arch", "Value": "'"${tag[arch]}"'"}, { "Key": "designation", "Value": "'"${designation0}"'" }]}'
 
                 # add tags to each app for upgrades
                 aws s3api put-object-tagging \
                   --bucket ${AWS_BUCKET_NAME} \
                   --key ${upgradeLatestFolderPath}/${tag[objectUpgrade]:=${tag[objectDownload]}} \
-                  --tagging '{"TagSet": [{ "Key": "version", "Value": "'"${applicationVersion}"'" }, {"Key": "'"${tag[key]}"'", "Value": "'"${tag[value]}"'"}, { "Key": "designation", "Value": "'"${designation1}"'" }]}'
+                  --tagging '{"TagSet": [{ "Key": "version", "Value": "'"${applicationVersion}"'" }, {"Key": "platform", "Value": "'"${tag[platform]}"'"}, {"Key": "arch", "Value": "'"${tag[arch]}"'"}, { "Key": "designation", "Value": "'"${designation1}"'" }]}'
 
                 # Create metrics for all tags for downloads to S3
                 aws s3api put-bucket-metrics-configuration \
                   --bucket ${AWS_BUCKET_NAME} \
                   --id ${id0} \
-                  --metrics-configuration '{"Id": "'"${id0}"'", "Filter": {"And": {"Tags": [{"Key": "'"${tag[key]}"'", "Value": "'"${tag[value]}"'"}, {"Key": "designation", "Value": "'"${designation0}"'"}, {"Key": "version", "Value": "'"${applicationVersion}"'"} ]}}}'
+                  --metrics-configuration '{"Id": "'"${id0}"'", "Filter": {"And": {"Tags": [{"Key": "platform", "Value": "'"${tag[platform]}"'"}, {"Key": "arch", "Value": "'"${tag[arch]}"'"}, {"Key": "designation", "Value": "'"${designation0}"'"}, {"Key": "version", "Value": "'"${applicationVersion}"'"} ]}}}'
 
                 # Create metrics for all tags for upgrades to S3
                 aws s3api put-bucket-metrics-configuration \
                   --bucket ${AWS_BUCKET_NAME} \
                   --id ${id1} \
-                  --metrics-configuration '{"Id": "'"${id1}"'", "Filter": {"And": {"Tags": [{"Key": "'"${tag[key]}"'", "Value": "'"${tag[value]}"'"}, {"Key": "designation", "Value": "'"${designation1}"'"}, {"Key": "version", "Value": "'"${applicationVersion}"'"}]}}}'
+                  --metrics-configuration '{"Id": "'"${id1}"'", "Filter": {"And": {"Tags": [{"Key": "platform", "Value": "'"${tag[platform]}"'"}, {"Key": "arch", "Value": "'"${tag[arch]}"'"}, {"Key": "designation", "Value": "'"${designation1}"'"}, {"Key": "version", "Value": "'"${applicationVersion}"'"}]}}}'
 
             done
 
@@ -1064,7 +1109,6 @@ workflows:
             branches:
               only:
                 - main
-                - latest
     jobs:
       # build docker image
       - docker:
@@ -1080,6 +1124,10 @@ workflows:
           name: Build app - Linux (stage)
           requires:
             - Setup build (stage)
+      - windows:
+          name: Build app - Windows (stage)
+          requires:
+            - Setup build (stage)
       # integration tests on docker image build
       - integration-tests-run:
           matrix:
@@ -1106,3 +1154,10 @@ workflows:
           report: true
           requires:
             - Build app - Linux (stage)
+      # e2e desktop tests on exe build
+      - e2e-exe:
+          name: E2ETest (exe) - Nightly
+          parallelism: 4
+          report: true
+          requires:
+            - Build app - Windows (stage)

.circleci/scripts/e2e/app-image.e2e.sh renamed to .circleci/e2e/test.app-image.sh

@@ -0,0 +1,23 @@
+@echo off
+
+set COMMON_URL=%USERPROFILE%/AppData/Local/Programs/redisinsight/resources/app.asar/index.html
+set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight-preview.exe
+set OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
+set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
+set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%
+set OSS_STANDALONE_PASSWORD=%E2E_CLOUD_DATABASE_PASSWORD%
+set SOCKETS_CORS=true
+
+call yarn --cwd tests/e2e install
+
+call "./release/RedisInsight-preview-win-installer.exe"
+
+:: waiting until app auto launches
+timeout 5
+
+:: close an auto launched app
+taskkill /im RedisInsight-preview.exe /f
+taskkill /im RedisInsight-preview-win-installer.exe /f
+
+:: run tests
+call yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci:win

.circleci/e2e/test.exe.cmd

@@ -125,8 +125,8 @@ consistency with plugin visualisations and the entire application.
 
 Find the example of the plugin here.
 
-* [Client List Plugin README](../../redisinsight/ui/src/packages/clients-list-example/README.md)
-* [Client List Plugin dir](../../redisinsight/ui/src/packages/clients-list-example/)
+* [Client List Plugin README](https://github.com/RedisInsight/Packages/blob/main/clients-list-example/README.md)
+* [Client List Plugin dir](https://github.com/RedisInsight/Packages/blob/main/clients-list-example/)
 
 ### Available parameters
 

docs/plugins/development.md

@@ -142,6 +142,7 @@
     "@types/express": "^4.17.3",
     "@types/html-entities": "^1.3.4",
     "@types/ioredis": "^4.26.0",
+    "@types/is-glob": "^4.0.2",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",
@@ -153,6 +154,7 @@
     "@types/redux-mock-store": "^1.0.2",
     "@types/segment-analytics": "^0.0.34",
     "@types/supertest": "^2.0.8",
+    "@types/uuid": "^8.3.4",
     "@types/webpack-env": "^1.15.2",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
@@ -242,6 +244,7 @@
     "formik": "^2.2.9",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
+    "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "react": "^17.0.1",
     "react-contenteditable": "^3.3.5",
@@ -262,7 +265,9 @@
     "remark-rehype": "^10.0.1",
     "socket.io-client": "^4.4.0",
     "unified": "^10.1.1",
-    "unist-util-visit": "^4.1.0"
+    "unist-util-visit": "^4.1.0",
+    "url-parse": "^1.5.10",
+    "uuid": "^8.3.2"
   },
   "devEngines": {
     "node": ">=14.x <16",

package.json

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import * as os from 'os';
 
 const homedir = join(__dirname, '..');
 
@@ -15,6 +16,7 @@ const defaultsDir = process.env.BUILD_TYPE === 'ELECTRON' && process['resourcesP
 
 export default {
   dir_path: {
+    tmpDir: os.tmpdir(),
     homedir,
     prevHomedir: homedir,
     staticDir,
@@ -66,7 +68,7 @@ export default {
     migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : true,
   },
   redis_cloud: {
-    url: process.env.REDIS_CLOUD_URL || 'https://api.qa.redislabs.com/v1',
+    url: process.env.REDIS_CLOUD_URL || 'https://api-cloudapi.qa.redislabs.com/v1',
   },
   redis_clients: {
     idleSyncInterval: parseInt(process.env.CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr
@@ -87,10 +89,14 @@ export default {
   redis_cli: {
     unsupportedCommands: JSON.parse(process.env.CLI_UNSUPPORTED_COMMANDS || '[]'),
   },
+  profiler: {
+    logFileIdleThreshold: parseInt(process.env.PROFILER_LOG_FILE_IDLE_THRESHOLD, 10) || 1000 * 60, // 1min
+  },
   analytics: {
     writeKey: process.env.SEGMENT_WRITE_KEY || 'SOURCE_WRITE_KEY',
   },
   logger: {
+    logLevel: process.env.LOG_LEVEL || 'info', // log level
     stdout: process.env.STDOUT_LOGGER ? process.env.STDOUT_LOGGER === 'true' : false, // disabled by default
     files: process.env.FILES_LOGGER ? process.env.FILES_LOGGER === 'true' : true, // enabled by default
     omitSensitiveData: process.env.LOGGER_OMIT_DATA ? process.env.LOGGER_OMIT_DATA === 'true' : true,

redisinsight/api/config/default.ts

@@ -10,6 +10,7 @@ export default {
     migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : false,
   },
   logger: {
+    logLevel: process.env.LOG_LEVEL || 'debug',
     stdout: process.env.STDOUT_LOGGER ? process.env.STDOUT_LOGGER === 'true' : true, // enabled by default
     omitSensitiveData: process.env.LOGGER_OMIT_DATA ? process.env.LOGGER_OMIT_DATA === 'true' : false,
   },

redisinsight/api/config/development.ts

@@ -58,6 +58,7 @@ if (LOGGER_CONFIG.files) {
 const logger: WinstonModuleOptions = {
   format: format.errors({ stack: true }),
   transports: transportsConfig,
+  level: LOGGER_CONFIG.logLevel,
 };
 
 export default logger;

redisinsight/api/config/logger.ts

@@ -3,4 +3,7 @@ export default {
     env: 'test',
     requestTimeout: 1000,
   },
+  profiler: {
+    logFileIdleThreshold: parseInt(process.env.PROFILER_LOG_FILE_IDLE_THRESHOLD, 10) || 1000 * 3, // 3sec
+  },
 };

redisinsight/api/config/test.ts

@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class sni1650278664000 implements MigrationInterface {
+    name = 'sni1650278664000'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "database_instance"`);
+        await queryRunner.query(`DROP TABLE "database_instance"`);
+        await queryRunner.query(`ALTER TABLE "temporary_database_instance" RENAME TO "database_instance"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "database_instance" RENAME TO "temporary_database_instance"`);
+        await queryRunner.query(`CREATE TABLE "database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "temporary_database_instance"`);
+        await queryRunner.query(`DROP TABLE "temporary_database_instance"`);
+    }
+
+}