Skip to content

#RI-2998-add useSNI to add db telemetry event #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2022
Merged

#RI-2998-add useSNI to add db telemetry event #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7185d5
#RI-2998-add useSNI to add db telemetry event
AmirAllayarovSofteq Jun 9, 2022
640275d
#RI-2998-fix tests
AmirAllayarovSofteq Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions redisinsight/api/src/__mocks__/redis-databases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const mockStandaloneDatabaseEntity: DatabaseInstanceEntity = {
provider: HostingProvider.LOCALHOST,
modules: '[]',
encryption: null,
tlsServername: 'server-name',
};

export const mockOSSClusterDatabaseEntity: DatabaseInstanceEntity = {
Expand Down
1 change: 1 addition & 0 deletions redisinsight/api/src/modules/core/services/redis/redis.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jest.mock('ioredis');

const mockTlsConfigResult: ConnectionOptions = {
rejectUnauthorized: true,
servername: mockStandaloneDatabaseEntity.tlsServername,
checkServerIdentity: () => undefined,
ca: [mockCaCertDto.cert],
key: mockClientCertDto.key,
Expand Down
8 changes: 6 additions & 2 deletions ...ht/api/src/modules/shared/services/instances-business/instances-analytics.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const mockDatabaseInstanceDto: DatabaseInstanceResponse = {
verifyServerCert: true,
caCertId: mockCaCertEntity.id,
clientCertPairId: mockClientCertEntity.id,
servername: mockStandaloneDatabaseEntity.tlsServername,
},
modules: [],
};
Expand Down Expand Up @@ -100,7 +101,7 @@ describe('InstancesAnalytics', () => {
});

describe('sendInstanceAddedEvent', () => {
it('should emit event with enabled tls', () => {
it('should emit event with enabled tls and sni', () => {
const instance = mockDatabaseInstanceDto;
service.sendInstanceAddedEvent(instance, mockRedisGeneralInfo);

Expand All @@ -113,6 +114,7 @@ describe('InstancesAnalytics', () => {
useTLS: 'enabled',
verifyTLSCertificate: 'enabled',
useTLSAuthClients: 'enabled',
useSNI: 'enabled',
version: mockRedisGeneralInfo.version,
numberOfKeys: mockRedisGeneralInfo.totalKeys,
numberOfKeysRange: '0 - 500 000',
Expand All @@ -123,7 +125,7 @@ describe('InstancesAnalytics', () => {
},
);
});
it('should emit event with disabled tls', () => {
it('should emit event with disabled tls and sni', () => {
const instance = {
...mockDatabaseInstanceDto,
tls: undefined,
Expand All @@ -139,6 +141,7 @@ describe('InstancesAnalytics', () => {
useTLS: 'disabled',
verifyTLSCertificate: 'disabled',
useTLSAuthClients: 'disabled',
useSNI: 'disabled',
version: mockRedisGeneralInfo.version,
numberOfKeys: mockRedisGeneralInfo.totalKeys,
numberOfKeysRange: '0 - 500 000',
Expand Down Expand Up @@ -167,6 +170,7 @@ describe('InstancesAnalytics', () => {
useTLS: 'enabled',
verifyTLSCertificate: 'enabled',
useTLSAuthClients: 'enabled',
useSNI: 'enabled',
version: mockRedisGeneralInfo.version,
numberOfKeys: undefined,
numberOfKeysRange: undefined,
Expand Down
3 changes: 3 additions & 0 deletions ...insight/api/src/modules/shared/services/instances-business/instances-analytics.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ export class InstancesAnalyticsService extends TelemetryBaseService {
useTLSAuthClients: instance?.tls?.clientCertPairId
? 'enabled'
: 'disabled',
useSNI: instance?.tls?.servername
? 'enabled'
: 'disabled',
version: additionalInfo.version,
numberOfKeys: additionalInfo.totalKeys,
numberOfKeysRange: getRangeForNumber(additionalInfo.totalKeys, TOTAL_KEYS_BREAKPOINTS),
Expand Down
1 change: 1 addition & 0 deletions ...ght/api/src/modules/shared/services/instances-business/instances-business.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const addDatabaseDto: AddDatabaseInstanceDto = {
verifyServerCert: true,
caCertId: mockCaCertEntity.id,
clientCertPairId: mockClientCertEntity.id,
servername: mockStandaloneDatabaseEntity.tlsServername,
},
};

Expand Down