diff --git a/packages/core/package.json b/packages/core/package.json index 01b828df..cb7b2856 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -33,6 +33,7 @@ "brightsec" ], "secTester": { + "name": "sec-tester-js", "repeaterVersion": "8.8.0" } } diff --git a/packages/core/src/configuration/Configuration.ts b/packages/core/src/configuration/Configuration.ts index 3d7e302b..aa3e37e4 100644 --- a/packages/core/src/configuration/Configuration.ts +++ b/packages/core/src/configuration/Configuration.ts @@ -6,7 +6,7 @@ import { } from '../credentials-provider'; import { first } from '../utils'; import { LogLevel } from '../logger'; -import { name, secTester } from '../../package.json'; +import { version, secTester } from '../../package.json'; import { container, injectable } from 'tsyringe'; export interface ConfigurationOptions { @@ -57,12 +57,19 @@ export class Configuration { return this._logLevel; } - get version(): string { + /** + * @deprecated use {@link version} right after v1 has been released + */ + get repeaterVersion(): string { return secTester.repeaterVersion; } - get name() { - return name; + get version(): string { + return version; + } + + get name(): string { + return secTester.name; } constructor({ diff --git a/packages/repeater/src/lib/Repeater.spec.ts b/packages/repeater/src/lib/Repeater.spec.ts index f46bd542..43d63ced 100644 --- a/packages/repeater/src/lib/Repeater.spec.ts +++ b/packages/repeater/src/lib/Repeater.spec.ts @@ -41,7 +41,7 @@ describe('Repeater', () => { beforeEach(() => { when(mockedContainer.resolve(Logger)).thenReturn(instance(mockedLogger)); when(mockedContainer.isRegistered(Logger, anything())).thenReturn(true); - when(mockedConfiguration.version).thenReturn(version); + when(mockedConfiguration.repeaterVersion).thenReturn(version); when(mockedConfiguration.container).thenReturn(instance(mockedContainer)); when( mockedEventBus.execute(anyOfClass(RegisterRepeaterCommand)) diff --git a/packages/repeater/src/lib/Repeater.ts b/packages/repeater/src/lib/Repeater.ts index 7ed8495a..da756c64 100644 --- a/packages/repeater/src/lib/Repeater.ts +++ b/packages/repeater/src/lib/Repeater.ts @@ -90,7 +90,7 @@ export class Repeater { private async register(): Promise { const res = await this.bus.execute( new RegisterRepeaterCommand({ - version: this.configuration.version, + version: this.configuration.repeaterVersion, repeaterId: this.repeaterId }) ); @@ -144,7 +144,7 @@ export class Repeater { if ('error' in payload) { this.handleRegisterError(payload.error); } else { - if (gt(payload.version, this.configuration.version)) { + if (gt(payload.version, this.configuration.repeaterVersion)) { this.logger?.warn( '%s: A new Repeater version (%s) is available, please update @sec-tester.', chalk.yellow('(!) IMPORTANT'),