From f8476cff0b3ad876b5ddd0d3708083c5f946d758 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Tue, 25 Jan 2022 13:45:11 +0300 Subject: [PATCH] Pass updateChecker for LensExtension instances Signed-off-by: Alex Andreev --- package.json | 2 +- src/extensions/bundled-latest-version-checker.ts | 2 +- .../create-extension-instance/create-extension-instance.ts | 5 +++-- src/extensions/lens-extension.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f3dfffd368..594ac1aa4f 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "bundledKubectlVersion": "1.21.2", "bundledHelmVersion": "3.6.3", "sentryDsn": "", - "extensionUpdateUrl": "https://lens-binaries.s3-eu-west-1.amazonaws.com/extensions/versions.json" + "extensionUpdateUrl": "https://lens-binaries.s3-eu-west-1.amazonaws.com/extensions" }, "engines": { "node": ">=14 <15" diff --git a/src/extensions/bundled-latest-version-checker.ts b/src/extensions/bundled-latest-version-checker.ts index 2f694be39b..b911e0582b 100644 --- a/src/extensions/bundled-latest-version-checker.ts +++ b/src/extensions/bundled-latest-version-checker.ts @@ -26,7 +26,7 @@ export class BundledVersionChecker implements LensExtensionLatestVersionChecker return null; } - const json = await this.getJson(extensionUpdateUrl); + const json = await this.getJson(`${extensionUpdateUrl}/versions.json`); if (!json || json.error || !json[manifest.name]) { logger.info(`[BUNDLED-EXTENSIONS-UPDATER]: No version found for ${manifest.name}.`); diff --git a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts index 35a4e67e1a..344bf26cfc 100644 --- a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts +++ b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts @@ -8,11 +8,12 @@ import { LensExtensionDependencies, setLensExtensionDependencies, } from "../../lens-extension-set-dependencies"; +import type { LensExtensionUpdateChecker } from "../../lens-extension-update-checker"; export const createExtensionInstance = (dependencies: LensExtensionDependencies) => - (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => { - const instance = new ExtensionClass(extension); + (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension, updateChecker?: LensExtensionUpdateChecker) => { + const instance = new ExtensionClass(extension, updateChecker); instance[setLensExtensionDependencies](dependencies); diff --git a/src/extensions/lens-extension.ts b/src/extensions/lens-extension.ts index def4ac1d9a..a4d7015d02 100644 --- a/src/extensions/lens-extension.ts +++ b/src/extensions/lens-extension.ts @@ -124,7 +124,7 @@ export class LensExtension { public async checkForUpdate() { - return this.updateChecker?.run(this.manifest); + return this.updateChecker?.run(this.manifest, this.isBundled); } protected onActivate(): Promise | void {