diff --git a/src/lib/create-config.ts b/src/lib/create-config.ts index 924b69e3dc..d7d87cce1d 100644 --- a/src/lib/create-config.ts +++ b/src/lib/create-config.ts @@ -196,6 +196,7 @@ export function createConfig(options: IUnleashOptions): IUnleashConfig { preHook: options.preHook, preRouterHook: options.preRouterHook, eventHook: options.eventHook, + enterpriseVersion: options.enterpriseVersion, }; } diff --git a/src/lib/services/versions-service.test.js b/src/lib/services/version-service.test.js similarity index 99% rename from src/lib/services/versions-service.test.js rename to src/lib/services/version-service.test.js index f88edd42a3..f76e14459c 100644 --- a/src/lib/services/versions-service.test.js +++ b/src/lib/services/version-service.test.js @@ -65,8 +65,8 @@ test.serial('supports setting enterprise version as well', async t => { getLogger, versionCheck: { url: testurl, enable: true }, version, + enterpriseVersion, }, - enterpriseVersion, ); await service.checkLatestVersion(); fetchMock.done(); @@ -104,8 +104,8 @@ test.serial( getLogger, versionCheck: { url: testurl, enable: false }, version, + enterpriseVersion, }, - enterpriseVersion, ); await service.checkLatestVersion(); t.false(fetchMock.called(testurl)); diff --git a/src/lib/services/version-service.ts b/src/lib/services/version-service.ts index 562c7e4452..32ab1aed70 100644 --- a/src/lib/services/version-service.ts +++ b/src/lib/services/version-service.ts @@ -41,14 +41,17 @@ export default class VersionService { { getLogger, versionCheck, - }: Pick, - enterpriseVersion?: string, + enterpriseVersion, + }: Pick< + IUnleashConfig, + 'getLogger' | 'versionCheck' | 'enterpriseVersion' + >, ) { this.logger = getLogger('lib/services/version-service.js'); this.settingStore = settingStore; this.current = { oss: version, - enterprise: enterpriseVersion, + enterprise: enterpriseVersion || '', }; this.enabled = versionCheck.enable; this.versionCheckUrl = versionCheck.url; diff --git a/src/lib/types/option.ts b/src/lib/types/option.ts index 78a472f360..43bc44ec02 100644 --- a/src/lib/types/option.ts +++ b/src/lib/types/option.ts @@ -87,6 +87,7 @@ export interface IUnleashOptions { preHook?: Function; preRouterHook?: Function; eventHook?: Function; + enterpriseVersion?: string; } export interface IEmailOption { @@ -125,4 +126,5 @@ export interface IUnleashConfig { preHook?: Function; preRouterHook?: Function; eventHook?: Function; + enterpriseVersion?: string; }