Merge branch 'main' into feature/RI-4723-open_RI_from_SM

Author: mariasergeenko

redisinsight/api/src/__mocks__/cloud-capi-key.ts

@@ -1,5 +1,7 @@
 import { CloudCapiAuthDto } from 'src/modules/cloud/common/dto';
 import { CloudCapiKey, ICloudApiCapiAccessKey, ICloudApiCapiKey } from 'src/modules/cloud/capi-key/model';
+import { CloudCapiKeyEntity } from 'src/modules/cloud/capi-key/entity/cloud-capi-key.entity';
+import { EncryptionStrategy } from 'src/modules/encryption/models';
 import { mockServer } from 'src/__mocks__/server';
 
 export const mockCloudCapiAuthDto: CloudCapiAuthDto = {
@@ -31,6 +33,16 @@ export const mockCloudCapiKey = Object.assign(new CloudCapiKey(), {
   lastUsed: new Date(),
 });
 
+export const mockCapiKeyEncrypted = 'cloudCapiKey.capiKey_ENCRYPTED';
+export const mockCapiSecretEncrypted = 'cloudCapiKey.capiSecret_ENCRYPTED';
+
+export const mockCloudCapiKeyEntity = Object.assign(new CloudCapiKeyEntity(), {
+  ...mockCloudCapiKey,
+  capiKey: mockCapiKeyEncrypted,
+  capiSecret: mockCapiSecretEncrypted,
+  encryption: EncryptionStrategy.KEYTAR,
+});
+
 export const mockCloudCapiKeyApiProvider = jest.fn(() => ({
   enableCapi: jest.fn().mockResolvedValue(mockCloudApiCapiAccessKey.accessKey),
   createCapiKey: jest.fn().mockResolvedValue(mockCloudApiCapiKey),

redisinsight/api/src/__mocks__/cloud-common.ts

@@ -4,3 +4,9 @@ export const mockCapiUnauthorizedError = {
     status: 401,
   },
 };
+
+export const mockUtm = {
+  source: 'redisinsight',
+  medium: 'app',
+  campaign: 'workbench',
+};

redisinsight/api/src/__mocks__/cloud-job.ts

@@ -0,0 +1,40 @@
+import { CloudJobStatus, CloudJobStep } from 'src/modules/cloud/job/models/cloud-job-info';
+import { CloudJobName } from 'src/modules/cloud/job/constants';
+import { CloudJobRunMode } from 'src/modules/cloud/job/models';
+import { CloudJob } from 'src/modules/cloud/job/jobs';
+import { mockSessionMetadata } from 'src/__mocks__/common';
+
+export const mockCreateDatabaseCloudJobDataDto = {
+  name: CloudJobName.CreateFreeDatabase,
+  runMode: CloudJobRunMode.Async,
+  data: { planId: 123 },
+};
+
+export const mockCloudJobInfo = {
+  id: 'job-id',
+  name: CloudJobName.CreateFreeDatabase,
+  status: CloudJobStatus.Running,
+  step: CloudJobStep.Database,
+};
+
+export abstract class MockCloudJob extends CloudJob {
+  constructor() {
+    super({
+      abortController: new AbortController(),
+      sessionMetadata: mockSessionMetadata,
+    });
+  }
+}
+
+MockCloudJob['getWriteStream'] = jest.fn();
+MockCloudJob['addProfilerClient'] = jest.fn();
+MockCloudJob['removeProfilerClient'] = jest.fn();
+MockCloudJob['setAlias'] = jest.fn();
+MockCloudJob['destroy'] = jest.fn();
+MockCloudJob['getState'] = jest.fn().mockReturnValue(mockCloudJobInfo);
+
+export const mockCloudJobProvider = jest.fn(() => ({
+  addJob: jest.fn().mockResolvedValue(mockCloudJobInfo),
+  get: jest.fn().mockResolvedValue(MockCloudJob),
+  findUserJobs: jest.fn().mockResolvedValue([MockCloudJob]),
+}));

redisinsight/api/src/__mocks__/cloud-task.ts

@@ -6,3 +6,7 @@ export const mockCloudTaskInit: ICloudCapiTask = {
   status: 'initialized',
   timestamp: '2023-07-01T00:00:00.000Z',
 };
+
+export const mockCloudTaskCapiProvider = jest.fn(() => ({
+  getTask: jest.fn().mockResolvedValue(mockCloudTaskInit),
+}));

redisinsight/api/src/__mocks__/cloud-user.ts

@@ -10,7 +10,7 @@ import {
 import { ICloudApiCredentials } from 'src/modules/cloud/common/models';
 import config from 'src/utils/config';
 import { classToPlain } from 'class-transformer';
-import { mockCloudApiCapiAccessKey, mockCloudCapiAuthDto } from 'src/__mocks__/cloud-capi-key';
+import { mockCloudApiCapiAccessKey, mockCloudCapiAuthDto, mockCloudCapiKey } from 'src/__mocks__/cloud-capi-key';
 
 const serverConfig = config.get('server');
 
@@ -103,7 +103,7 @@ export const mockCloudUser = Object.assign(new CloudUser(), {
   name: mockCloudApiUser.name,
   currentAccountId: +mockCloudApiUser.current_account_id,
   accounts: [mockCloudUserAccount],
-  capiKey: mockCloudCapiAuthDto.capiKey,
+  capiKey: mockCloudCapiKey,
 });
 
 export const mockCloudUserSafe = classToPlain(mockCloudUser); // omits all data in the "security" group
@@ -125,4 +125,7 @@ export const mockCloudUserRepository = jest.fn(() => ({
 
 export const mockCloudUserApiService = jest.fn(() => ({
   getCapiKeys: jest.fn().mockResolvedValue(mockCloudCapiAuthDto),
+  me: jest.fn().mockResolvedValue(mockCloudUser),
+  setCurrentAccount: jest.fn(),
+  updateUser: jest.fn(),
 }));

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

@@ -0,0 +1,60 @@
+export const mockRedisClientList = 'id=29 addr=172.17.0.1:60702 laddr=172.17.0.4:6379 fd=20 '
+  + 'name=redisinsight-common-f9d59780 age=319 idle=0 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=26 '
+  + 'qbuf-free=40928 argv-mem=10 obl=0 oll=0 omem=0 tot-mem=61466 events=r cmd=client user=default resp=2 redir=-1\n'
+  + 'id=31 addr=172.17.0.1:63984 laddr=172.17.0.4:6379 fd=22 name=redisinsight-cli-bc36ecf0 age=15 '
+  + 'idle=15 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=0 argv-mem=0 obl=0 oll=0 omem=0 '
+  + 'tot-mem=20512 events=r cmd=client user=default redir=-1\n';
+
+export const mockRedisClientListResult = [
+  {
+    addr: '172.17.0.1:60702',
+    age: '319',
+    'argv-mem': '10',
+    cmd: 'client',
+    db: '0',
+    events: 'r',
+    fd: '20',
+    flags: 'N',
+    id: '29',
+    idle: '0',
+    laddr: '172.17.0.4:6379',
+    multi: '-1',
+    name: 'redisinsight-common-f9d59780',
+    obl: '0',
+    oll: '0',
+    omem: '0',
+    psub: '0',
+    qbuf: '26',
+    'qbuf-free': '40928',
+    redir: '-1',
+    sub: '0',
+    'tot-mem': '61466',
+    user: 'default',
+    resp: '2',
+  },
+  {
+    addr: '172.17.0.1:63984',
+    age: '15',
+    'argv-mem': '0',
+    cmd: 'client',
+    db: '0',
+    events: 'r',
+    fd: '22',
+    flags: 'N',
+    id: '31',
+    idle: '15',
+    laddr: '172.17.0.4:6379',
+    multi: '-1',
+    name: 'redisinsight-cli-bc36ecf0',
+    obl: '0',
+    oll: '0',
+    omem: '0',
+    psub: '0',
+    qbuf: '0',
+    'qbuf-free': '0',
+    redir: '-1',
+    sub: '0',
+    'tot-mem': '20512',
+    user: 'default',
+  },
+];

redisinsight/api/src/__mocks__/databases.ts

@@ -17,6 +17,7 @@ import {
 } from 'src/__mocks__/ssh';
 import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/database/entities/cloud-database-details.entity';
 import { mockCloudDatabaseDetails, mockCloudDatabaseDetailsEntity } from 'src/__mocks__/cloud-database';
+import { mockRedisClientListResult } from 'src/__mocks__/database-info';
 
 export const mockDatabaseId = 'a77b23c1-7816-4ea4-b61f-d37795a0f805-db-id';
 
@@ -188,7 +189,7 @@ export const mockDatabaseOverview: DatabaseOverview = {
 };
 
 export const mockRedisServerInfoDto = {
-  redis_version: '6.0.5',
+  redis_version: '7.0.5',
   redis_mode: 'standalone',
   os: 'Linux 4.15.0-1087-gcp x86_64',
   arch_bits: '64',
@@ -239,6 +240,7 @@ export const mockDatabaseInfoProvider = jest.fn(() => ({
   determineSentinelMasterGroups: jest.fn().mockReturnValue([mockSentinelMasterDto]),
   determineClusterNodes: jest.fn().mockResolvedValue(mockClusterNodes),
   getRedisGeneralInfo: jest.fn().mockResolvedValueOnce(mockRedisGeneralInfo),
+  getClientListInfo: jest.fn().mockReturnValue(mockRedisClientListResult),
 }));
 
 export const mockDatabaseOverviewProvider = jest.fn(() => ({
@@ -259,4 +261,5 @@ export const mockDatabaseAnalytics = jest.fn(() => ({
   sendInstanceAddFailedEvent: jest.fn(),
   sendInstanceEditedEvent: jest.fn(),
   sendInstanceDeletedEvent: jest.fn(),
+  sendDatabaseConnectedClientListEvent: jest.fn(),
 }));

redisinsight/api/src/__mocks__/index.ts

@@ -32,3 +32,5 @@ export * from './cloud-user';
 export * from './cloud-common';
 export * from './session';
 export * from './cloud-session';
+export * from './database-info';
+export * from './cloud-job';

redisinsight/api/src/constants/telemetry-events.ts

@@ -5,6 +5,7 @@ export enum TelemetryEvents {
   AnalyticsPermission = 'ANALYTICS_PERMISSION',
   SettingsScanThresholdChanged = 'SETTINGS_KEYS_TO_SCAN_CHANGED',
   SettingsWorkbenchPipelineChanged = 'SETTINGS_WORKBENCH_PIPELINE_CHANGED',
+  DatabaseConnectedClientList = 'DATABASE_CONNECTED_CLIENT_LIST',
 
   // Events for redis instances
   RedisInstanceAdded = 'CONFIG_DATABASES_DATABASE_ADDED',

redisinsight/api/src/modules/cloud/capi-key/cloud-capi-key.analytics.spec.ts

@@ -0,0 +1,53 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { InternalServerErrorException } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { TelemetryEvents } from 'src/constants';
+import { CloudCapiKeyAnalytics } from 'src/modules/cloud/capi-key/cloud-capi-key.analytics';
+
+describe('CloudCapiKeyAnalytics', () => {
+  let service: CloudCapiKeyAnalytics;
+  let sendEventSpy;
+  let sendFailedEventMethod;
+  const httpException = new InternalServerErrorException();
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        EventEmitter2,
+        CloudCapiKeyAnalytics,
+      ],
+    }).compile();
+
+    service = await module.get(CloudCapiKeyAnalytics);
+    sendEventSpy = jest.spyOn<CloudCapiKeyAnalytics, any>(service, 'sendEvent');
+    sendFailedEventMethod = jest.spyOn<CloudCapiKeyAnalytics, any>(
+      service,
+      'sendFailedEvent',
+    );
+  });
+
+  describe('sendCloudAccountKeyGenerated', () => {
+    it('should emit succeed event with manifest "yes"', () => {
+      service.sendCloudAccountKeyGenerated();
+
+      expect(sendEventSpy).toHaveBeenNthCalledWith(
+        1,
+        TelemetryEvents.CloudAccountKeyGenerated,
+      );
+    });
+  });
+
+  describe('sendCloudAccountKeyGenerationFailed', () => {
+    it('should emit 1 event with "Error" cause', () => {
+      service.sendCloudAccountKeyGenerationFailed(httpException);
+
+      expect(sendFailedEventMethod).toHaveBeenNthCalledWith(
+        1,
+        TelemetryEvents.CloudAccountKeyGenerationFailed,
+        httpException,
+      );
+    });
+  });
+});