diff --git a/redisinsight/api/migration/1755086732238-update-provider-names.ts b/redisinsight/api/migration/1755086732238-update-provider-names.ts new file mode 100644 index 0000000000..981f53b383 --- /dev/null +++ b/redisinsight/api/migration/1755086732238-update-provider-names.ts @@ -0,0 +1,29 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateProviderNames1755086732238 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE database_instance + SET provider = CASE provider + WHEN 'RE_CLOUD' THEN 'REDIS_CLOUD' + WHEN 'RE_CLUSTER' THEN 'REDIS_SOFTWARE' + WHEN 'REDIS_ENTERPRISE' THEN 'OTHER_REDIS_MANAGED' + ELSE provider + END + WHERE provider IN ('RE_CLOUD', 'RE_CLUSTER', 'REDIS_ENTERPRISE'); + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE database_instance + SET provider = CASE provider + WHEN 'REDIS_CLOUD' THEN 'RE_CLOUD' + WHEN 'REDIS_SOFTWARE' THEN 'RE_CLUSTER' + WHEN 'OTHER_REDIS_MANAGED' THEN 'REDIS_ENTERPRISE' + ELSE provider + END + WHERE provider IN ('REDIS_CLOUD', 'REDIS_SOFTWARE', 'OTHER_REDIS_MANAGED'); + `); + } +} diff --git a/redisinsight/api/migration/index.ts b/redisinsight/api/migration/index.ts index 583b9e0f0e..acbd017e7f 100644 --- a/redisinsight/api/migration/index.ts +++ b/redisinsight/api/migration/index.ts @@ -53,6 +53,7 @@ import { PreSetupDatabases1741786803681 } from './1741786803681-pre-setup-databa import { KeyNameFormatAdded1742303245547 } from './1742303245547-key-name-format'; import { CascadeTags1743432519891 } from './1743432519891-cascade-tags'; import { EncryptTags1743606395647 } from './1743606395647-encrypt-tags'; +import { UpdateProviderNames1755086732238 } from './1755086732238-update-provider-names'; export default [ initialMigration1614164490968, @@ -110,4 +111,5 @@ export default [ KeyNameFormatAdded1742303245547, CascadeTags1743432519891, EncryptTags1743606395647, + UpdateProviderNames1755086732238, ]; diff --git a/redisinsight/api/src/__mocks__/cloud-autodiscovery.ts b/redisinsight/api/src/__mocks__/cloud-autodiscovery.ts index b12f357e6a..f8554a04c4 100644 --- a/redisinsight/api/src/__mocks__/cloud-autodiscovery.ts +++ b/redisinsight/api/src/__mocks__/cloud-autodiscovery.ts @@ -68,8 +68,8 @@ export const mockCloudAutodiscoveryService = jest.fn(() => ({ })); export const mockCloudAutodiscoveryAnalytics = jest.fn(() => ({ - sendGetRECloudSubsSucceedEvent: jest.fn(), - sendGetRECloudSubsFailedEvent: jest.fn(), - sendGetRECloudDbsSucceedEvent: jest.fn(), - sendGetRECloudDbsFailedEvent: jest.fn(), + sendGetRedisCloudSubsSucceedEvent: jest.fn(), + sendGetRedisCloudSubsFailedEvent: jest.fn(), + sendGetRedisCloudDbsSucceedEvent: jest.fn(), + sendGetRedisCloudDbsFailedEvent: jest.fn(), })); diff --git a/redisinsight/api/src/__mocks__/redis-enterprise.ts b/redisinsight/api/src/__mocks__/redis-enterprise.ts index 899167b5e7..330b705fed 100644 --- a/redisinsight/api/src/__mocks__/redis-enterprise.ts +++ b/redisinsight/api/src/__mocks__/redis-enterprise.ts @@ -28,8 +28,8 @@ export const mockAddRedisEnterpriseDatabasesDto = Object.assign( ); export const mockRedisEnterpriseAnalytics = jest.fn(() => ({ - sendGetREClusterDbsSucceedEvent: jest.fn(), - sendGetREClusterDbsFailedEvent: jest.fn(), + sendGetRedisSoftwareDbsSucceedEvent: jest.fn(), + sendGetRedisSoftwareDbsFailedEvent: jest.fn(), })); export const mockRedisEnterpriseService = jest.fn(() => ({ diff --git a/redisinsight/api/src/constants/redis-modules.ts b/redisinsight/api/src/constants/redis-modules.ts index f837206f59..adeffddac1 100644 --- a/redisinsight/api/src/constants/redis-modules.ts +++ b/redisinsight/api/src/constants/redis-modules.ts @@ -24,7 +24,7 @@ export const SUPPORTED_REDIS_MODULES = Object.freeze({ timeseries: AdditionalRedisModuleName.RedisTimeSeries, }); -export const RE_CLOUD_MODULES_NAMES = Object.freeze({ +export const REDIS_CLOUD_MODULES_NAMES = Object.freeze({ RedisAI: AdditionalRedisModuleName.RedisAI, RedisGraph: AdditionalRedisModuleName.RedisGraph, RedisGears: AdditionalRedisModuleName.RedisGears, @@ -34,7 +34,7 @@ export const RE_CLOUD_MODULES_NAMES = Object.freeze({ RedisTimeSeries: AdditionalRedisModuleName.RedisTimeSeries, }); -export const RE_CLUSTER_MODULES_NAMES = Object.freeze({ +export const REDIS_SOFTWARE_MODULES_NAMES = Object.freeze({ ai: AdditionalRedisModuleName.RedisAI, graph: AdditionalRedisModuleName.RedisGraph, gears: AdditionalRedisModuleName.RedisGears, diff --git a/redisinsight/api/src/constants/telemetry-events.ts b/redisinsight/api/src/constants/telemetry-events.ts index b1a17c17f4..31fd085378 100644 --- a/redisinsight/api/src/constants/telemetry-events.ts +++ b/redisinsight/api/src/constants/telemetry-events.ts @@ -21,12 +21,12 @@ export enum TelemetryEvents { DatabaseImportPartiallySucceeded = 'CONFIG_DATABASES_REDIS_IMPORT_PARTIALLY_SUCCEEDED', // Events for autodiscovery flows - REClusterDiscoverySucceed = 'CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_SUCCEEDED', - REClusterDiscoveryFailed = 'CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_FAILED', - RECloudSubscriptionsDiscoverySucceed = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_SUBSCRIPTIONS_SUCCEEDED', - RECloudSubscriptionsDiscoveryFailed = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_SUBSCRIPTIONS_FAILED', - RECloudDatabasesDiscoverySucceed = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_DATABASES_SUCCEEDED', - RECloudDatabasesDiscoveryFailed = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_DATABASES_FAILED', + RedisSoftwareDiscoverySucceed = 'CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_SUCCEEDED', + RedisSoftwareDiscoveryFailed = 'CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_FAILED', + RedisCloudSubscriptionsDiscoverySucceed = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_SUBSCRIPTIONS_SUCCEEDED', + RedisCloudSubscriptionsDiscoveryFailed = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_SUBSCRIPTIONS_FAILED', + RedisCloudDatabasesDiscoverySucceed = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_DATABASES_SUCCEEDED', + RedisCloudDatabasesDiscoveryFailed = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_DATABASES_FAILED', SentinelMasterGroupsDiscoverySucceed = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_SUCCEEDED', SentinelMasterGroupsDiscoveryFailed = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_FAILED', diff --git a/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.spec.ts b/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.spec.ts index 69334bacdc..7496bdf317 100644 --- a/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.spec.ts +++ b/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.spec.ts @@ -72,7 +72,7 @@ describe('CloudAuthAnalytics', () => { }); }); - describe('sendGetRECloudSubsFailedEvent', () => { + describe('sendGetRedisCloudSubsFailedEvent', () => { it('should emit error event with deep link flow', () => { service.sendCloudSignInFailed( mockSessionMetadata, diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodicovery.analytics.spec.ts b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodicovery.analytics.spec.ts index 12e6892a56..01291e5e3e 100644 --- a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodicovery.analytics.spec.ts +++ b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodicovery.analytics.spec.ts @@ -38,9 +38,9 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); - describe('sendGetRECloudSubsSucceedEvent', () => { + describe('sendGetRedisCloudSubsSucceedEvent', () => { it('should emit event with active subscriptions', () => { - service.sendGetRECloudSubsSucceedEvent( + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, [mockCloudSubscription, mockCloudSubscription], CloudSubscriptionType.Flexible, @@ -49,7 +49,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: 2, totalNumberOfSubscriptions: 2, @@ -59,7 +59,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event with active and not active subscription', () => { - service.sendGetRECloudSubsSucceedEvent( + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, [ { @@ -74,7 +74,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: 1, totalNumberOfSubscriptions: 2, @@ -84,7 +84,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event without active subscriptions', () => { - service.sendGetRECloudSubsSucceedEvent( + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, [ { @@ -101,7 +101,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: 0, totalNumberOfSubscriptions: 2, @@ -110,8 +110,8 @@ describe('CloudAutodiscoveryAnalytics', () => { }, ); }); - it('should emit GetRECloudSubsSucceedEvent event for empty list', () => { - service.sendGetRECloudSubsSucceedEvent( + it('should emit GetRedisCloudSubsSucceedEvent event for empty list', () => { + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, [], CloudSubscriptionType.Flexible, @@ -120,7 +120,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: 0, totalNumberOfSubscriptions: 0, @@ -129,8 +129,8 @@ describe('CloudAutodiscoveryAnalytics', () => { }, ); }); - it('should emit GetRECloudSubsSucceedEvent event for undefined input value', () => { - service.sendGetRECloudSubsSucceedEvent( + it('should emit GetRedisCloudSubsSucceedEvent event for undefined input value', () => { + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, undefined, CloudSubscriptionType.Fixed, @@ -139,7 +139,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: 0, totalNumberOfSubscriptions: 0, @@ -148,11 +148,11 @@ describe('CloudAutodiscoveryAnalytics', () => { }, ); }); - it('should not throw on error when sending GetRECloudSubsSucceedEvent event', () => { + it('should not throw on error when sending GetRedisCloudSubsSucceedEvent event', () => { const input: any = {}; expect(() => - service.sendGetRECloudSubsSucceedEvent( + service.sendGetRedisCloudSubsSucceedEvent( mockSessionMetadata, input, CloudSubscriptionType.Flexible, @@ -163,9 +163,9 @@ describe('CloudAutodiscoveryAnalytics', () => { }); }); - describe('sendGetRECloudSubsFailedEvent', () => { - it('should emit GetRECloudSubsFailedEvent event', () => { - service.sendGetRECloudSubsFailedEvent( + describe('sendGetRedisCloudSubsFailedEvent', () => { + it('should emit GetRedisCloudSubsFailedEvent event', () => { + service.sendGetRedisCloudSubsFailedEvent( mockSessionMetadata, httpException, CloudSubscriptionType.Fixed, @@ -174,7 +174,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendFailedEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoveryFailed, + TelemetryEvents.RedisCloudSubscriptionsDiscoveryFailed, httpException, { type: CloudSubscriptionType.Fixed, @@ -184,9 +184,9 @@ describe('CloudAutodiscoveryAnalytics', () => { }); }); - describe('sendGetRECloudDbsSucceedEvent', () => { + describe('sendGetRedisCloudDbsSucceedEvent', () => { it('should emit event with active databases', () => { - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, [mockCloudDatabase, mockCloudDatabaseFixed], CloudAutodiscoveryAuthType.Credentials, @@ -194,7 +194,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: 2, numberOfFreeDatabases: 1, @@ -206,7 +206,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event with active and not active database', () => { - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, [ { @@ -220,7 +220,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: 1, numberOfFreeDatabases: 0, @@ -232,7 +232,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event without active databases', () => { - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, [ { @@ -245,7 +245,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: 0, numberOfFreeDatabases: 0, @@ -257,7 +257,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event for empty list', () => { - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, [], CloudAutodiscoveryAuthType.Credentials, @@ -265,7 +265,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: 0, numberOfFreeDatabases: 0, @@ -277,7 +277,7 @@ describe('CloudAutodiscoveryAnalytics', () => { ); }); it('should emit event for undefined input value', () => { - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, undefined, CloudAutodiscoveryAuthType.Credentials, @@ -285,7 +285,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: 0, numberOfFreeDatabases: 0, @@ -300,7 +300,7 @@ describe('CloudAutodiscoveryAnalytics', () => { const input: any = {}; expect(() => - service.sendGetRECloudDbsSucceedEvent( + service.sendGetRedisCloudDbsSucceedEvent( mockSessionMetadata, input, CloudAutodiscoveryAuthType.Credentials, @@ -310,9 +310,9 @@ describe('CloudAutodiscoveryAnalytics', () => { }); }); - describe('sendGetRECloudDbsFailedEvent', () => { + describe('sendGetRedisCloudDbsFailedEvent', () => { it('should emit event', () => { - service.sendGetRECloudDbsFailedEvent( + service.sendGetRedisCloudDbsFailedEvent( mockSessionMetadata, httpException, CloudAutodiscoveryAuthType.Credentials, @@ -320,7 +320,7 @@ describe('CloudAutodiscoveryAnalytics', () => { expect(sendFailedEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoveryFailed, + TelemetryEvents.RedisCloudDatabasesDiscoveryFailed, httpException, { authType: CloudAutodiscoveryAuthType.Credentials, diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.analytics.ts b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.analytics.ts index 8adee1de41..13587c8981 100644 --- a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.analytics.ts +++ b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.analytics.ts @@ -21,7 +21,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { super(eventEmitter); } - sendGetRECloudSubsSucceedEvent( + sendGetRedisCloudSubsSucceedEvent( sessionMetadata: SessionMetadata, subscriptions: CloudSubscription[] = [], type: CloudSubscriptionType, @@ -30,7 +30,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { try { this.sendEvent( sessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoverySucceed, + TelemetryEvents.RedisCloudSubscriptionsDiscoverySucceed, { numberOfActiveSubscriptions: subscriptions.filter( (sub) => sub.status === CloudSubscriptionStatus.Active, @@ -45,7 +45,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { } } - sendGetRECloudSubsFailedEvent( + sendGetRedisCloudSubsFailedEvent( sessionMetadata: SessionMetadata, exception: HttpException, type: CloudSubscriptionType, @@ -53,7 +53,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { ) { this.sendFailedEvent( sessionMetadata, - TelemetryEvents.RECloudSubscriptionsDiscoveryFailed, + TelemetryEvents.RedisCloudSubscriptionsDiscoveryFailed, exception, { type, @@ -62,7 +62,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { ); } - sendGetRECloudDbsSucceedEvent( + sendGetRedisCloudDbsSucceedEvent( sessionMetadata: SessionMetadata, databases: CloudDatabase[] = [], authType: CloudAutodiscoveryAuthType, @@ -70,7 +70,7 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { try { this.sendEvent( sessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoverySucceed, + TelemetryEvents.RedisCloudDatabasesDiscoverySucceed, { numberOfActiveDatabases: databases.filter( (db) => db.status === CloudDatabaseStatus.Active, @@ -90,14 +90,14 @@ export class CloudAutodiscoveryAnalytics extends TelemetryBaseService { } } - sendGetRECloudDbsFailedEvent( + sendGetRedisCloudDbsFailedEvent( sessionMetadata: SessionMetadata, exception: HttpException, authType: CloudAutodiscoveryAuthType, ) { this.sendFailedEvent( sessionMetadata, - TelemetryEvents.RECloudDatabasesDiscoveryFailed, + TelemetryEvents.RedisCloudDatabasesDiscoveryFailed, exception, { authType }, ); diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.spec.ts b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.spec.ts index 3c036f7b91..904915510b 100644 --- a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.spec.ts +++ b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.spec.ts @@ -98,13 +98,13 @@ describe('CloudAutodiscoveryService', () => { CloudAutodiscoveryAuthType.Credentials, ), ).toEqual([mockCloudSubscription, mockCloudSubscription]); - expect(analytics.sendGetRECloudSubsSucceedEvent).toHaveBeenCalledWith( + expect(analytics.sendGetRedisCloudSubsSucceedEvent).toHaveBeenCalledWith( mockSessionMetadata, [mockCloudSubscription], CloudSubscriptionType.Fixed, CloudAutodiscoveryAuthType.Credentials, ); - expect(analytics.sendGetRECloudSubsSucceedEvent).toHaveBeenCalledWith( + expect(analytics.sendGetRedisCloudSubsSucceedEvent).toHaveBeenCalledWith( mockSessionMetadata, [mockCloudSubscription], CloudSubscriptionType.Flexible, @@ -124,7 +124,7 @@ describe('CloudAutodiscoveryService', () => { ), ).rejects.toThrow(CloudApiUnauthorizedException); - expect(analytics.sendGetRECloudSubsFailedEvent).toHaveBeenCalledWith( + expect(analytics.sendGetRedisCloudSubsFailedEvent).toHaveBeenCalledWith( mockSessionMetadata, new CloudApiUnauthorizedException(), CloudSubscriptionType.Fixed, @@ -173,7 +173,7 @@ describe('CloudAutodiscoveryService', () => { free: true, }, ); - expect(analytics.sendGetRECloudDbsSucceedEvent).toHaveBeenCalledWith( + expect(analytics.sendGetRedisCloudDbsSucceedEvent).toHaveBeenCalledWith( mockSessionMetadata, [mockCloudDatabase, mockCloudDatabase], CloudAutodiscoveryAuthType.Credentials, @@ -250,7 +250,7 @@ describe('CloudAutodiscoveryService', () => { ), ).rejects.toThrow(NotFoundException); - expect(analytics.sendGetRECloudDbsFailedEvent).toHaveBeenCalledWith( + expect(analytics.sendGetRedisCloudDbsFailedEvent).toHaveBeenCalledWith( mockSessionMetadata, new NotFoundException(), CloudAutodiscoveryAuthType.Credentials, diff --git a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.ts b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.ts index 152ff5c4d9..60dd568d4e 100644 --- a/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.ts +++ b/redisinsight/api/src/modules/cloud/autodiscovery/cloud-autodiscovery.service.ts @@ -74,7 +74,7 @@ export class CloudAutodiscoveryService { try { const subscriptions = await this.cloudSubscriptionCapiService.getSubscriptions(authDto, type); - this.analytics.sendGetRECloudSubsSucceedEvent( + this.analytics.sendGetRedisCloudSubsSucceedEvent( sessionMetadata, subscriptions, type, @@ -87,7 +87,7 @@ export class CloudAutodiscoveryService { sessionMetadata, e, ); - this.analytics.sendGetRECloudSubsFailedEvent( + this.analytics.sendGetRedisCloudSubsFailedEvent( sessionMetadata, e, type, @@ -162,7 +162,7 @@ export class CloudAutodiscoveryService { }), ); - this.analytics.sendGetRECloudDbsSucceedEvent( + this.analytics.sendGetRedisCloudDbsSucceedEvent( sessionMetadata, result, authType, @@ -174,7 +174,7 @@ export class CloudAutodiscoveryService { sessionMetadata, e, ); - this.analytics.sendGetRECloudDbsFailedEvent(sessionMetadata, e, authType); + this.analytics.sendGetRedisCloudDbsFailedEvent(sessionMetadata, e, authType); throw wrapHttpError(e); } @@ -226,7 +226,7 @@ export class CloudAutodiscoveryService { name, nameFromProvider: name, password, - provider: HostingProvider.RE_CLOUD, + provider: HostingProvider.REDIS_CLOUD, cloudDetails: database?.cloudDetails, tags, timeout: cloudConfig.cloudDatabaseConnectionTimeout, diff --git a/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.spec.ts b/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.spec.ts index e54c394ca6..b8c0894eb1 100644 --- a/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.spec.ts +++ b/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.spec.ts @@ -1,18 +1,18 @@ import { AdditionalRedisModuleName } from 'src/constants'; -import { convertRECloudModuleName } from 'src/modules/cloud/database/utils/cloud-data-converter'; +import { convertRedisCloudModuleName } from 'src/modules/cloud/database/utils/cloud-data-converter'; describe('convertRedisCloudModuleName', () => { it('should return exist module name', () => { const input = 'RedisJSON'; - const output = convertRECloudModuleName(input); + const output = convertRedisCloudModuleName(input); expect(output).toEqual(AdditionalRedisModuleName.RedisJSON); }); it('should return non-exist module name', () => { const input = 'RedisNewModule'; - const output = convertRECloudModuleName(input); + const output = convertRedisCloudModuleName(input); expect(output).toEqual(input); }); diff --git a/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.ts b/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.ts index 24c34bcb60..f9ea8d202e 100644 --- a/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.ts +++ b/redisinsight/api/src/modules/cloud/database/utils/cloud-data-converter.ts @@ -10,11 +10,11 @@ import { ICloudCapiDatabaseTag, } from 'src/modules/cloud/database/models'; import { CloudSubscriptionType } from 'src/modules/cloud/subscription/models'; -import { RE_CLOUD_MODULES_NAMES } from 'src/constants'; +import { REDIS_CLOUD_MODULES_NAMES } from 'src/constants'; import { Tag } from 'src/modules/tag/models/tag'; -export function convertRECloudModuleName(name: string): string { - return RE_CLOUD_MODULES_NAMES[name] ?? name; +export function convertRedisCloudModuleName(name: string): string { + return REDIS_CLOUD_MODULES_NAMES[name] ?? name; } export const parseCloudDatabaseCapiResponse = ( @@ -46,7 +46,7 @@ export const parseCloudDatabaseCapiResponse = ( password: security?.password, sslClientAuthentication: security.sslClientAuthentication, modules: database.modules.map((module) => - convertRECloudModuleName(module.name), + convertRedisCloudModuleName(module.name), ), options: { enabledDataPersistence: diff --git a/redisinsight/api/src/modules/cloud/job/jobs/create-free-database.cloud-job.ts b/redisinsight/api/src/modules/cloud/job/jobs/create-free-database.cloud-job.ts index f08190b0ce..6f2c78ee0f 100644 --- a/redisinsight/api/src/modules/cloud/job/jobs/create-free-database.cloud-job.ts +++ b/redisinsight/api/src/modules/cloud/job/jobs/create-free-database.cloud-job.ts @@ -148,7 +148,7 @@ export class CreateFreeDatabaseCloudJob extends CloudJob { name, nameFromProvider: name, password, - provider: HostingProvider.RE_CLOUD, + provider: HostingProvider.REDIS_CLOUD, cloudDetails: { ...cloudDatabase?.cloudDetails, free: true, diff --git a/redisinsight/api/src/modules/cloud/job/jobs/import-free-database.cloud-job.ts b/redisinsight/api/src/modules/cloud/job/jobs/import-free-database.cloud-job.ts index a280ee5656..4a6d480239 100644 --- a/redisinsight/api/src/modules/cloud/job/jobs/import-free-database.cloud-job.ts +++ b/redisinsight/api/src/modules/cloud/job/jobs/import-free-database.cloud-job.ts @@ -92,7 +92,7 @@ export class ImportFreeDatabaseCloudJob extends CloudJob { name, nameFromProvider: name, password, - provider: HostingProvider.RE_CLOUD, + provider: HostingProvider.REDIS_CLOUD, cloudDetails: { ...cloudDatabase?.cloudDetails, free: true, diff --git a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts index 692701b01b..dd60ee101e 100644 --- a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts +++ b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts @@ -188,7 +188,7 @@ describe('DatabaseImportService', () => { mockSessionMetadata, { ...mockDatabase, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, 0, ); @@ -204,7 +204,7 @@ describe('DatabaseImportService', () => { 'compressor', 'modules', ]), - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', new: true, }, false, diff --git a/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.spec.ts b/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.spec.ts index 042f6725d2..785dc239b1 100644 --- a/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.spec.ts +++ b/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.spec.ts @@ -5,8 +5,8 @@ import { HostingProvider } from 'src/modules/database/entities/database.entity'; const mockClusterConnectionType = RedisClientConnectionType.CLUSTER; const mockNotClusterConnectionType = RedisClientConnectionType.STANDALONE; -const mockREProvider = HostingProvider.RE_CLUSTER; -const mockNotREProvider = HostingProvider.RE_CLOUD; +const mockREProvider = HostingProvider.REDIS_SOFTWARE; +const mockNotREProvider = HostingProvider.REDIS_CLOUD; describe('TryRdiStrategyStrategy', () => { let strategy: TryRdiStrategyStrategy; diff --git a/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.ts b/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.ts index 6de6bbdfc0..6035a8e596 100644 --- a/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.ts +++ b/redisinsight/api/src/modules/database-recommendation/scanner/strategies/try-rdi.strategy.ts @@ -13,10 +13,10 @@ export class TryRdiStrategyStrategy extends AbstractRecommendationStrategy { provider: HostingProvider; connectionType: RedisClientConnectionType; }): Promise { - const isReCLusterOrCluster = - data.provider === HostingProvider.RE_CLUSTER || + const isRedisSoftwareOrCluster = + data.provider === HostingProvider.REDIS_SOFTWARE || data.connectionType === RedisClientConnectionType.CLUSTER; - return { isReached: isReCLusterOrCluster }; + return { isReached: isRedisSoftwareOrCluster }; } } diff --git a/redisinsight/api/src/modules/database/database.analytics.spec.ts b/redisinsight/api/src/modules/database/database.analytics.spec.ts index 4620a54510..b9fc9f34b5 100644 --- a/redisinsight/api/src/modules/database/database.analytics.spec.ts +++ b/redisinsight/api/src/modules/database/database.analytics.spec.ts @@ -226,7 +226,7 @@ describe('DatabaseAnalytics', () => { const prev = mockDatabaseWithTlsAuth; const cur = { ...mockDatabaseWithTlsAuth, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, tls: undefined, verifyServerCert: false, caCert: null, @@ -240,7 +240,7 @@ describe('DatabaseAnalytics', () => { { databaseId: cur.id, connectionType: cur.connectionType, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, useTLS: 'disabled', verifyTLSCertificate: 'disabled', useTLSAuthClients: 'disabled', @@ -271,7 +271,7 @@ describe('DatabaseAnalytics', () => { }; const cur = { ...mockDatabaseWithTlsAuth, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, }; service.sendInstanceEditedEvent(mockSessionMetadata, prev, cur); @@ -281,7 +281,7 @@ describe('DatabaseAnalytics', () => { { databaseId: cur.id, connectionType: cur.connectionType, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, useTLS: 'enabled', verifyTLSCertificate: 'enabled', useTLSAuthClients: 'enabled', @@ -434,7 +434,7 @@ describe('DatabaseAnalytics', () => { const prev = mockDatabaseWithTlsAuth; const cur = { ...mockDatabaseWithTlsAuth, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, tls: undefined, verifyServerCert: false, caCert: null, @@ -449,7 +449,7 @@ describe('DatabaseAnalytics', () => { { databaseId: cur.id, connectionType: cur.connectionType, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, useTLS: 'disabled', verifyTLSCertificate: 'disabled', useTLSAuthClients: 'disabled', @@ -478,7 +478,7 @@ describe('DatabaseAnalytics', () => { const prev = mockDatabaseWithTlsAuth; const cur = { ...mockDatabase, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, tls: undefined, }; service.sendInstanceEditedEvent(mockSessionMetadata, prev, cur, false); diff --git a/redisinsight/api/src/modules/database/entities/database.entity.ts b/redisinsight/api/src/modules/database/entities/database.entity.ts index 1c284ff44e..7bae500362 100644 --- a/redisinsight/api/src/modules/database/entities/database.entity.ts +++ b/redisinsight/api/src/modules/database/entities/database.entity.ts @@ -19,10 +19,10 @@ import { DatabaseSettingsEntity } from 'src/modules/database-settings/entities/d import { TagEntity } from 'src/modules/tag/entities/tag.entity'; export enum HostingProvider { - RE_CLUSTER = 'RE_CLUSTER', - RE_CLOUD = 'RE_CLOUD', + REDIS_SOFTWARE = 'REDIS_SOFTWARE', + REDIS_CLOUD = 'REDIS_CLOUD', REDIS_STACK = 'REDIS_STACK', - REDIS_ENTERPRISE = 'REDIS_ENTERPRISE', + OTHER_REDIS_MANAGED = 'OTHER_REDIS_MANAGED', AZURE_CACHE = 'AZURE_CACHE', AZURE_CACHE_REDIS_ENTERPRISE = 'AZURE_CACHE_REDIS_ENTERPRISE', REDIS_COMMUNITY_EDITION = 'REDIS_COMMUNITY_EDITION', diff --git a/redisinsight/api/src/modules/database/models/database.ts b/redisinsight/api/src/modules/database/models/database.ts index a51d8c2faa..0c9bdf5aaa 100644 --- a/redisinsight/api/src/modules/database/models/database.ts +++ b/redisinsight/api/src/modules/database/models/database.ts @@ -135,7 +135,7 @@ export class Database { @ApiPropertyOptional({ description: 'The redis database hosting provider', - example: HostingProvider.RE_CLOUD, + example: HostingProvider.REDIS_CLOUD, }) @Expose() @IsOptional() diff --git a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.spec.ts b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.spec.ts index c4cdaf7174..7010058e6c 100644 --- a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.spec.ts +++ b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.spec.ts @@ -31,16 +31,16 @@ describe('RedisEnterpriseAnalytics', () => { ); }); - describe('sendGetREClusterDbsSucceedEvent', () => { + describe('sendGetRedisSoftwareDbsSucceedEvent', () => { it('should emit event with active databases', () => { - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, [ + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, [ mockRedisEnterpriseDatabaseDto, mockRedisEnterpriseDatabaseDto, ]); expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: 2, totalNumberOfDatabases: 2, @@ -48,7 +48,7 @@ describe('RedisEnterpriseAnalytics', () => { ); }); it('should emit event with active and not active database', () => { - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, [ + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, [ { ...mockRedisEnterpriseDatabaseDto, status: RedisEnterpriseDatabaseStatus.Pending, @@ -58,7 +58,7 @@ describe('RedisEnterpriseAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: 1, totalNumberOfDatabases: 2, @@ -66,7 +66,7 @@ describe('RedisEnterpriseAnalytics', () => { ); }); it('should emit event without active databases', () => { - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, [ + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, [ { ...mockRedisEnterpriseDatabaseDto, status: RedisEnterpriseDatabaseStatus.Pending, @@ -79,57 +79,57 @@ describe('RedisEnterpriseAnalytics', () => { expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: 0, totalNumberOfDatabases: 2, }, ); }); - it('should emit GetREClusterDbsSucceed event for empty list', () => { - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, []); + it('should emit GetRedisSoftwareDbsSucceed event for empty list', () => { + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, []); expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: 0, totalNumberOfDatabases: 0, }, ); }); - it('should emit GetREClusterDbsSucceed event for undefined input value', () => { - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, undefined); + it('should emit GetRedisSoftwareDbsSucceed event for undefined input value', () => { + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, undefined); expect(sendEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: 0, totalNumberOfDatabases: 0, }, ); }); - it('should not throw on error when sending GetREClusterDbsSucceed event', () => { + it('should not throw on error when sending GetRedisSoftwareDbsSucceed event', () => { const input: any = {}; expect(() => - service.sendGetREClusterDbsSucceedEvent(mockSessionMetadata, input), + service.sendGetRedisSoftwareDbsSucceedEvent(mockSessionMetadata, input), ).not.toThrow(); expect(sendEventMethod).not.toHaveBeenCalled(); }); }); - describe('sendGetREClusterDbsFailedEvent', () => { - it('should emit GetREClusterDbsFailed event', () => { - service.sendGetREClusterDbsFailedEvent( + describe('sendGetRedisSoftwareDbsFailedEvent', () => { + it('should emit GetRedisSoftwareDbsFailed event', () => { + service.sendGetRedisSoftwareDbsFailedEvent( mockSessionMetadata, httpException, ); expect(sendFailedEventMethod).toHaveBeenCalledWith( mockSessionMetadata, - TelemetryEvents.REClusterDiscoveryFailed, + TelemetryEvents.RedisSoftwareDiscoveryFailed, httpException, ); }); diff --git a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.ts b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.ts index 62d622d202..d0acc9e7e0 100644 --- a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.ts +++ b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.analytics.ts @@ -12,14 +12,14 @@ export class RedisEnterpriseAnalytics extends TelemetryBaseService { super(eventEmitter); } - sendGetREClusterDbsSucceedEvent( + sendGetRedisSoftwareDbsSucceedEvent( sessionMetadata: SessionMetadata, databases: RedisEnterpriseDatabase[] = [], ): void { try { this.sendEvent( sessionMetadata, - TelemetryEvents.REClusterDiscoverySucceed, + TelemetryEvents.RedisSoftwareDiscoverySucceed, { numberOfActiveDatabases: databases.filter( (db) => db.status === RedisEnterpriseDatabaseStatus.Active, @@ -32,13 +32,13 @@ export class RedisEnterpriseAnalytics extends TelemetryBaseService { } } - sendGetREClusterDbsFailedEvent( + sendGetRedisSoftwareDbsFailedEvent( sessionMetadata: SessionMetadata, exception: HttpException, ) { this.sendFailedEvent( sessionMetadata, - TelemetryEvents.REClusterDiscoveryFailed, + TelemetryEvents.RedisSoftwareDiscoveryFailed, exception, ); } diff --git a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.spec.ts b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.spec.ts index 1ff38d7f06..05566805df 100644 --- a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.spec.ts +++ b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.spec.ts @@ -30,7 +30,7 @@ const mockGetDatabasesDto: ClusterConnectionDetailsDto = { password: 'adminpassword', }; -const mockREClusterDatabaseEndpoint: IRedisEnterpriseEndpoint = { +const mockRedisSoftwareDatabaseEndpoint: IRedisEnterpriseEndpoint = { oss_cluster_api_preferred_ip_type: 'internal', uid: '2:1', addr_type: 'external', @@ -39,7 +39,7 @@ const mockREClusterDatabaseEndpoint: IRedisEnterpriseEndpoint = { port: 11305, addr: ['172.17.0.2'], }; -const mockREClusterDatabase: IRedisEnterpriseDatabase = { +const mockRedisSoftwareDatabase: IRedisEnterpriseDatabase = { gradual_src_mode: 'disabled', group_uid: 0, memory_size: 107374182, @@ -126,11 +126,11 @@ const mockREClusterDatabase: IRedisEnterpriseDatabase = { ssl: false, dns_address_master: '', import_progress: 0.0, - endpoints: [mockREClusterDatabaseEndpoint], + endpoints: [mockRedisSoftwareDatabaseEndpoint], tags: [], }; -const mockREClusterDbsResponse: IRedisEnterpriseDatabase[] = [ - mockREClusterDatabase, +const mockRedisSoftwareDbsResponse: IRedisEnterpriseDatabase[] = [ + mockRedisSoftwareDatabase, ]; describe('RedisEnterpriseService', () => { @@ -158,7 +158,7 @@ describe('RedisEnterpriseService', () => { describe('getDatabases', () => { it('successfully get databases from RE cluster', async () => { - const response = { status: 200, data: mockREClusterDbsResponse }; + const response = { status: 200, data: mockRedisSoftwareDbsResponse }; mockedAxios.get.mockResolvedValue(response); await expect( @@ -166,7 +166,7 @@ describe('RedisEnterpriseService', () => { ).resolves.not.toThrow(); expect(mockedAxios.get).toHaveBeenCalled(); expect(parseClusterDbsResponse).toHaveBeenCalledWith( - mockREClusterDbsResponse, + mockRedisSoftwareDbsResponse, ); }); it('the user could not be authenticated', async () => { @@ -197,21 +197,21 @@ describe('RedisEnterpriseService', () => { describe('getDatabaseExternalEndpoint', () => { const externalEndpoint: IRedisEnterpriseEndpoint = - mockREClusterDatabaseEndpoint; + mockRedisSoftwareDatabaseEndpoint; const internalEndpoint: IRedisEnterpriseEndpoint = { - ...mockREClusterDatabaseEndpoint, + ...mockRedisSoftwareDatabaseEndpoint, addr_type: 'internal', }; it('should return only one external endpoints', async () => { const result = service.getDatabaseExternalEndpoint({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, endpoints: [externalEndpoint, internalEndpoint], }); expect(result).toEqual(externalEndpoint); }); it('should return undefined', async () => { const result = service.getDatabaseExternalEndpoint({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, endpoints: [internalEndpoint], }); expect(result).toBeUndefined(); @@ -221,7 +221,7 @@ describe('RedisEnterpriseService', () => { describe('getDatabasePersistencePolicy', () => { it('should return AofEveryOneSecond', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: RedisEnterpriseDatabasePersistence.Aof, aof_policy: RedisEnterpriseDatabaseAofPolicy.AofEveryOneSecond, }); @@ -231,7 +231,7 @@ describe('RedisEnterpriseService', () => { }); it('should return AofEveryWrite', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: RedisEnterpriseDatabasePersistence.Aof, aof_policy: RedisEnterpriseDatabaseAofPolicy.AofEveryWrite, }); @@ -239,7 +239,7 @@ describe('RedisEnterpriseService', () => { }); it('should return SnapshotEveryOneHour', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: RedisEnterpriseDatabasePersistence.Snapshot, snapshot_policy: [{ secs: 3600 }], }); @@ -249,7 +249,7 @@ describe('RedisEnterpriseService', () => { }); it('should return SnapshotEverySixHours', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: RedisEnterpriseDatabasePersistence.Snapshot, snapshot_policy: [{ secs: 21600 }], }); @@ -259,7 +259,7 @@ describe('RedisEnterpriseService', () => { }); it('should return SnapshotEveryTwelveHours', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: RedisEnterpriseDatabasePersistence.Snapshot, snapshot_policy: [{ secs: 43200 }], }); @@ -269,7 +269,7 @@ describe('RedisEnterpriseService', () => { }); it('should return None', async () => { const result = service.getDatabasePersistencePolicy({ - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, data_persistence: null, }); expect(result).toEqual(RedisEnterprisePersistencePolicy.None); @@ -278,10 +278,10 @@ describe('RedisEnterpriseService', () => { describe('findReplicasForDatabase', () => { it('successfully return replicas', async () => { - const soursDatabase = mockREClusterDatabase; - const sourceEndpoint = mockREClusterDatabase.endpoints[0]; + const soursDatabase = mockRedisSoftwareDatabase; + const sourceEndpoint = mockRedisSoftwareDatabase.endpoints[0]; const replicaDatabase: IRedisEnterpriseDatabase = { - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, uid: 1, replica_sources: [ { @@ -300,13 +300,13 @@ describe('RedisEnterpriseService', () => { }); it('source dont have replicas', async () => { const databases = [ - mockREClusterDatabase, + mockRedisSoftwareDatabase, { - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, uid: 3, }, { - ...mockREClusterDatabase, + ...mockRedisSoftwareDatabase, uid: 4, replica_sources: [ { @@ -319,7 +319,7 @@ describe('RedisEnterpriseService', () => { ]; const result = service.findReplicasForDatabase( databases, - mockREClusterDatabase, + mockRedisSoftwareDatabase, ); expect(result).toEqual([]); diff --git a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.ts b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.ts index 85fdbea5b3..ecc036b4d7 100644 --- a/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.ts +++ b/redisinsight/api/src/modules/redis-enterprise/redis-enterprise.service.ts @@ -21,7 +21,7 @@ import { ClusterConnectionDetailsDto, RedisEnterpriseDatabase, } from 'src/modules/redis-enterprise/dto/cluster.dto'; -import { convertREClusterModuleName } from 'src/modules/redis-enterprise/utils/redis-enterprise-converter'; +import { convertRedisSoftwareModuleName } from 'src/modules/redis-enterprise/utils/redis-enterprise-converter'; import { RedisEnterpriseAnalytics } from 'src/modules/redis-enterprise/redis-enterprise.analytics'; import { AddRedisEnterpriseDatabaseResponse } from 'src/modules/redis-enterprise/dto/redis-enterprise-cluster.dto'; import { HostingProvider } from 'src/modules/database/entities/database.entity'; @@ -61,7 +61,7 @@ export class RedisEnterpriseService { sessionMetadata, ); const result = this.parseClusterDbsResponse(data); - this.analytics.sendGetREClusterDbsSucceedEvent(sessionMetadata, result); + this.analytics.sendGetRedisSoftwareDbsSucceedEvent(sessionMetadata, result); return result; } catch (error) { const { response } = error; @@ -80,7 +80,7 @@ export class RedisEnterpriseService { ERROR_MESSAGES.INCORRECT_DATABASE_URL(`${host}:${port}`), ); } - this.analytics.sendGetREClusterDbsFailedEvent(sessionMetadata, exception); + this.analytics.sendGetRedisSoftwareDbsFailedEvent(sessionMetadata, exception); throw exception; } } @@ -121,7 +121,7 @@ export class RedisEnterpriseService { status: database.status, tls: tls_mode === 'enabled', modules: database.module_list.map((module: IRedisEnterpriseModule) => - convertREClusterModuleName(module.module_name), + convertRedisSoftwareModuleName(module.module_name), ), options: { enabledDataPersistence: @@ -236,7 +236,7 @@ export class RedisEnterpriseService { name, nameFromProvider: name, password, - provider: HostingProvider.RE_CLUSTER, + provider: HostingProvider.REDIS_SOFTWARE, tags, }); return { diff --git a/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.spec.ts b/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.spec.ts index a745f94566..6bac87dfc9 100644 --- a/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.spec.ts +++ b/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.spec.ts @@ -1,18 +1,18 @@ import { AdditionalRedisModuleName } from 'src/constants'; -import { convertREClusterModuleName } from 'src/modules/redis-enterprise/utils/redis-enterprise-converter'; +import { convertRedisSoftwareModuleName } from 'src/modules/redis-enterprise/utils/redis-enterprise-converter'; describe('convertRedisCloudModuleName', () => { it('should return exist module name', () => { const input = 'ReJSON'; - const output = convertREClusterModuleName(input); + const output = convertRedisSoftwareModuleName(input); expect(output).toEqual(AdditionalRedisModuleName.RedisJSON); }); it('should return non-exist module name', () => { const input = 'RedisNewModule'; - const output = convertREClusterModuleName(input); + const output = convertRedisSoftwareModuleName(input); expect(output).toEqual(input); }); diff --git a/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.ts b/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.ts index ce6126081f..8f7f5529a2 100644 --- a/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.ts +++ b/redisinsight/api/src/modules/redis-enterprise/utils/redis-enterprise-converter.ts @@ -1,10 +1,10 @@ import { AdditionalRedisModuleName, - RE_CLUSTER_MODULES_NAMES, + REDIS_SOFTWARE_MODULES_NAMES, } from 'src/constants'; -export function convertREClusterModuleName( +export function convertRedisSoftwareModuleName( name: string, ): AdditionalRedisModuleName { - return RE_CLUSTER_MODULES_NAMES[name] ?? name; + return REDIS_SOFTWARE_MODULES_NAMES[name] ?? name; } diff --git a/redisinsight/api/src/modules/redis-sentinel/redis-sentinel.analytics.spec.ts b/redisinsight/api/src/modules/redis-sentinel/redis-sentinel.analytics.spec.ts index 698f393c71..fb9290a1f2 100644 --- a/redisinsight/api/src/modules/redis-sentinel/redis-sentinel.analytics.spec.ts +++ b/redisinsight/api/src/modules/redis-sentinel/redis-sentinel.analytics.spec.ts @@ -128,7 +128,7 @@ describe('RedisSentinelAnalytics', () => { }); }); - describe('sendGetRECloudSubsFailedEvent', () => { + describe('sendGetRedisCloudSubsFailedEvent', () => { it('should emit event', () => { service.sendGetSentinelMastersFailedEvent( mockSessionMetadata, diff --git a/redisinsight/api/src/utils/hosting-provider-helper.spec.ts b/redisinsight/api/src/utils/hosting-provider-helper.spec.ts index dffb208fbd..e7508c0339 100644 --- a/redisinsight/api/src/utils/hosting-provider-helper.spec.ts +++ b/redisinsight/api/src/utils/hosting-provider-helper.spec.ts @@ -11,19 +11,19 @@ const getHostingProviderTests = [ { input: '192.12.56.244', output: HostingProvider.UNKNOWN }, { input: '255.255.56.244', output: HostingProvider.UNKNOWN }, { input: 'redis', output: HostingProvider.UNKNOWN }, - { input: 'demo-redislabs.rlrcp.com', output: HostingProvider.RE_CLOUD }, + { input: 'demo-redislabs.rlrcp.com', output: HostingProvider.REDIS_CLOUD }, { input: 'memorydb.aws.com', output: HostingProvider.AWS_MEMORYDB }, { input: 'redis-16781.c273.us-east-1-2.ec2.cloud.redislabs.com', - output: HostingProvider.RE_CLOUD, + output: HostingProvider.REDIS_CLOUD, }, { input: 'redis-16781.c273.us-east-1-2.ec2.cloud.redis-cloud.com', - output: HostingProvider.RE_CLOUD, + output: HostingProvider.REDIS_CLOUD, }, { input: 'redis-16781.c273.us-east-1-2.ec2.cloud.rlrcp.com', - output: HostingProvider.RE_CLOUD, + output: HostingProvider.REDIS_CLOUD, }, { input: 'askubuntu.mki5tz.0001.use1.cache.amazonaws.com', @@ -65,7 +65,7 @@ const getHostingProviderTests = [ [['name', 'search', 'path', '/enterprise-managed']], ], info: '# Server\r\n' + 'redis_version: 7.2.0', - output: HostingProvider.REDIS_ENTERPRISE, + output: HostingProvider.OTHER_REDIS_MANAGED, }, { input: 'localhost', diff --git a/redisinsight/api/src/utils/hosting-provider-helper.ts b/redisinsight/api/src/utils/hosting-provider-helper.ts index 9b27d8347a..b6fdd9f310 100644 --- a/redisinsight/api/src/utils/hosting-provider-helper.ts +++ b/redisinsight/api/src/utils/hosting-provider-helper.ts @@ -27,7 +27,7 @@ export const getHostingProvider = async ( PROVIDER_HOST_REGEX.REDISLABS.test(host) || PROVIDER_HOST_REGEX.REDISCLOUD.test(host) ) { - return HostingProvider.RE_CLOUD; + return HostingProvider.REDIS_CLOUD; } if (PROVIDER_HOST_REGEX.CACHE_AMAZONAWS.test(host)) { return HostingProvider.AWS_ELASTICACHE; @@ -50,7 +50,7 @@ export const getHostingProvider = async ( ).toLowerCase(); if (hello.includes('/enterprise-managed')) { - return HostingProvider.REDIS_ENTERPRISE; + return HostingProvider.OTHER_REDIS_MANAGED; } if (hello.includes('google')) { diff --git a/redisinsight/api/test/api/database/constants.ts b/redisinsight/api/test/api/database/constants.ts index 123171169f..914406cf69 100644 --- a/redisinsight/api/test/api/database/constants.ts +++ b/redisinsight/api/test/api/database/constants.ts @@ -2,10 +2,10 @@ import { Joi } from '../../helpers/test'; import { caCertSchema, clientCertSchema } from '../certificate/constants'; const providers = [ - 'RE_CLUSTER', - 'RE_CLOUD', + 'REDIS_SOFTWARE', + 'REDIS_CLOUD', 'REDIS_STACK', - 'REDIS_ENTERPRISE', + 'OTHER_REDIS_MANAGED', 'AZURE_CACHE', 'AZURE_CACHE_REDIS_ENTERPRISE', 'REDIS_COMMUNITY_EDITION', diff --git a/redisinsight/ui/src/components/explore-guides/ExploreGuides.spec.tsx b/redisinsight/ui/src/components/explore-guides/ExploreGuides.spec.tsx index 4baf02af19..b3d4681365 100644 --- a/redisinsight/ui/src/components/explore-guides/ExploreGuides.spec.tsx +++ b/redisinsight/ui/src/components/explore-guides/ExploreGuides.spec.tsx @@ -19,7 +19,7 @@ jest.mock('uiSrc/slices/content/guide-links', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -92,7 +92,7 @@ describe('ExploreGuides', () => { eventData: { databaseId: INSTANCE_ID_MOCK, tutorialId: 'sq-intro', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', source: 'empty browser', }, }) diff --git a/redisinsight/ui/src/components/side-panels/SidePanels.test.tsx b/redisinsight/ui/src/components/side-panels/SidePanels.test.tsx index f484c5d891..474f536505 100644 --- a/redisinsight/ui/src/components/side-panels/SidePanels.test.tsx +++ b/redisinsight/ui/src/components/side-panels/SidePanels.test.tsx @@ -61,7 +61,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', connectionType: 'CLUSTER', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), connectedInstanceCDSelector: jest.fn().mockReturnValue({ free: false, @@ -240,7 +240,7 @@ describe('SidePanels', () => { event: TelemetryEvent.INSIGHTS_PANEL_CLOSED, eventData: { databaseId: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', page: '/pub-sub', tab: 'tips', }, diff --git a/redisinsight/ui/src/components/side-panels/panels/enablement-area/EnablementArea/components/Code/Code.spec.tsx b/redisinsight/ui/src/components/side-panels/panels/enablement-area/EnablementArea/components/Code/Code.spec.tsx index d51e2314e4..b3c66492e5 100644 --- a/redisinsight/ui/src/components/side-panels/panels/enablement-area/EnablementArea/components/Code/Code.spec.tsx +++ b/redisinsight/ui/src/components/side-panels/panels/enablement-area/EnablementArea/components/Code/Code.spec.tsx @@ -21,7 +21,7 @@ jest.mock('uiSrc/telemetry', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -103,7 +103,7 @@ describe('Code', () => { buttonName: label, databaseId: 'instanceId', path: 'path', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) }) @@ -129,7 +129,7 @@ describe('Code', () => { eventData: { databaseId: 'instanceId', path: 'path', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) }) diff --git a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.spec.tsx b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.spec.tsx index 27f503c59a..7d4d96a8b0 100644 --- a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.spec.tsx +++ b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.spec.tsx @@ -40,7 +40,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', connectionType: 'CLUSTER', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -153,7 +153,7 @@ describe('LiveTimeRecommendations', () => { eventData: { databaseId: 'instanceId', total: 1, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) sendEventTelemetry.mockRestore() @@ -182,7 +182,7 @@ describe('LiveTimeRecommendations', () => { ), total: 2, action: 'show', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) sendEventTelemetry.mockRestore() diff --git a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/recommendation/Recommendation.spec.tsx b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/recommendation/Recommendation.spec.tsx index 4709376b94..a28920a016 100644 --- a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/recommendation/Recommendation.spec.tsx +++ b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/recommendation/Recommendation.spec.tsx @@ -47,7 +47,7 @@ beforeEach(() => { store.clearActions() }) -const PROVIDER = 'RE_CLOUD' +const PROVIDER = 'REDIS_CLOUD' describe('Recommendation', () => { it('should render', () => { diff --git a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.spec.tsx b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.spec.tsx index c461d6c8bf..cf25179b66 100644 --- a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.spec.tsx +++ b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.spec.tsx @@ -28,7 +28,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -109,7 +109,7 @@ describe('WelcomeScreen', () => { eventData: { databaseId: 'instanceId', total: 1, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() diff --git a/redisinsight/ui/src/components/triggers/insights-trigger/InsightsTrigger.spec.tsx b/redisinsight/ui/src/components/triggers/insights-trigger/InsightsTrigger.spec.tsx index 9fbcd2049d..e3a3500a78 100644 --- a/redisinsight/ui/src/components/triggers/insights-trigger/InsightsTrigger.spec.tsx +++ b/redisinsight/ui/src/components/triggers/insights-trigger/InsightsTrigger.spec.tsx @@ -36,7 +36,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', connectionType: 'CLUSTER', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -99,7 +99,7 @@ describe('InsightsTrigger', () => { event: TelemetryEvent.INSIGHTS_PANEL_OPENED, eventData: { databaseId: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', source: 'overview', page: '/browser', tab: 'tips', diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx index 953e26c690..204b0d003d 100644 --- a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx +++ b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx @@ -88,7 +88,7 @@ const RedisCloudDatabasesPage = () => { const sendCancelEvent = () => { sendEventTelemetry({ - event: TelemetryEvent.CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_CANCELLED, + event: TelemetryEvent.CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_CANCELLED, }) } diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx index 74a12cb5c0..f14db04460 100644 --- a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx +++ b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx @@ -79,7 +79,7 @@ const RedisCloudSubscriptionsPage = () => { const sendCancelEvent = () => { sendEventTelemetry({ - event: TelemetryEvent.CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_CANCELLED, + event: TelemetryEvent.CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_CANCELLED, }) } diff --git a/redisinsight/ui/src/pages/browser/BrowserPage.test.tsx b/redisinsight/ui/src/pages/browser/BrowserPage.test.tsx index 77bdec7e04..fb7e39c5d2 100644 --- a/redisinsight/ui/src/pages/browser/BrowserPage.test.tsx +++ b/redisinsight/ui/src/pages/browser/BrowserPage.test.tsx @@ -121,7 +121,7 @@ describe('BrowserPage', () => { id: 'instanceId', name: 'test', connectionType: 'CLUSTER', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', } beforeAll(() => { diff --git a/redisinsight/ui/src/pages/browser/components/no-keys-found/NoKeysFound.spec.tsx b/redisinsight/ui/src/pages/browser/components/no-keys-found/NoKeysFound.spec.tsx index 79e2a336fb..9935531276 100644 --- a/redisinsight/ui/src/pages/browser/components/no-keys-found/NoKeysFound.spec.tsx +++ b/redisinsight/ui/src/pages/browser/components/no-keys-found/NoKeysFound.spec.tsx @@ -39,7 +39,7 @@ jest.mock('uiSrc/telemetry', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) diff --git a/redisinsight/ui/src/pages/database-analysis/DatabaseAnalysisPage.spec.tsx b/redisinsight/ui/src/pages/database-analysis/DatabaseAnalysisPage.spec.tsx index 20cdf442c3..0e754cb560 100644 --- a/redisinsight/ui/src/pages/database-analysis/DatabaseAnalysisPage.spec.tsx +++ b/redisinsight/ui/src/pages/database-analysis/DatabaseAnalysisPage.spec.tsx @@ -21,7 +21,7 @@ jest.mock('uiSrc/slices/analytics/dbAnalysis', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -65,7 +65,7 @@ describe('DatabaseAnalysisPage', () => { event: TelemetryEvent.DATABASE_ANALYSIS_HISTORY_VIEWED, eventData: { databaseId: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) diff --git a/redisinsight/ui/src/pages/database-analysis/components/analysis-data-view/AnalysisDataView.spec.tsx b/redisinsight/ui/src/pages/database-analysis/components/analysis-data-view/AnalysisDataView.spec.tsx index 6b3a74e056..ab9c5296a7 100644 --- a/redisinsight/ui/src/pages/database-analysis/components/analysis-data-view/AnalysisDataView.spec.tsx +++ b/redisinsight/ui/src/pages/database-analysis/components/analysis-data-view/AnalysisDataView.spec.tsx @@ -50,7 +50,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -442,7 +442,7 @@ describe('AnalysisDataView', () => { from: !el.checked, to: el.checked, section, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) sendEventTelemetry.mockRestore() diff --git a/redisinsight/ui/src/pages/database-analysis/components/data-nav-tabs/DatabaseAnalysisTabs.spec.tsx b/redisinsight/ui/src/pages/database-analysis/components/data-nav-tabs/DatabaseAnalysisTabs.spec.tsx index 440493a1fa..d892ab32fc 100644 --- a/redisinsight/ui/src/pages/database-analysis/components/data-nav-tabs/DatabaseAnalysisTabs.spec.tsx +++ b/redisinsight/ui/src/pages/database-analysis/components/data-nav-tabs/DatabaseAnalysisTabs.spec.tsx @@ -55,7 +55,7 @@ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ id: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -180,7 +180,7 @@ describe('DatabaseAnalysisTabs', () => { event: TelemetryEvent.DATABASE_ANALYSIS_DATA_SUMMARY_CLICKED, eventData: { databaseId: INSTANCE_ID_MOCK, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() @@ -211,7 +211,7 @@ describe('DatabaseAnalysisTabs', () => { databaseId: INSTANCE_ID_MOCK, tipsCount: 0, list: [], - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() @@ -242,7 +242,7 @@ describe('DatabaseAnalysisTabs', () => { databaseId: INSTANCE_ID_MOCK, tipsCount: 2, list: ['luaScript', 'shardHashes'], - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() diff --git a/redisinsight/ui/src/pages/database-analysis/components/header/Header.spec.tsx b/redisinsight/ui/src/pages/database-analysis/components/header/Header.spec.tsx index 671368c60d..05477a34f3 100644 --- a/redisinsight/ui/src/pages/database-analysis/components/header/Header.spec.tsx +++ b/redisinsight/ui/src/pages/database-analysis/components/header/Header.spec.tsx @@ -62,7 +62,7 @@ const connectType = (state: any, connectionType: any) => { connectedInstance: { ...state.connections.instances.connectedInstance, connectionType, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }, }, @@ -127,7 +127,7 @@ describe('DatabaseAnalysisHeader', () => { event: TelemetryEvent.DATABASE_ANALYSIS_STARTED, eventData: { databaseId: INSTANCE_ID_MOCK, - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() diff --git a/redisinsight/ui/src/pages/database-analysis/components/recommendations-view/Recommendations.spec.tsx b/redisinsight/ui/src/pages/database-analysis/components/recommendations-view/Recommendations.spec.tsx index 4cf3d37104..19f52259d4 100644 --- a/redisinsight/ui/src/pages/database-analysis/components/recommendations-view/Recommendations.spec.tsx +++ b/redisinsight/ui/src/pages/database-analysis/components/recommendations-view/Recommendations.spec.tsx @@ -58,7 +58,7 @@ jest.mock('uiSrc/slices/analytics/dbAnalysis', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -403,7 +403,7 @@ describe('Recommendations', () => { eventData: { databaseId: INSTANCE_ID_MOCK, recommendation: 'luaScript', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() @@ -420,7 +420,7 @@ describe('Recommendations', () => { eventData: { databaseId: INSTANCE_ID_MOCK, recommendation: 'luaScript', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() @@ -504,7 +504,7 @@ describe('Recommendations', () => { eventData: { databaseId: INSTANCE_ID_MOCK, recommendation: 'shardHashes', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }, }) ;(sendEventTelemetry as jest.Mock).mockRestore() diff --git a/redisinsight/ui/src/pages/home/components/cloud-connection/CloudConnectionFormWrapper.tsx b/redisinsight/ui/src/pages/home/components/cloud-connection/CloudConnectionFormWrapper.tsx index 7b1f12cc1d..691aae43ea 100644 --- a/redisinsight/ui/src/pages/home/components/cloud-connection/CloudConnectionFormWrapper.tsx +++ b/redisinsight/ui/src/pages/home/components/cloud-connection/CloudConnectionFormWrapper.tsx @@ -43,7 +43,7 @@ const CloudConnectionFormWrapper = ({ onClose }: Props) => { const formSubmit = (credentials: ICloudConnectionSubmit) => { sendEventTelemetry({ - event: TelemetryEvent.CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_SUBMITTED, + event: TelemetryEvent.CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_SUBMITTED, }) dispatch(setSSOFlow(undefined)) dispatch(fetchSubscriptionsRedisCloud(credentials, false, onSuccess)) diff --git a/redisinsight/ui/src/pages/home/components/cluster-connection/ClusterConnectionFormWrapper.tsx b/redisinsight/ui/src/pages/home/components/cluster-connection/ClusterConnectionFormWrapper.tsx index 60e49dec74..2d6765088e 100644 --- a/redisinsight/ui/src/pages/home/components/cluster-connection/ClusterConnectionFormWrapper.tsx +++ b/redisinsight/ui/src/pages/home/components/cluster-connection/ClusterConnectionFormWrapper.tsx @@ -58,7 +58,7 @@ const ClusterConnectionFormWrapper = ({ onClose }: Props) => { const formSubmit = (values: ICredentialsRedisCluster) => { sendEventTelemetry({ - event: TelemetryEvent.CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_SUBMITTED, + event: TelemetryEvent.CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_SUBMITTED, }) dispatch(fetchInstancesRedisCluster(values, onSuccess)) diff --git a/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.spec.tsx b/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.spec.tsx index 8d3e3df06b..5a54a76529 100644 --- a/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.spec.tsx +++ b/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.spec.tsx @@ -35,7 +35,7 @@ const mockInstance: Partial = { updatedAt: new Date().toISOString(), }, ], - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', } jest.mock('uiSrc/components/base/display', () => { diff --git a/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.tsx b/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.tsx index 278bd69ec3..3f88fe9e5e 100644 --- a/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.tsx +++ b/redisinsight/ui/src/pages/home/components/database-manage-tags-modal/ManageTagsModal.tsx @@ -64,8 +64,8 @@ export const ManageTagsModal = ({ ) const isSaveButtonDisabled = !isModified || hasErrors - const isCloudDb = instance.provider === ConnectionProvider.RE_CLOUD - const isClusterDb = instance.provider === ConnectionProvider.RE_CLUSTER + const isCloudDb = instance.provider === ConnectionProvider.REDIS_CLOUD + const isClusterDb = instance.provider === ConnectionProvider.REDIS_SOFTWARE const handleTagChange = useCallback( (index: number, key: 'key' | 'value', value: string) => { diff --git a/redisinsight/ui/src/pages/redis-cluster/RedisClusterDatabasesPage.tsx b/redisinsight/ui/src/pages/redis-cluster/RedisClusterDatabasesPage.tsx index edbe1a00c9..1e6e129a1a 100644 --- a/redisinsight/ui/src/pages/redis-cluster/RedisClusterDatabasesPage.tsx +++ b/redisinsight/ui/src/pages/redis-cluster/RedisClusterDatabasesPage.tsx @@ -49,7 +49,7 @@ const RedisClusterDatabasesPage = () => { const sendCancelEvent = () => { sendEventTelemetry({ - event: TelemetryEvent.CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_CANCELLED, + event: TelemetryEvent.CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_CANCELLED, }) } diff --git a/redisinsight/ui/src/pages/workbench/components/wb-no-results-message/WbNoResultsMessage.spec.tsx b/redisinsight/ui/src/pages/workbench/components/wb-no-results-message/WbNoResultsMessage.spec.tsx index 876e27f568..447d8176ea 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-no-results-message/WbNoResultsMessage.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-no-results-message/WbNoResultsMessage.spec.tsx @@ -24,7 +24,7 @@ jest.mock('uiSrc/telemetry', () => ({ jest.mock('uiSrc/slices/instances/instances', () => ({ ...jest.requireActual('uiSrc/slices/instances/instances'), connectedInstanceSelector: jest.fn().mockReturnValue({ - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', }), })) @@ -65,7 +65,7 @@ describe('WbNoResultsMessage', () => { event: TelemetryEvent.INSIGHTS_PANEL_OPENED, eventData: { databaseId: 'instanceId', - provider: 'RE_CLOUD', + provider: 'REDIS_CLOUD', source: 'workbench', }, }) diff --git a/redisinsight/ui/src/slices/interfaces/instances.ts b/redisinsight/ui/src/slices/interfaces/instances.ts index fab13a7bb4..c309e61b37 100644 --- a/redisinsight/ui/src/slices/interfaces/instances.ts +++ b/redisinsight/ui/src/slices/interfaces/instances.ts @@ -88,8 +88,8 @@ export enum ConnectionType { export enum ConnectionProvider { UNKNOWN = 'UNKNOWN', LOCALHOST = 'LOCALHOST', - RE_CLUSTER = 'RE_CLUSTER', - RE_CLOUD = 'RE_CLOUD', + REDIS_SOFTWARE = 'REDIS_SOFTWARE', + REDIS_CLOUD = 'REDIS_CLOUD', AZURE = 'AZURE', AWS = 'AWS', GOOGLE = 'GOOGLE', diff --git a/redisinsight/ui/src/telemetry/events.ts b/redisinsight/ui/src/telemetry/events.ts index 9be4862d4b..54f4a151e3 100644 --- a/redisinsight/ui/src/telemetry/events.ts +++ b/redisinsight/ui/src/telemetry/events.ts @@ -21,10 +21,10 @@ export enum TelemetryEvent { NAVIGATION_PANEL_OPENED = 'NAVIGATION_PANEL_OPENED', CONFIG_DATABASES_CLICKED = 'CONFIG_DATABASES_CLICKED', CONFIG_DATABASES_MANUALLY_SUBMITTED = 'CONFIG_DATABASES_MANUALLY_SUBMITTED', - CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_SUBMITTED = 'CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_SUBMITTED', - CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_CANCELLED = 'CONFIG_DATABASES_RE_CLUSTER_AUTODISCOVERY_CANCELLED', - CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_SUBMITTED = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_SUBMITTED', - CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_CANCELLED = 'CONFIG_DATABASES_RE_CLOUD_AUTODISCOVERY_CANCELLED', + CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_SUBMITTED = 'CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_SUBMITTED', + CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_CANCELLED = 'CONFIG_DATABASES_REDIS_SOFTWARE_AUTODISCOVERY_CANCELLED', + CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_SUBMITTED = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_SUBMITTED', + CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_CANCELLED = 'CONFIG_DATABASES_REDIS_CLOUD_AUTODISCOVERY_CANCELLED', CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_SUBMITTED = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_SUBMITTED', CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_CANCELLED = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_CANCELLED', CONFIG_DATABASES_GET_REDIS_CLOUD_ACCOUNT_CLICKED = 'CONFIG_DATABASES_GET_REDIS_CLOUD_ACCOUNT_CLICKED', diff --git a/tests/e2e/helpers/database.ts b/tests/e2e/helpers/database.ts index a59439542c..6aea6ed485 100644 --- a/tests/e2e/helpers/database.ts +++ b/tests/e2e/helpers/database.ts @@ -80,11 +80,11 @@ export class DatabaseHelper { * Add a new database from RE Cluster via auto-discover flow * @param databaseParameters The database parameters */ - async addNewREClusterDatabase( + async addNewRedisSoftwareDatabase( databaseParameters: AddNewDatabaseParameters ): Promise { // Fill the add database form - await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverREClusterDatabase( + await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRedisSoftwareDatabase( databaseParameters ); // Click on submit button @@ -138,12 +138,12 @@ export class DatabaseHelper { * @param cloudAPIAccessKey The Cloud API Access Key * @param cloudAPISecretKey The Cloud API Secret Key */ - async autodiscoverRECloudDatabase( + async autodiscoverRedisCloudDatabase( cloudAPIAccessKey: string, cloudAPISecretKey: string ): Promise { // Fill the add database form and Submit - await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRECloudDatabase( + await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRedisCloudDatabase( cloudAPIAccessKey, cloudAPISecretKey ); @@ -253,11 +253,11 @@ export class DatabaseHelper { * Accept License terms and add RE Cluster database * @param databaseParameters The database parameters */ - async acceptLicenseTermsAndAddREClusterDatabase( + async acceptLicenseTermsAndAddRedisSoftwareDatabase( databaseParameters: AddNewDatabaseParameters ): Promise { await this.acceptLicenseTerms(); - await this.addNewREClusterDatabase(databaseParameters); + await this.addNewRedisSoftwareDatabase(databaseParameters); // Connect to DB await myRedisDatabasePage.clickOnDBByName( databaseParameters.databaseName ?? '' @@ -268,7 +268,7 @@ export class DatabaseHelper { * Accept License terms and add RE Cloud database * @param databaseParameters The database parameters */ - async acceptLicenseTermsAndAddRECloudDatabase( + async acceptLicenseTermsAndAddRedisCloudDatabase( databaseParameters: AddNewDatabaseParameters ): Promise { const searchTimeout = 60 * 1000; // 60 sec to wait database appearing @@ -312,7 +312,7 @@ export class DatabaseHelper { * Add RE Cloud database * @param databaseParameters The database parameters */ - async addRECloudDatabase( + async addRedisCloudDatabase( databaseParameters: AddNewDatabaseParameters ): Promise { const searchTimeout = 60 * 1000; // 60 sec to wait database appearing diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts index dc30fa01ef..ac8e58e36c 100644 --- a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts @@ -203,7 +203,7 @@ export class AddRedisDatabaseDialog { * Adding a new database from RE Cluster via auto-discover flow * @param parameters the parameters of the database */ - async addAutodiscoverREClusterDatabase(parameters: AddNewDatabaseParameters): Promise { + async addAutodiscoverRedisSoftwareDatabase(parameters: AddNewDatabaseParameters): Promise { await t .click(this.addDatabaseButton) @@ -220,7 +220,7 @@ export class AddRedisDatabaseDialog { * Adding a new database from RE Cloud via auto-discover flow * @param parameters the parameters of the database */ - async addAutodiscoverRECloudDatabase(cloudAPIAccessKey: string, cloudAPISecretKey: string): Promise { + async addAutodiscoverRedisCloudDatabase(cloudAPIAccessKey: string, cloudAPISecretKey: string): Promise { await t .click(this.addDatabaseButton) diff --git a/tests/e2e/tests/electron/regression/browser/keys-all-databases.e2e.ts b/tests/e2e/tests/electron/regression/browser/keys-all-databases.e2e.ts index ed595d597f..d6464d1330 100644 --- a/tests/e2e/tests/electron/regression/browser/keys-all-databases.e2e.ts +++ b/tests/e2e/tests/electron/regression/browser/keys-all-databases.e2e.ts @@ -34,7 +34,7 @@ fixture `Work with keys in all types of databases` test .meta({ rte: rte.reCluster }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddREClusterDatabase(redisEnterpriseClusterConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisSoftwareDatabase(redisEnterpriseClusterConfig); }) .after(async() => { // Clear and delete database diff --git a/tests/e2e/tests/electron/regression/cli/cli-re-cluster.e2e.ts b/tests/e2e/tests/electron/regression/cli/cli-re-cluster.e2e.ts index 867b6b9d31..078f0130f3 100644 --- a/tests/e2e/tests/electron/regression/cli/cli-re-cluster.e2e.ts +++ b/tests/e2e/tests/electron/regression/cli/cli-re-cluster.e2e.ts @@ -34,7 +34,7 @@ fixture `Work with CLI in RE Cluster` test.skip .meta({ rte: rte.reCluster }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddREClusterDatabase(redisEnterpriseClusterConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisSoftwareDatabase(redisEnterpriseClusterConfig); }) .after(async() => { // Clear and delete database diff --git a/tests/e2e/tests/electron/regression/workbench/workbench-re-cluster.e2e.ts b/tests/e2e/tests/electron/regression/workbench/workbench-re-cluster.e2e.ts index da48b94a7e..da2735c850 100644 --- a/tests/e2e/tests/electron/regression/workbench/workbench-re-cluster.e2e.ts +++ b/tests/e2e/tests/electron/regression/workbench/workbench-re-cluster.e2e.ts @@ -40,7 +40,7 @@ fixture `Work with Workbench in RE Cluster` test.skip .meta({ rte: rte.reCluster }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddREClusterDatabase(redisEnterpriseClusterConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisSoftwareDatabase(redisEnterpriseClusterConfig); }) .after(async() => { // Delete database diff --git a/tests/e2e/tests/electron/smoke/database/autodiscover-db.e2e.ts b/tests/e2e/tests/electron/smoke/database/autodiscover-db.e2e.ts index ff177cf187..a34867db94 100644 --- a/tests/e2e/tests/electron/smoke/database/autodiscover-db.e2e.ts +++ b/tests/e2e/tests/electron/smoke/database/autodiscover-db.e2e.ts @@ -20,7 +20,7 @@ test.skip .after(async() => { await databaseHelper.deleteDatabase(redisEnterpriseClusterConfig.databaseName); })('Verify that user can add database from RE Cluster via auto-discover flow', async() => { - await databaseHelper.addNewREClusterDatabase(redisEnterpriseClusterConfig); + await databaseHelper.addNewRedisSoftwareDatabase(redisEnterpriseClusterConfig); // Verify that user can see an indicator of databases that are added using autodiscovery and not opened yet // Verify new connection badge for RE cluster await myRedisDatabasePage.verifyDatabaseStatusIsVisible(redisEnterpriseClusterConfig.databaseName); diff --git a/tests/e2e/tests/electron/smoke/database/edit-db.e2e.ts b/tests/e2e/tests/electron/smoke/database/edit-db.e2e.ts index 0b43105915..425d6c80c4 100644 --- a/tests/e2e/tests/electron/smoke/database/edit-db.e2e.ts +++ b/tests/e2e/tests/electron/smoke/database/edit-db.e2e.ts @@ -24,7 +24,7 @@ test.skip // Delete database await databaseHelper.deleteDatabase(redisEnterpriseClusterConfig.databaseName); })('Verify that user can connect to the RE cluster database', async t => { - await databaseHelper.addNewREClusterDatabase(redisEnterpriseClusterConfig); + await databaseHelper.addNewRedisSoftwareDatabase(redisEnterpriseClusterConfig); await myRedisDatabasePage.clickOnDBByName(redisEnterpriseClusterConfig.databaseName); await t.expect(getPageUrl()).contains('browser', 'The edit view is not opened'); }); diff --git a/tests/e2e/tests/web/critical-path/database/export-databases.e2e.ts b/tests/e2e/tests/web/critical-path/database/export-databases.e2e.ts index 2bee8d4590..bc193d9a87 100644 --- a/tests/e2e/tests/web/critical-path/database/export-databases.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/export-databases.e2e.ts @@ -105,7 +105,7 @@ test .before(async() => { await databaseHelper.acceptLicenseTerms(); await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneTlsConfig); - await databaseHelper.addRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.addRedisCloudDatabase(cloudDatabaseConfig); await databaseAPIRequests.discoverSentinelDatabaseApi(ossSentinelConfig); await myRedisDatabasePage.reloadPage(); }) diff --git a/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts index 21fab3e873..19b7339020 100644 --- a/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts +++ b/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts @@ -52,7 +52,7 @@ test.after(async() => { await databaseAPIRequests.deleteAllDatabasesApi(); })('Verify that user can test connection', async() => { await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase); - await databaseHelper.autodiscoverRECloudDatabase( + await databaseHelper.autodiscoverRedisCloudDatabase( cloudDatabaseConfig.accessKey, cloudDatabaseConfig.secretKey ); diff --git a/tests/e2e/tests/web/critical-path/rdi/deploy.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/deploy.e2e.ts index 81b0fa09d1..5357ba1b31 100644 --- a/tests/e2e/tests/web/critical-path/rdi/deploy.e2e.ts +++ b/tests/e2e/tests/web/critical-path/rdi/deploy.e2e.ts @@ -57,7 +57,7 @@ test.after(async() => { await rdiApiRequests.deleteAllRdiApi(); })('Verify that deploy and reset work', async() => { await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase); - await databaseHelper.autodiscoverRECloudDatabase( + await databaseHelper.autodiscoverRedisCloudDatabase( cloudDatabaseConfig.accessKey, cloudDatabaseConfig.secretKey ); diff --git a/tests/e2e/tests/web/regression/browser/keys-all-databases.e2e.ts b/tests/e2e/tests/web/regression/browser/keys-all-databases.e2e.ts index 711144a827..0071c0f572 100644 --- a/tests/e2e/tests/web/regression/browser/keys-all-databases.e2e.ts +++ b/tests/e2e/tests/web/regression/browser/keys-all-databases.e2e.ts @@ -42,7 +42,7 @@ fixture `Work with keys in all types of databases` test .meta({ rte: rte.reCloud }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisCloudDatabase(cloudDatabaseConfig); }) .after(async() => { // Clear and delete database diff --git a/tests/e2e/tests/web/regression/cli/cli-all-db-types.e2e.ts b/tests/e2e/tests/web/regression/cli/cli-all-db-types.e2e.ts index 0d8a780b16..c85d090a2d 100644 --- a/tests/e2e/tests/web/regression/cli/cli-all-db-types.e2e.ts +++ b/tests/e2e/tests/web/regression/cli/cli-all-db-types.e2e.ts @@ -42,7 +42,7 @@ test('Verify that user can add data via CLI in RE Cloud DB', async() => { }).skip .meta({ rte: rte.reCloud, skipComment: "Unstable in CI, assertion error, needs investigation" }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisCloudDatabase(cloudDatabaseConfig); }) .after(async() => { // Clear and delete database diff --git a/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts b/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts index d7e54727d2..dfa1179b1d 100644 --- a/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts +++ b/tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts @@ -76,7 +76,7 @@ test('Verify that when users hover over keys icon in Overview for Cloud DB, they .skip .meta({ rte: rte.reCloud, skipComment: "Unstable CI execution, assertion failure, needs investigation" }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisCloudDatabase(cloudDatabaseConfig); }) .after(async() => { // Delete database diff --git a/tests/e2e/tests/web/regression/database-overview/overview.e2e.ts b/tests/e2e/tests/web/regression/database-overview/overview.e2e.ts index 50128b2462..b75402e366 100644 --- a/tests/e2e/tests/web/regression/database-overview/overview.e2e.ts +++ b/tests/e2e/tests/web/regression/database-overview/overview.e2e.ts @@ -10,7 +10,7 @@ fixture `Overview` .meta({ type: 'regression', rte: rte.reCloud }) .page(commonUrl) .beforeEach(async() => { - await databaseHelper.acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisCloudDatabase(cloudDatabaseConfig); }) .afterEach(async() => { // Delete database diff --git a/tests/e2e/tests/web/regression/workbench/workbench-all-db-types.e2e.ts b/tests/e2e/tests/web/regression/workbench/workbench-all-db-types.e2e.ts index 9a3b0bec42..078324f50e 100644 --- a/tests/e2e/tests/web/regression/workbench/workbench-all-db-types.e2e.ts +++ b/tests/e2e/tests/web/regression/workbench/workbench-all-db-types.e2e.ts @@ -43,7 +43,7 @@ fixture `Work with Workbench in all types of databases` test .meta({ rte: rte.reCloud }) .before(async() => { - await databaseHelper.acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.acceptLicenseTermsAndAddRedisCloudDatabase(cloudDatabaseConfig); }) .after(async() => { // Delete database diff --git a/tests/e2e/tests/web/smoke/database/autodiscover-db.e2e.ts b/tests/e2e/tests/web/smoke/database/autodiscover-db.e2e.ts index 0ceb2b91cd..f288b893f0 100644 --- a/tests/e2e/tests/web/smoke/database/autodiscover-db.e2e.ts +++ b/tests/e2e/tests/web/smoke/database/autodiscover-db.e2e.ts @@ -22,7 +22,7 @@ test.skip .after(async() => { await databaseHelper.deleteDatabase(cloudDatabaseConfig.databaseName); })('Verify that user can add database from RE Cloud', async() => { - await databaseHelper.addRECloudDatabase(cloudDatabaseConfig); + await databaseHelper.addRedisCloudDatabase(cloudDatabaseConfig); // Verify new connection badge for RE cloud await myRedisDatabasePage.verifyDatabaseStatusIsVisible(cloudDatabaseConfig.databaseName); // Verify redis stack icon for RE Cloud with all 5 modules @@ -31,7 +31,7 @@ test.skip // unskip after closing https://redislabs.atlassian.net/browse/RI-5768 test.skip .meta({ rte: rte.reCloud })('Verify that user can add a subscription via auto-discover flow', async t => { - await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRECloudDatabase( + await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRedisCloudDatabase( cloudDatabaseConfig.accessKey, cloudDatabaseConfig.secretKey ); diff --git a/tests/playwright/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/playwright/pageObjects/dialogs/add-redis-database-dialog.ts index 95256a2cdf..65887cbedd 100644 --- a/tests/playwright/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/playwright/pageObjects/dialogs/add-redis-database-dialog.ts @@ -261,7 +261,7 @@ export class AddRedisDatabaseDialog extends BasePage { } } - async addAutodiscoverREClusterDatabase( + async addAutodiscoverRedisSoftwareDatabase( parameters: AddNewDatabaseParameters, ): Promise { await this.addDatabaseButton.click() @@ -272,7 +272,7 @@ export class AddRedisDatabaseDialog extends BasePage { await this.passwordInput.fill(parameters.databasePassword || '') } - async addAutodiscoverRECloudDatabase( + async addAutodiscoverRedisCloudDatabase( cloudAPIAccessKey: string, cloudAPISecretKey: string, ): Promise {