1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-09 00:18:00 +01:00

fix: allow instance ID to be empty for metrics (#1471)

This commit is contained in:
olav 2022-04-01 10:34:22 +02:00 committed by GitHub
parent be21a2af68
commit cf06b562f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions

View File

@ -192,7 +192,6 @@ test('should set lastSeen on toggle', async () => {
.post('/api/client/metrics') .post('/api/client/metrics')
.send({ .send({
appName: 'demo', appName: 'demo',
instanceId: '1',
bucket: { bucket: {
start: Date.now(), start: Date.now(),
stop: Date.now(), stop: Date.now(),

View File

@ -83,3 +83,16 @@ test('should require strategies field', () => {
}) })
.expect(400); .expect(400);
}); });
test('should allow an empty instanceId field', () => {
expect.assertions(0);
return request
.post('/api/client/register')
.send({
appName: 'demo',
strategies: ['default'],
started: Date.now(),
interval: 10,
})
.expect(202);
});

View File

@ -18,6 +18,7 @@ import { clientRegisterSchema } from './schema';
import { minutesToMilliseconds, secondsToMilliseconds } from 'date-fns'; import { minutesToMilliseconds, secondsToMilliseconds } from 'date-fns';
import { IClientMetricsStoreV2 } from '../../types/stores/client-metrics-store-v2'; import { IClientMetricsStoreV2 } from '../../types/stores/client-metrics-store-v2';
import { clientMetricsSchema } from './schema'; import { clientMetricsSchema } from './schema';
import { PartialSome } from '../../types/partial';
export default class ClientInstanceService { export default class ClientInstanceService {
apps = {}; apps = {};
@ -90,7 +91,7 @@ export default class ClientInstanceService {
} }
public async registerInstance( public async registerInstance(
data: IClientApp, data: PartialSome<IClientApp, 'instanceId'>,
clientIp: string, clientIp: string,
): Promise<void> { ): Promise<void> {
const value = await clientMetricsSchema.validateAsync(data); const value = await clientMetricsSchema.validateAsync(data);
@ -103,7 +104,7 @@ export default class ClientInstanceService {
} }
public async registerClient( public async registerClient(
data: IClientApp, data: PartialSome<IClientApp, 'instanceId'>,
clientIp: string, clientIp: string,
): Promise<void> { ): Promise<void> {
const value = await clientRegisterSchema.validateAsync(data); const value = await clientRegisterSchema.validateAsync(data);

View File

@ -15,7 +15,7 @@ export const clientMetricsSchema = joi
.keys({ .keys({
environment: joi.string().optional(), environment: joi.string().optional(),
appName: joi.string().required(), appName: joi.string().required(),
instanceId: joi.string().required(), instanceId: joi.string().default('default'),
bucket: joi bucket: joi
.object() .object()
.required() .required()
@ -48,7 +48,7 @@ export const clientRegisterSchema = joi
.options({ stripUnknown: true }) .options({ stripUnknown: true })
.keys({ .keys({
appName: joi.string().required(), appName: joi.string().required(),
instanceId: joi.string().required(), instanceId: joi.string().default('default'),
sdkVersion: joi.string().optional(), sdkVersion: joi.string().optional(),
strategies: joi strategies: joi
.array() .array()