Merge branch 'main' into latest

Author: Kristiyan Ivanov

.github/CODEOWNERS

@@ -1 +1 @@
-* [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+* [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]

.github/workflows/enforce-branch-name-rules.yml

@@ -17,9 +17,9 @@ jobs:
                 "${{ github.head_ref }}" != release/* && \
                 "${{ github.head_ref }}" != dependabot/* && \
                 "${{ github.head_ref }}" != latest && \
-                "${{ github.head_ref }}" != fe && \
-                "${{ github.head_ref }}" != be && \
-                "${{ github.head_ref }}" != e2e && \
+                "${{ github.head_ref }}" != fe/* && \
+                "${{ github.head_ref }}" != be/* && \
+                "${{ github.head_ref }}" != e2e/* && \
                 "${{ github.head_ref }}" != ric/* ]]; then
             echo "❌ Pull requests to 'main' are only allowed from 'feature/**', 'bugfix/**', 'release/**', 'dependabot/**', 'latest' or 'ric/**' branches."
             exit 1

redisinsight/api/src/constants/custom-error-codes.ts

@@ -11,6 +11,7 @@ export enum CustomErrorCodes {
   RedisConnectionAuthUnsupported = 10_905,
   RedisConnectionSentinelMasterRequired = 10_906,
   RedisConnectionIncorrectCertificate = 10_907,
+  RedisConnectionDefaultUserDisabled = 10_908,
 
   // Cloud API [11001, 11099]
   CloudApiInternalServerError = 11_000,

redisinsight/api/src/constants/error-messages.ts

@@ -44,7 +44,7 @@ export default {
     `Could not connect to ${url}, please check the CA or Client certificate.`,
   INCORRECT_CREDENTIALS: (url) =>
     `Could not connect to ${url}, please check the Username or Password.`,
-
+  DATABASE_DEFAULT_USER_DISABLED: 'Database does not have default user enabled.',
   DATABASE_MANAGEMENT_IS_DISABLED:
     'Database connection management is disabled.',
   CA_CERT_EXIST: 'This ca certificate name is already in use.',

redisinsight/api/src/modules/database/constants/events.ts

@@ -0,0 +1,3 @@
+export enum DatabaseConnectionEvent {
+  DatabaseConnectionFailed = 'DatabaseConnectionFailed',
+}

redisinsight/api/src/modules/database/providers/database.client.factory.spec.ts

@@ -10,6 +10,7 @@ import {
   mockStandaloneRedisClient,
   mockSessionMetadata,
   MockRedisClient,
+  mockEventEmitter,
 } from 'src/__mocks__';
 import { DatabaseAnalytics } from 'src/modules/database/database.analytics';
 import { DatabaseService } from 'src/modules/database/database.service';
@@ -30,8 +31,10 @@ import { RedisClient } from 'src/modules/redis/client';
 import { ConnectionType } from 'src/modules/database/entities/database.entity';
 import {
   RedisConnectionTimeoutException,
-  RedisConnectionUnauthorizedException,
 } from 'src/modules/redis/exceptions/connection';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { DatabaseConnectionEvent } from 'src/modules/database/constants/events';
+import { InternalServerErrorException } from '@nestjs/common';
 
 describe('DatabaseClientFactory', () => {
   let service: DatabaseClientFactory;
@@ -40,6 +43,7 @@ describe('DatabaseClientFactory', () => {
   let redisClientStorage: RedisClientStorage;
   let redisClientFactory: LocalRedisClientFactory;
   let analytics: MockType<DatabaseAnalytics>;
+  let eventEmitter: MockType<EventEmitter2>;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -72,6 +76,10 @@ describe('DatabaseClientFactory', () => {
           provide: NodeRedisConnectionStrategy,
           useFactory: mockNodeRedisConnectionStrategy,
         },
+        {
+          provide: EventEmitter2,
+          useValue: mockEventEmitter,
+        },
       ],
     }).compile();
 
@@ -81,6 +89,7 @@ describe('DatabaseClientFactory', () => {
     redisClientStorage = await module.get(RedisClientStorage);
     redisClientFactory = await module.get(RedisClientFactory);
     analytics = await module.get(DatabaseAnalytics);
+    eventEmitter = await module.get(EventEmitter2);
   });
 
   describe('getOrCreateClient', () => {
@@ -247,7 +256,8 @@ describe('DatabaseClientFactory', () => {
         },
       );
     });
-    it('should throw original error', async () => {
+
+    it('should throw original error and emit connection failed event for RedisConnection* errors', async () => {
       jest
         .spyOn(redisClientFactory, 'createClient')
         .mockRejectedValue(new RedisConnectionTimeoutException());
@@ -259,6 +269,27 @@ describe('DatabaseClientFactory', () => {
         mockDatabase,
         new RedisConnectionTimeoutException(),
       );
+
+      expect(eventEmitter.emit).toHaveBeenCalledWith(
+        DatabaseConnectionEvent.DatabaseConnectionFailed,
+        mockCommonClientMetadata,
+      );
+    });
+
+    it('should throw original error and not emit connection failed when not RedisConnection* errors', async () => {
+      jest
+        .spyOn(redisClientFactory, 'createClient')
+        .mockRejectedValue(new InternalServerErrorException());
+      await expect(
+        service.createClient(mockCommonClientMetadata),
+      ).rejects.toThrow(InternalServerErrorException);
+      expect(analytics.sendConnectionFailedEvent).toHaveBeenCalledWith(
+        mockSessionMetadata,
+        mockDatabase,
+        new InternalServerErrorException(),
+      );
+
+      expect(eventEmitter.emit).not.toHaveBeenCalled();
     });
   });
 });

redisinsight/api/src/modules/database/providers/database.client.factory.ts

@@ -1,5 +1,4 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { getRedisConnectionException } from 'src/utils';
 import { DatabaseRepository } from 'src/modules/database/repositories/database.repository';
 import { DatabaseAnalytics } from 'src/modules/database/database.analytics';
 import { DatabaseService } from 'src/modules/database/database.service';
@@ -11,6 +10,9 @@ import {
   RedisClientFactory,
 } from 'src/modules/redis/redis.client.factory';
 import { RedisClientStorage } from 'src/modules/redis/redis.client.storage';
+import { RedisConnectionFailedException } from 'src/modules/redis/exceptions/connection';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { DatabaseConnectionEvent } from 'src/modules/database/constants/events';
 
 type IsClientConnectingMap = {
   [key: string]: boolean;
@@ -37,6 +39,7 @@ export class DatabaseClientFactory {
     private readonly analytics: DatabaseAnalytics,
     private readonly redisClientStorage: RedisClientStorage,
     private readonly redisClientFactory: RedisClientFactory,
+    private readonly eventEmitter: EventEmitter2,
   ) {}
 
   private async processGetClient(
@@ -156,6 +159,13 @@ export class DatabaseClientFactory {
     } catch (error) {
       this.logger.error('Failed to create database client', error);
 
+      if (error instanceof RedisConnectionFailedException) {
+        this.eventEmitter.emit(
+          DatabaseConnectionEvent.DatabaseConnectionFailed,
+          clientMetadata,
+        );
+      }
+
       this.analytics.sendConnectionFailedEvent(
         clientMetadata.sessionMetadata,
         database,

redisinsight/api/src/modules/redis/exceptions/connection/index.ts

@@ -1,5 +1,6 @@
 export * from './redis-connection-auth-unsupported.exception';
 export * from './redis-connection-cluster-nodes-unavailable.exception';
+export * from './redis-connection-default-user-disabled.exception';
 export * from './redis-connection-failed.exception';
 export * from './redis-connection-incorrect-certificate.exception';
 export * from './redis-connection-sentinel-master-required.exception';

redisinsight/api/src/modules/redis/exceptions/connection/redis-connection-default-user-disabled.exception.ts

@@ -0,0 +1,21 @@
+import { HttpExceptionOptions } from '@nestjs/common';
+import { CustomErrorCodes } from 'src/constants';
+import ERROR_MESSAGES from 'src/constants/error-messages';
+import {
+  RedisConnectionFailedException,
+  RedisConnectionFailedStatusCode,
+} from 'src/modules/redis/exceptions/connection/redis-connection-failed.exception';
+
+export class RedisConnectionDefaultUserDisabledException extends RedisConnectionFailedException {
+  constructor(
+    message: string = ERROR_MESSAGES.DATABASE_DEFAULT_USER_DISABLED,
+    options?: HttpExceptionOptions,
+  ) {
+    super({
+      message,
+      error: 'RedisConnectionDefaultUserDisabledException',
+      statusCode: RedisConnectionFailedStatusCode,
+      errorCode: CustomErrorCodes.RedisConnectionDefaultUserDisabled,
+    }, options);
+  }
+}

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/assistance-chat/AssistanceChat.tsx

@@ -76,7 +76,7 @@ const AssistanceChat = () => {
                   ...generateHumanMessage(message),
                   error: {
                     statusCode: 500,
-                    errorCode: CustomErrorCodes.GeneralAiUnexpectedError,
+                    errorCode: CustomErrorCodes.QueryAiInternalServerError,
                   },
                 }),
               )