Fully convert ExtensionDiscovery to be injectable

- To fix unit tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/main/__test__/kube-auth-proxy.test.ts

@@ -24,7 +24,7 @@ import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
 import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
 import writeJsonSyncInjectable from "../../common/fs/write-json-sync.injectable";
-import ensureDirInjectable from "../../common/fs/ensure-dir.injectable";
+import ensureDirectoryInjectable from "../../common/fs/ensure-directory.injectable";
 import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable";
 import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable";
 
@@ -45,7 +45,7 @@ describe("kube auth proxy tests", () => {
     di.override(directoryForTempInjectable, () => "/some-directory-for-temp");
 
     const writeJsonSync = di.inject(writeJsonSyncInjectable);
-    const ensureDir = di.inject(ensureDirInjectable);
+    const ensureDir = di.inject(ensureDirectoryInjectable);
 
     getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
 

packages/core/src/main/getDiForUnitTesting.ts

@@ -7,7 +7,6 @@ import { chunk } from "lodash/fp";
 import type { DiContainer } from "@ogre-tools/injectable";
 import { isInjectable } from "@ogre-tools/injectable";
 import spawnInjectable from "./child-process/spawn.injectable";
-import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable";
 import setupIpcMainHandlersInjectable from "./electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable";
 import setupLensProxyInjectable from "./start-main-application/runnables/setup-lens-proxy.injectable";
 import setupSyncingOfWeblinksInjectable from "./start-main-application/runnables/setup-syncing-of-weblinks.injectable";
@@ -82,7 +81,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 // TODO: Reorganize code in Runnables to get rid of requirement for override
 const overrideRunnablesHavingSideEffects = (di: DiContainer) => {
   [
-    initializeExtensionsInjectable,
     initializeClusterManagerInjectable,
     setupIpcMainHandlersInjectable,
     setupLensProxyInjectable,

packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts

@@ -1,56 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import loggerInjectable from "../../../common/logger.injectable";
-import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
-import autoInitExtensionsInjectable from "../../../features/extensions/loader/common/auto-init-extensions.injectable";
-import removeExtensionInstanceInjectable from "../../../features/extensions/loader/common/remove-instance.injectable";
-import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
-import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
-
-const initializeExtensionsInjectable = getInjectable({
-  id: "initialize-extensions",
-
-  instantiate: (di) => {
-    const logger = di.inject(loggerInjectable);
-    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
-    const showErrorPopup = di.inject(showErrorPopupInjectable);
-    const removeExtensionInstance = di.inject(removeExtensionInstanceInjectable);
-    const autoInitExtensions = di.inject(autoInitExtensionsInjectable);
-
-    return {
-      id: "initialize-extensions",
-      run: async () => {
-        logger.info("🧩 Initializing extensions");
-
-        await extensionDiscovery.init();
-
-        await autoInitExtensions();
-
-        try {
-          await extensionDiscovery.load();
-          extensionDiscovery.events.on("remove", (ext) => removeExtensionInstance(ext.id));
-
-          // Start watching after bundled extensions are loaded
-          extensionDiscovery.watchExtensions();
-        } catch (error: any) {
-          showErrorPopup(
-            "Lens Error",
-            `Could not load extensions${error?.message ? `: ${error.message}` : ""}`,
-          );
-
-          console.error(error);
-          console.trace();
-        }
-      },
-    };
-  },
-
-  causesSideEffects: true,
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default initializeExtensionsInjectable;

packages/core/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { afterApplicationIsLoadedInjectionToken } from "../../runnable-tokens/after-application-is-loaded-injection-token";
 import directoryForKubeConfigsInjectable from "../../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
-import ensureDirInjectable from "../../../../common/fs/ensure-dir.injectable";
+import ensureDirectoryInjectable from "../../../../common/fs/ensure-directory.injectable";
 import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync/manager.injectable";
 import addKubeconfigSyncAsEntitySourceInjectable from "./add-source.injectable";
 
@@ -15,7 +15,7 @@ const startKubeConfigSyncInjectable = getInjectable({
   instantiate: (di) => {
     const directoryForKubeConfigs = di.inject(directoryForKubeConfigsInjectable);
     const kubeConfigSyncManager = di.inject(kubeconfigSyncManagerInjectable);
-    const ensureDir = di.inject(ensureDirInjectable);
+    const ensureDir = di.inject(ensureDirectoryInjectable);
 
     return {
       id: "start-kubeconfig-sync",