Feature/ri 3238/prepare for docker

.circleci/config.yml

@@ -91,6 +91,7 @@ aliases:
     - oss-clu             # OSS Cluster
     - oss-clu-tls         # OSS Cluster with TLS enabled
     - oss-sent            # OSS Sentinel
+    - oss-sent-tls-auth   # OSS Sentinel with TLS auth
     - re-st               # Redis Enterprise with Standalone inside
     - re-clu              # Redis Enterprise with Cluster inside
     - re-crdt             # Redis Enterprise with active-active database inside
@@ -99,6 +100,7 @@ aliases:
     - oss-st-6-tls-auth   # OSS Standalone v6 with TLS auth required
     - oss-clu-tls         # OSS Cluster with TLS enabled
     - re-crdt             # Redis Enterprise with active-active database inside
+    - oss-sent-tls-auth   # OSS Sentinel with TLS auth
   guides-filter: &guidesFilter
     filters:
       branches:

redisinsight/api/config/default.ts

@@ -155,7 +155,7 @@ export default {
         || 'https://raw.githubusercontent.com/RediSearch/RediSearch/master/commands.json',
     },
     {
-      name: 'redijson',
+      name: 'redisjson',
       url: process.env.COMMANDS_REDIJSON_URL
         || 'https://raw.githubusercontent.com/RedisJSON/RedisJSON/master/commands.json',
     },

redisinsight/api/config/ormconfig.ts

@@ -1,15 +1,15 @@
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
-import { AgreementsEntity } from 'src/modules/core/models/agreements.entity';
-import { CaCertificateEntity } from 'src/modules/core/models/ca-certificate.entity';
-import { ClientCertificateEntity } from 'src/modules/core/models/client-certificate.entity';
-import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity';
-import { ServerEntity } from 'src/modules/core/models/server.entity';
-import { SettingsEntity } from 'src/modules/core/models/settings.entity';
+import { ServerEntity } from 'src/modules/server/entities/server.entity';
 import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity';
 import { PluginStateEntity } from 'src/modules/workbench/entities/plugin-state.entity';
 import { NotificationEntity } from 'src/modules/notification/entities/notification.entity';
 import { DatabaseAnalysisEntity } from 'src/modules/database-analysis/entities/database-analysis.entity';
 import { DataSource } from 'typeorm';
+import { AgreementsEntity } from 'src/modules/settings/entities/agreements.entity';
+import { SettingsEntity } from 'src/modules/settings/entities/settings.entity';
+import { CaCertificateEntity } from 'src/modules/certificate/entities/ca-certificate.entity';
+import { ClientCertificateEntity } from 'src/modules/certificate/entities/client-certificate.entity';
+import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
 
@@ -24,7 +24,7 @@ const ormConfig = {
     AgreementsEntity,
     CaCertificateEntity,
     ClientCertificateEntity,
-    DatabaseInstanceEntity,
+    DatabaseEntity,
     ServerEntity,
     SettingsEntity,
     CommandExecutionEntity,

redisinsight/api/config/stack.ts

@@ -4,12 +4,10 @@ export default {
   server: {
     excludeRoutes: [
       'redis-enterprise/*',
-      'instance/redis-enterprise-dbs',
-      'instance/redis-cloud-dbs',
-      'instance/sentinel-masters',
-      { path: 'instance', method: RequestMethod.POST },
-      { path: 'instance', method: RequestMethod.DELETE },
-      { path: 'instance/:id', method: RequestMethod.DELETE },
+      'redis-sentinel/*',
+      { path: 'databases', method: RequestMethod.POST },
+      { path: 'databases', method: RequestMethod.DELETE },
+      { path: 'databases/:id', method: RequestMethod.DELETE },
     ],
   },
 };

redisinsight/api/migration/1667477693934-database.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class database1667477693934 implements MigrationInterface {
+    name = 'database1667477693934'
+
+    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, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_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 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_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_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

@@ -20,6 +20,7 @@ import { workbenchGroupMode1663093411715 } from './1663093411715-workbench-group
 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';
 
 export default [
   initialMigration1614164490968,
@@ -44,4 +45,5 @@ export default [
   databaseAnalysis1664785208236,
   databaseAnalysisExpirationGroups1664886479051,
   workbenchExecutionTime1667368983699,
+  database1667477693934,
 ];

redisinsight/api/src/__mocks__/app-settings.ts

@@ -1,43 +1,76 @@
-import { IAgreement } from 'src/models';
-import {
-  AgreementsEntity,
-  IAgreementsJSON,
-} from 'src/modules/core/models/agreements.entity';
-import {
-  ISettingsJSON,
-  SettingsEntity,
-} from 'src/modules/core/models/settings.entity';
-
-export const mockAppAgreement: IAgreement = {
-  defaultValue: false,
-  required: true,
-  since: '1.0.0',
-  disabled: false,
-  displayInSetting: false,
-  editable: false,
-  title: 'License Terms',
-  label: 'I have read and understood the License Terms',
-};
-
-export const mockAgreementsJSON = {
-  version: null,
-};
-
-export const mockAgreementsEntity: AgreementsEntity = {
-  id: 1,
-  version: null,
-  data: null,
-  toJSON: (): IAgreementsJSON => mockAgreementsJSON,
-};
-
-export const mockSettingsJSON: ISettingsJSON = {
-  theme: null,
-  scanThreshold: null,
-  batchSize: null,
-};
-
-export const mockSettingsEntity: SettingsEntity = {
-  id: 1,
-  data: null,
-  toJSON: (): ISettingsJSON => mockSettingsJSON,
-};
+import { Settings } from 'src/modules/settings/models/settings';
+import { Agreements } from 'src/modules/settings/models/agreements';
+import { mockUserId } from 'src/__mocks__/user';
+import { GetAppSettingsResponse } from 'src/modules/settings/dto/settings.dto';
+import { AgreementsEntity } from 'src/modules/settings/entities/agreements.entity';
+import { SettingsEntity } from 'src/modules/settings/entities/settings.entity';
+
+export const mockSettings = Object.assign(new Settings(), {
+  id: mockUserId,
+  data: {
+    theme: 'DARK',
+    scanThreshold: 500,
+    batchSize: 10,
+  },
+});
+
+export const mockSettingsEntity = Object.assign(new SettingsEntity(), {
+  id: mockSettings.id,
+  data: JSON.stringify(mockSettings.data),
+});
+
+export const mockAgreements = Object.assign(new Agreements(), {
+  id: mockUserId,
+  version: '1.0.0',
+  data: {
+    eula: true,
+    analytics: true,
+    encryption: true,
+    notifications: true,
+  },
+});
+
+export const mockAgreementsEntity = Object.assign(new AgreementsEntity(), {
+  id: mockAgreements.id,
+  version: mockAgreements.version,
+  data: JSON.stringify(mockAgreements.data),
+});
+
+export const mockAppSettings = Object.assign(new GetAppSettingsResponse(), {
+  ...mockSettings.data,
+  agreements: {
+    version: mockAgreements.version,
+    ...mockAgreements.data,
+  },
+});
+
+export const mockAppSettingsWithoutPermissions = Object.assign(new GetAppSettingsResponse(), {
+  ...mockSettings.data,
+  agreements: {
+    version: mockAgreements.version,
+    eula: false,
+    analytics: false,
+    encryption: false,
+    notifications: false,
+  },
+});
+
+export const mockAppSettingsInitial = Object.assign(new GetAppSettingsResponse(), {
+  agreements: null,
+});
+
+export const mockAgreementsRepository = jest.fn(() => ({
+  getOrCreate: jest.fn(),
+  update: jest.fn(),
+}));
+
+export const mockSettingsRepository = jest.fn(() => ({
+  getOrCreate: jest.fn(),
+  update: jest.fn(),
+}));
+
+export const mockSettingsService = jest.fn(() => ({
+  getAppSettings: jest.fn(),
+  updateAppSettings: jest.fn(),
+  getAgreementsSpec: jest.fn(),
+}));

redisinsight/api/src/utils/auto-discovery-helper.spec.ts → redisinsight/api/src/__mocks__/autodiscovery.ts

@@ -1,8 +1,4 @@
-import {
-  getTCPEndpoints,
-} from 'src/utils/auto-discovery-helper';
-
-const winNetstat = ''
+export const mockWinNetstat = ''
   + 'Proto  Local Address          Foreign Address        State           PID\n'
   + 'TCP    0.0.0.0:5000           0.0.0.0:0              LISTENING       13728\n'
   + 'TCP    0.0.0.0:6379           0.0.0.0:0              LISTENING       13728\n'
@@ -15,7 +11,7 @@ const winNetstat = ''
   + 'TCP    [::]:5000              [::]:0                 LISTENING       6056\n'
   + 'TCP                           *:*                    LISTENING       6056';
 
-const linuxNetstat = ''
+export const mockLinuxNetstat = ''
   + 'Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name    \n'
   + 'tcp        0      0 0.0.0.0:5000            0.0.0.0:*               LISTEN      -                   \n'
   + 'tcp        0      0 0.0.0.0:6379            0.0.0.0:*               LISTEN      -                   \n'
@@ -30,7 +26,7 @@ const linuxNetstat = ''
   + 'tcp6       0      0 ::1:6379                :::*                    LISTEN      -                   \n';
 
 /* eslint-disable max-len */
-const macNetstat = ''
+export const mockMacNetstat = ''
   + 'Proto Recv-Q Send-Q  Local Address          Foreign Address        (state)     rhiwat shiwat    pid   epid  state    options\n'
   + 'tcp4       0      0  10.55.1.235.5000       10.55.1.235.52217      FIN_WAIT_2  407280 146988  30555      0 0x2131 0x00000104\n'
   + 'tcp4       0      0  10.55.1.235.6379       10.55.1.235.5001       CLOSE_WAIT  407682 146988    872      0 0x0122 0x00000008\n'
@@ -40,54 +36,7 @@ const macNetstat = ''
   + 'tcp6       0      0  ::1.52167              ::1.5002               ESTABLISHED 406172 146808  31200      0 0x0102 0x00000008\n';
 /* eslint-enable max-len */
 
-const getTCPEndpointsTests = [
-  {
-    name: 'win output',
-    input: winNetstat.split('\n'),
-    output: [
-      { host: 'localhost', port: 5000 },
-      { host: 'localhost', port: 6379 },
-      { host: 'localhost', port: 6380 },
-      { host: 'localhost', port: 135 },
-      { host: 'localhost', port: 445 },
-      { host: 'localhost', port: 808 },
-      { host: 'localhost', port: 2701 },
-    ],
-  },
-  {
-    name: 'linux output',
-    input: linuxNetstat.split('\n'),
-    output: [
-      { host: 'localhost', port: 5000 },
-      { host: 'localhost', port: 6379 },
-      { host: 'localhost', port: 6380 },
-      { host: 'localhost', port: 28100 },
-      { host: 'localhost', port: 8100 },
-      { host: 'localhost', port: 8101 },
-      { host: 'localhost', port: 8102 },
-      { host: 'localhost', port: 8103 },
-      { host: 'localhost', port: 8200 },
-    ],
-  },
-  {
-    name: 'mac output',
-    input: macNetstat.split('\n'),
-    output: [
-      { host: 'localhost', port: 5000 },
-      { host: 'localhost', port: 6379 },
-      { host: 'localhost', port: 6380 },
-      { host: 'localhost', port: 5002 },
-      { host: 'localhost', port: 52167 },
-    ],
-  },
-];
-
-describe('getTCP4Endpoints', () => {
-  getTCPEndpointsTests.forEach((test) => {
-    it(`Should return endpoints to test ${test.name}`, async () => {
-      const result = getTCPEndpoints(test.input);
-
-      expect(result).toEqual(test.output);
-    });
-  });
-});
+export const mockAutodiscoveryEndpoint = {
+  host: '127.0.0.1',
+  port: 6379,
+};