Feature/merge main in release 2.16.0

.circleci/config.yml

@@ -511,7 +511,13 @@ jobs:
       - run:
           name: install dependencies
           command: |
-            sudo apt-get update -y && sudo apt-get install -y rpm
+            sudo apt-get update -y && sudo apt-get install -y rpm flatpak flatpak-builder ca-certificates
+            flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+            flatpak install flathub --no-deps --arch x86_64 --assumeyes \
+            runtime/org.freedesktop.Sdk/x86_64/20.08 \
+            runtime/org.freedesktop.Platform/x86_64/20.08 \
+            org.electronjs.Electron2.BaseApp/x86_64/20.08
+
             yarn --cwd redisinsight/api/ install
             yarn install
             yarn build:statics
@@ -554,6 +560,8 @@ jobs:
             - release/RedisInsight*.deb
             - release/RedisInsight*.rpm
             - release/RedisInsight*.AppImage
+            - release/RedisInsight*.flatpak
+            - release/RedisInsight*.snap
             - release/*-linux.yml
             - release/redisstack
   macosx:

electron-builder.json

@@ -64,9 +64,17 @@
         "target": "deb",
         "arch": ["x64"]
       },
+      {
+        "target": "flatpak",
+        "arch": ["x64"]
+      },
       {
         "target": "rpm",
         "arch": ["x64"]
+      },
+      {
+        "target": "snap",
+        "arch": ["x64"]
       }
     ],
     "synopsis": "Redis GUI by Redis Ltd.",
@@ -78,6 +86,49 @@
       "Comment": "Redis GUI by Redis Ltd"
     }
   },
+  "snap": {
+    "plugs": [
+      "default",
+      "password-manager-service"
+    ],
+    "confinement": "strict",
+    "stagePackages": ["default"]
+  },
+  "flatpak": {
+    "runtimeVersion": "20.08",
+    "modules": [
+      {
+        "name": "libsecret",
+        "buildsystem": "meson",
+        "config-opts": [
+          "-Dmanpage=false",
+          "-Dvapi=false",
+          "-Dgtk_doc=false",
+          "-Dintrospection=false"
+        ],
+        "cleanup": ["/bin", "/include", "/lib/pkgconfig", "/share/man"],
+        "sources": [
+          {
+            "type": "archive",
+            "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
+            "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d"
+          }
+        ]
+      }
+    ],
+    "finishArgs": [
+      "--share=ipc",
+      "--share=network",
+      "--filesystem=home",
+      "--device=dri",
+      "--talk-name=org.freedesktop.secrets",
+      "--talk-name=org.freedesktop.Notifications",
+      "--talk-name=org.freedesktop.Flatpak",
+      "--socket=fallback-x11",
+      "--socket=wayland",
+      "--socket=x11"
+    ]
+  },
   "directories": {
     "app": "redisinsight",
     "buildResources": "resources",

jest.config.js

@@ -54,10 +54,10 @@ module.exports = {
   ],
   coverageThreshold: {
     global: {
-      statements: 70,
-      branches: 50,
-      functions: 60,
-      lines: 72,
+      statements: 77,
+      branches: 55,
+      functions: 65,
+      lines: 75,
     },
     // './redisinsight/ui/src/slices/**/*.ts': {
     //   statements: 90,

redisinsight/__mocks__/monacoMock.js

@@ -1,5 +1,49 @@
-import * as React from 'react';
+import React, { useEffect } from 'react';
 
 export default function MonacoEditor(props) {
-  return <div {...props} data-testid="monaco"/>;
+  useEffect(() => {
+    props.editorDidMount && props.editorDidMount(
+      // editor
+      {
+        addCommand: jest.fn(),
+        getContribution: jest.fn(),
+        onKeyDown: jest.fn(),
+        onMouseDown: jest.fn(),
+        addAction: jest.fn(),
+        getAction: jest.fn(),
+        deltaDecorations: jest.fn(),
+        createContextKey: jest.fn(),
+        focus: jest.fn(),
+        onDidChangeCursorPosition: jest.fn(),
+        executeEdits: jest.fn()
+      },
+      // monaco
+      {
+        Range: jest.fn().mockImplementation(() => { return {} }),
+        languages: {
+          getLanguages: jest.fn(),
+          register: jest.fn(),
+          registerCompletionItemProvider: jest.fn().mockReturnValue({
+            dispose: jest.fn()
+          }),
+          registerSignatureHelpProvider: jest.fn().mockReturnValue({
+            dispose: jest.fn()
+          }),
+          setLanguageConfiguration: jest.fn(),
+          setMonarchTokensProvider: jest.fn(),
+        },
+        KeyMod: {},
+        KeyCode: {}
+      })
+  }, [])
+  return <input {...props} data-testid="monaco"/>;
+}
+
+export const languages = {
+  CompletionItemKind: {
+    Function: 1
+  },
+  CompletionItemInsertTextRule: {
+    InsertAsSnippet: 4
+  }
 }

redisinsight/api/config/default.ts

@@ -57,6 +57,7 @@ export default {
     appVersion: process.env.APP_VERSION || '2.0.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 10000,
     excludeRoutes: [],
+    excludeAuthRoutes: [],
   },
   sockets: {
     cors: process.env.SOCKETS_CORS ? process.env.SOCKETS_CORS === 'true' : false,

redisinsight/api/config/stack.ts

@@ -5,6 +5,7 @@ export default {
     excludeRoutes: [
       'redis-enterprise/*',
       'redis-sentinel/*',
+      { path: 'databases/import' },
       { path: 'databases', method: RequestMethod.POST },
       { path: 'databases', method: RequestMethod.DELETE },
       { path: 'databases/:id', method: RequestMethod.DELETE },

redisinsight/api/migration/1670252337342-database-new.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class databaseNew1670252337342 implements MigrationInterface {
+    name = 'databaseNew1670252337342'
+
+    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, "verifyServerCert" boolean, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar DEFAULT ('[]'), "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, "new" boolean, 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", "tlsServername") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername" 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, "verifyServerCert" boolean, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar DEFAULT ('[]'), "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 "database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername" FROM "temporary_database_instance"`);
+        await queryRunner.query(`DROP TABLE "temporary_database_instance"`);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -21,6 +21,7 @@ import { databaseAnalysis1664785208236 } from './1664785208236-database-analysis
 import { databaseAnalysisExpirationGroups1664886479051 } from './1664886479051-database-analysis-expiration-groups';
 import { workbenchExecutionTime1667368983699 } from './1667368983699-workbench-execution-time';
 import { database1667477693934 } from './1667477693934-database';
+import { databaseNew1670252337342 } from './1670252337342-database-new';
 
 export default [
   initialMigration1614164490968,
@@ -46,4 +47,5 @@ export default [
   databaseAnalysisExpirationGroups1664886479051,
   workbenchExecutionTime1667368983699,
   database1667477693934,
+  databaseNew1670252337342,
 ];

redisinsight/api/src/__mocks__/common.ts

@@ -1,3 +1,7 @@
+import { ClientContext, ClientMetadata, Session } from 'src/common/models';
+import { mockDatabase } from 'src/__mocks__/databases';
+import { v4 as uuidv4 } from 'uuid';
+
 export type MockType<T> = {
   [P in keyof T]: jest.Mock<any>;
 };
@@ -28,6 +32,7 @@ export const mockQueryBuilderExecute = jest.fn();
 export const mockCreateQueryBuilder = jest.fn(() => ({
   // where: jest.fn().mockReturnThis(),
   where: mockQueryBuilderWhere,
+  orWhere: mockQueryBuilderWhere,
   update: jest.fn().mockReturnThis(),
   select: jest.fn().mockReturnThis(),
   set: jest.fn().mockReturnThis(),
@@ -57,3 +62,33 @@ export const mockRepository = jest.fn(() => ({
   remove: jest.fn(),
   createQueryBuilder: mockCreateQueryBuilder,
 }));
+
+export const mockSession: Session = {
+  userId: uuidv4(),
+  sessionId: uuidv4(),
+};
+
+export const mockCliClientMetadata: ClientMetadata = {
+  session: mockSession,
+  databaseId: mockDatabase.id,
+  context: ClientContext.CLI,
+  uniqueId: uuidv4(),
+};
+
+export const mockWorkbenchClientMetadata: ClientMetadata = {
+  session: mockSession,
+  databaseId: mockDatabase.id,
+  context: ClientContext.Workbench,
+};
+
+export const mockBrowserClientMetadata: ClientMetadata = {
+  session: mockSession,
+  databaseId: mockDatabase.id,
+  context: ClientContext.Browser,
+};
+
+export const mockCommonClientMetadata: ClientMetadata = {
+  session: mockSession,
+  databaseId: mockDatabase.id,
+  context: ClientContext.Common,
+};

redisinsight/api/src/__mocks__/database-import.ts

@@ -0,0 +1,89 @@
+import { DatabaseImportResponse, DatabaseImportStatus } from 'src/modules/database-import/dto/database-import.response';
+import { BadRequestException, ForbiddenException } from '@nestjs/common';
+import { mockDatabase, mockSentinelDatabaseWithTlsAuth } from 'src/__mocks__/databases';
+import { ValidationException } from 'src/common/exceptions';
+import { mockCaCertificate, mockClientCertificate } from 'src/__mocks__/certificates';
+import {
+  InvalidCaCertificateBodyException, InvalidCertificateNameException,
+} from 'src/modules/database-import/exceptions';
+
+export const mockDatabasesToImportArray = new Array(10).fill(mockSentinelDatabaseWithTlsAuth);
+
+export const mockDatabaseImportFile = {
+  originalname: 'filename.json',
+  mimetype: 'application/json',
+  size: 1,
+  buffer: Buffer.from(JSON.stringify(mockDatabasesToImportArray)),
+};
+
+export const mockDatabaseImportResultSuccess = {
+  index: 0,
+  status: DatabaseImportStatus.Success,
+  host: mockDatabase.host,
+  port: mockDatabase.port,
+};
+
+export const mockDatabaseImportResultFail = {
+  index: 0,
+  status: DatabaseImportStatus.Fail,
+  host: mockDatabase.host,
+  port: mockDatabase.port,
+  errors: [new BadRequestException()],
+};
+
+export const mockDatabaseImportResultPartial = {
+  index: 0,
+  status: DatabaseImportStatus.Partial,
+  host: mockDatabase.host,
+  port: mockDatabase.port,
+  errors: [new InvalidCaCertificateBodyException()],
+};
+
+export const mockDatabaseImportResponse = Object.assign(new DatabaseImportResponse(), {
+  total: 10,
+  success: (new Array(5).fill(mockDatabaseImportResultSuccess)).map((v, index) => ({
+    ...v,
+    index: index + 5,
+  })),
+  partial: [
+    [new InvalidCaCertificateBodyException(), new InvalidCertificateNameException()],
+    [new InvalidCertificateNameException()],
+  ].map((errors, index) => ({
+    ...mockDatabaseImportResultPartial,
+    index: index + 3,
+    errors,
+  })),
+  fail: [
+    new ValidationException('Bad request'),
+    new BadRequestException(),
+    new ForbiddenException(),
+  ].map((error, index) => ({
+    ...mockDatabaseImportResultFail,
+    index,
+    errors: [error],
+  })),
+});
+
+export const mockDatabaseImportPartialAnalyticsPayload = {
+  partially: mockDatabaseImportResponse.partial.length,
+  errors: ['InvalidCaCertificateBodyException', 'InvalidCertificateNameException'],
+};
+
+export const mockDatabaseImportFailedAnalyticsPayload = {
+  failed: mockDatabaseImportResponse.fail.length,
+  errors: ['ValidationException', 'BadRequestException', 'ForbiddenException'],
+};
+
+export const mockDatabaseImportSucceededAnalyticsPayload = {
+  succeed: mockDatabaseImportResponse.success.length,
+};
+
+export const mockDatabaseImportAnalytics = jest.fn(() => ({
+  sendImportResults: jest.fn(),
+  sendImportFailed: jest.fn(),
+}));
+
+export const mockCertificateImportService = jest.fn(() => ({
+  processCaCertificate: jest.fn().mockResolvedValue(mockCaCertificate),
+  processClientCertificate: jest.fn().mockResolvedValue(mockClientCertificate),
+}));

redisinsight/api/src/__mocks__/databases.ts

@@ -7,9 +7,8 @@ import { mockIORedisClient } from 'src/__mocks__/redis';
 import { mockSentinelMasterDto } from 'src/__mocks__/redis-sentinel';
 import { pick } from 'lodash';
 import { RedisDatabaseInfoResponse } from 'src/modules/database/dto/redis-info.dto';
-import { ClientMetadata } from 'src/modules/redis/models/client-metadata';
-import { AppTool } from 'src/models';
 import { DatabaseOverview } from 'src/modules/database/models/database-overview';
+import { ClientContext, ClientMetadata } from 'src/common/models';
 
 export const mockDatabaseId = 'a77b23c1-7816-4ea4-b61f-d37795a0f805-db-id';
 
@@ -27,6 +26,7 @@ export const mockDatabase = Object.assign(new Database(), {
   host: '127.0.100.1',
   port: 6379,
   connectionType: ConnectionType.STANDALONE,
+  new: false,
 });
 
 export const mockDatabaseEntity = Object.assign(new DatabaseEntity(), {
@@ -115,9 +115,15 @@ export const mockClusterDatabaseWithTlsAuthEntity = Object.assign(new DatabaseEn
   nodes: JSON.stringify(mockClusterNodes),
 });
 
+export const mockNewDatabase = Object.assign(new Database(), {
+  ...mockDatabase,
+  new: true,
+});
+
 export const mockClientMetadata: ClientMetadata = {
+  session: undefined,
   databaseId: mockDatabase.id,
-  namespace: AppTool.Common,
+  context: ClientContext.Common,
 };
 
 export const mockDatabaseOverview: DatabaseOverview = {

redisinsight/api/src/__mocks__/index.ts

@@ -16,3 +16,4 @@ export * from './redis';
 export * from './server';
 export * from './redis-enterprise';
 export * from './redis-sentinel';
+export * from './database-import';