Adapt to new version of ogre-tools

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/core/src/common/__tests__/cluster-store.test.ts

@@ -74,8 +74,7 @@ describe("cluster-store", () => {
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(normalizedPlatformInjectable, () => "darwin");
-    createCluster = di.inject(createClusterInjectionToken);
+
-    getCustomKubeConfigFilePath = di.inject(getCustomKubeConfigFilePathInjectable);
     writeJsonSync = di.inject(writeJsonSyncInjectable);
     writeFileSync = di.inject(writeFileSyncInjectable);
     writeBufferSync = di.inject(writeBufferSyncInjectable);
@@ -85,6 +84,9 @@ describe("cluster-store", () => {
 
   describe("empty config", () => {
     beforeEach(async () => {
+      createCluster = di.inject(createClusterInjectionToken);
+      getCustomKubeConfigFilePath = di.inject(getCustomKubeConfigFilePathInjectable);
+
       writeJsonSync("/some-directory-for-user-data/lens-cluster-store.json", {});
       clusterStore = di.inject(clusterStoreInjectable);
       clusterStore.load();
@@ -198,6 +200,10 @@ describe("cluster-store", () => {
           },
         ],
       });
+
+      createCluster = di.inject(createClusterInjectionToken);
+      getCustomKubeConfigFilePath = di.inject(getCustomKubeConfigFilePathInjectable);
+
       clusterStore = di.inject(clusterStoreInjectable);
       clusterStore.load();
     });
@@ -249,6 +255,10 @@ describe("cluster-store", () => {
           },
         ],
       });
+
+      createCluster = di.inject(createClusterInjectionToken);
+      getCustomKubeConfigFilePath = di.inject(getCustomKubeConfigFilePathInjectable);
+
       clusterStore = di.inject(clusterStoreInjectable);
       clusterStore.load();
     });
@@ -262,6 +272,11 @@ describe("cluster-store", () => {
 
   describe("pre 3.6.0-beta.1 config with an existing cluster", () => {
     beforeEach(() => {
+      di.override(storeMigrationVersionInjectable, () => "3.6.0");
+
+      createCluster = di.inject(createClusterInjectionToken);
+      getCustomKubeConfigFilePath = di.inject(getCustomKubeConfigFilePathInjectable);
+
       writeJsonSync("/some-directory-for-user-data/lens-cluster-store.json", {
         __internal__: {
           migrations: {
@@ -281,7 +296,6 @@ describe("cluster-store", () => {
       });
       writeBufferSync("/some-directory-for-user-data/icon_path", testDataIcon);
 
-      di.override(storeMigrationVersionInjectable, () => "3.6.0");
 
       clusterStore = di.inject(clusterStoreInjectable);
       clusterStore.load();

packages/core/src/common/__tests__/user-store.test.ts

@@ -30,9 +30,9 @@ describe("user store tests", () => {
       get: () => "latest" as const,
       init: async () => {},
     }));
+
     await di.inject(defaultUpdateChannelInjectable).init();
 
-    userStore = di.inject(userStoreInjectable);
   });
 
   describe("for an empty config", () => {
@@ -42,6 +42,8 @@ describe("user store tests", () => {
       writeJsonSync("/some-directory-for-user-data/lens-user-store.json", {});
       writeJsonSync("/some-directory-for-user-data/kube_config", {});
 
+      userStore = di.inject(userStoreInjectable);
+
       userStore.load();
     });
 
@@ -90,6 +92,8 @@ describe("user store tests", () => {
 
       di.override(storeMigrationVersionInjectable, () => "10.0.0");
 
+      userStore = di.inject(userStoreInjectable);
+
       userStore.load();
     });
 

packages/core/src/common/k8s-api/__tests__/api-manager.test.ts

@@ -4,7 +4,6 @@
  */
 
 import type { DiContainer } from "@ogre-tools/injectable";
-import createClusterInjectable from "../../../main/create-cluster/create-cluster.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../renderer/cluster-frame-context/for-namespaced-resources.injectable";
 import hostedClusterInjectable from "../../../renderer/cluster-frame-context/hosted-cluster.injectable";
 import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting";
@@ -18,6 +17,7 @@ import { KubeApi } from "../kube-api";
 import { KubeObject } from "../kube-object";
 import { KubeObjectStore } from "../kube-object.store";
 import maybeKubeApiInjectable from "../maybe-kube-api.injectable";
+import { createClusterInjectionToken } from "../../cluster/create-cluster-injection-token";
 
 // eslint-disable-next-line no-restricted-imports
 import { KubeApi as ExternalKubeApi } from "../../../extensions/common-api/k8s-api";
@@ -43,7 +43,7 @@ describe("ApiManager", () => {
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
-    const createCluster = di.inject(createClusterInjectable);
+    const createCluster = di.inject(createClusterInjectionToken);
 
     di.override(hostedClusterInjectable, () => createCluster({
       contextName: "some-context-name",

packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts

@@ -15,7 +15,6 @@ import setupAutoRegistrationInjectable from "../../../renderer/before-frame-star
 import { createMockResponseFromString } from "../../../test-utils/mock-responses";
 import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable";
 import directoryForUserDataInjectable from "../../app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import createClusterInjectable from "../../../main/create-cluster/create-cluster.injectable";
 import hostedClusterInjectable from "../../../renderer/cluster-frame-context/hosted-cluster.injectable";
 import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import apiManagerInjectable from "../api-manager/manager.injectable";
@@ -23,6 +22,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import ingressApiInjectable from "../endpoints/ingress.api.injectable";
 import loggerInjectable from "../../logger.injectable";
 import maybeKubeApiInjectable from "../maybe-kube-api.injectable";
+import { createClusterInjectionToken } from "../../cluster/create-cluster-injection-token";
 
 describe("KubeApi", () => {
   let fetchMock: AsyncFnMock<Fetch>;
@@ -39,7 +39,7 @@ describe("KubeApi", () => {
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
-    const createCluster = di.inject(createClusterInjectable);
+    const createCluster = di.inject(createClusterInjectionToken);
 
     di.override(hostedClusterInjectable, () => createCluster({
       contextName: "some-context-name",

packages/core/src/common/k8s-api/__tests__/kube-api.test.ts

@@ -24,7 +24,6 @@ import setupAutoRegistrationInjectable from "../../../renderer/before-frame-star
 import { createMockResponseFromStream, createMockResponseFromString } from "../../../test-utils/mock-responses";
 import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable";
 import directoryForUserDataInjectable from "../../app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import createClusterInjectable from "../../../main/create-cluster/create-cluster.injectable";
 import hostedClusterInjectable from "../../../renderer/cluster-frame-context/hosted-cluster.injectable";
 import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import apiKubeInjectable from "../../../renderer/k8s/api-kube.injectable";
@@ -36,6 +35,7 @@ import namespaceApiInjectable from "../endpoints/namespace.api.injectable";
 // NOTE: this is fine because we are testing something that only exported
 // eslint-disable-next-line no-restricted-imports
 import { PodsApi } from "../../../extensions/common-api/k8s-api";
+import { createClusterInjectionToken } from "../../cluster/create-cluster-injection-token";
 
 describe("createKubeApiForRemoteCluster", () => {
   let createKubeApiForRemoteCluster: CreateKubeApiForRemoteCluster;
@@ -48,7 +48,7 @@ describe("createKubeApiForRemoteCluster", () => {
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
-    const createCluster = di.inject(createClusterInjectable);
+    const createCluster = di.inject(createClusterInjectionToken);
 
     di.override(hostedClusterInjectable, () => createCluster({
       contextName: "some-context-name",
@@ -154,7 +154,7 @@ describe("KubeApi", () => {
     fetchMock = asyncFn();
     di.override(fetchInjectable, () => fetchMock);
 
-    const createCluster = di.inject(createClusterInjectable);
+    const createCluster = di.inject(createClusterInjectionToken);
     const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
 
     di.override(hostedClusterInjectable, () => createCluster({

packages/core/src/common/utils/channel/channel.test.ts

@@ -19,7 +19,10 @@ import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
 import { runInAction } from "mobx";
 import type { RequestChannelHandler } from "../../../main/utils/channel/channel-listeners/listener-tokens";
-import { getRequestChannelListenerInjectable } from "../../../main/utils/channel/channel-listeners/listener-tokens";
+import {
+  getRequestChannelListenerInjectable,
+  requestChannelListenerInjectionToken,
+} from "../../../main/utils/channel/channel-listeners/listener-tokens";
 
 type TestMessageChannel = MessageChannel<string>;
 type TestRequestChannel = RequestChannel<string, string>;
@@ -199,21 +202,32 @@ describe("channel", () => {
   it("when registering multiple handlers for the same channel, throws", async () => {
     const applicationBuilder = getApplicationBuilder();
 
-    const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+    const someChannelListenerInjectable = getInjectable({
-      channel: testRequestChannel,
+      id: "some-channel-listener",
-      handler: () => () => "some-value",
+
-    });
+      instantiate: () => ({
-    const testChannelListenerInMain2Injectable = getRequestChannelListenerInjectable({
+        channel: testRequestChannel,
-      channel: testRequestChannel,
+        handler: () => () => "irrelevant",
-      handler: () => () => "some-other-value",
+      }),
+
+      injectionToken: requestChannelListenerInjectionToken,
     });
 
-    testChannelListenerInMain2Injectable.id += "2";
+    const someOtherChannelListenerInjectable = getInjectable({
+      id: "some-other-channel-listener",
+
+      instantiate: () => ({
+        channel: testRequestChannel,
+        handler: () => () => "irrelevant",
+      }),
+
+      injectionToken: requestChannelListenerInjectionToken,
+    });
 
     applicationBuilder.beforeApplicationStart((mainDi) => {
       runInAction(() => {
-        mainDi.register(testChannelListenerInMainInjectable);
+        mainDi.register(someChannelListenerInjectable);
-        mainDi.register(testChannelListenerInMain2Injectable);
+        mainDi.register(someOtherChannelListenerInjectable);
       });
     });
 

packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.injectable.ts

@@ -19,7 +19,7 @@ const withOrphanPromiseInjectable = getInjectable({
           toBeDecorated,
           withErrorLoggingFor(() => "Orphan promise rejection encountered"),
           withErrorSuppression,
-        );
+        ) as ((...args: any[]) => any);
 
         decorated(...args);
       };

packages/core/src/features/catalog/opening-entity-details.test.tsx

@@ -25,6 +25,17 @@ describe("opening catalog entity details panel", () => {
   beforeEach(async () => {
     builder = getApplicationBuilder();
 
+    builder.beforeWindowStart((windowDi) => {
+      // TODO: remove once ClusterStore can be used without overriding it
+      windowDi.override(getClusterByIdInjectable, () => (clusterId) => {
+        if (clusterId === cluster.id) {
+          return cluster;
+        }
+
+        return undefined;
+      });
+    });
+
     builder.afterWindowStart((windowDi) => {
       const createCluster = windowDi.inject(createClusterInjectable);
 
@@ -78,15 +89,6 @@ describe("opening catalog entity details panel", () => {
         clusterServerUrl: "https://localhost:9999",
       });
 
-      // TODO: remove once ClusterStore can be used without overriding it
-      windowDi.override(getClusterByIdInjectable, () => (clusterId) => {
-        if (clusterId === cluster.id) {
-          return cluster;
-        }
-
-        return undefined;
-      });
-
       // TODO: replace with proper entity source once syncing entities between main and windows is injectable
       const catalogEntityRegistry = windowDi.inject(catalogEntityRegistryInjectable);
 

packages/core/src/features/entity-settings/__snapshots__/showing-settings-for-correct-entity.test.tsx.snap

@@ -830,7 +830,40 @@ exports[`Showing correct entity settings when navigating to non-local cluster en
                 >
                   Proxy
                 </h2>
-                <section />
+                <section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                      id="http-proxy"
+                    >
+                      HTTP Proxy
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="http://<address>:<port>"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <small
+                      class="hint"
+                    >
+                      HTTP Proxy server. Used for communicating with Kubernetes API.
+                    </small>
+                  </section>
+                </section>
               </section>
             </div>
             <div

packages/core/src/features/entity-settings/showing-settings-for-correct-entity.test.tsx

@@ -25,6 +25,17 @@ describe("Showing correct entity settings", () => {
   beforeEach(async () => {
     builder = getApplicationBuilder();
 
+    builder.beforeWindowStart((windowDi) => {
+      // TODO: remove once ClusterStore can be used without overriding it
+      windowDi.override(getClusterByIdInjectable, () => (clusterId) => {
+        if (clusterId === cluster.id) {
+          return cluster;
+        }
+
+        return undefined;
+      });
+    });
+
     builder.afterWindowStart((windowDi) => {
       const createCluster = windowDi.inject(createClusterInjectable);
 
@@ -78,14 +89,6 @@ describe("Showing correct entity settings", () => {
         clusterServerUrl: "https://localhost:9999",
       });
 
-      // TODO: remove once ClusterStore can be used without overriding it
-      windowDi.override(getClusterByIdInjectable, () => (clusterId) => {
-        if (clusterId === cluster.id) {
-          return cluster;
-        }
-
-        return undefined;
-      });
 
       // TODO: replace with proper entity source once syncing entities between main and windows is injectable
       const catalogEntityRegistry = windowDi.inject(catalogEntityRegistryInjectable);

packages/core/src/main/register-injectables.ts

@@ -16,7 +16,8 @@ export function registerInjectables(di: DiContainer) {
 
     autoRegister({
       di,
-      requireContexts: [
+      targetModule: module,
+      getRequireContexts: () => [
         require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
         require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
         require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),

packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.test.tsx

@@ -19,8 +19,8 @@ import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-create
 import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
-import createClusterInjectable from "../../../main/create-cluster/create-cluster.injectable";
 import type { PodStore } from "../+workloads-pods/store";
+import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
 
 describe("kube-object-list-layout", () => {
   let di: DiContainer;
@@ -34,7 +34,7 @@ describe("kube-object-list-layout", () => {
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
-    const createCluster = di.inject(createClusterInjectable);
+    const createCluster = di.inject(createClusterInjectionToken);
 
     di.override(hostedClusterInjectable, () => createCluster({
       contextName: "some-context-name",

packages/core/src/renderer/getDiForUnitTesting.tsx

@@ -20,6 +20,7 @@ import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injecta
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
 import nodeEnvInjectionToken from "../common/vars/node-env-injection-token";
 import { applicationInformationFakeInjectable } from "../common/vars/application-information-fake-injectable";
+import { registerInjectableReact } from "@ogre-tools/injectable-react";
 
 export const getDiForUnitTesting = (
   opts: { doGeneralOverrides?: boolean } = {},
@@ -46,6 +47,7 @@ export const getDiForUnitTesting = (
   ) as Injectable<any, any, any>[];
 
   registerMobX(di);
+  registerInjectableReact(di);
 
   runInAction(() => {
     di.register(applicationInformationFakeInjectable);

packages/core/src/renderer/register-injectables.ts

@@ -6,18 +6,22 @@
 import type { DiContainer } from "@ogre-tools/injectable";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
+import { registerInjectableReact } from "@ogre-tools/injectable-react";
 import { runInAction } from "mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export function registerInjectables(di: DiContainer) {
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
+  registerMobX(di);
+  registerInjectableReact(di);
+
   runInAction(() => {
-    registerMobX(di);
 
     autoRegister({
       di,
-      requireContexts: [
+      targetModule: module,
+      getRequireContexts: () => [
         require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
         require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
         require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES),

packages/open-lens/src/main/index.ts

@@ -13,7 +13,8 @@ runInAction(() => {
   try {
     autoRegister({
       di,
-      requireContexts: [
+      targetModule: module,
+      getRequireContexts: () => [
         require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
         require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
       ],

packages/open-lens/src/renderer/index.ts

@@ -13,7 +13,8 @@ const app = createApp({
 runInAction(() => {
   autoRegister({
     di,
-    requireContexts: [
+    targetModule: module,
+    getRequireContexts: () => [
       require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
       require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
     ],