simplify

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/common/certificate/lens-proxy-certificate-injection-token.ts

@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SelfSignedCert } from "selfsigned";
-
-interface LensProxyCertificateValue {
-  get: () => SelfSignedCert;
-  set: (cert: SelfSignedCert) => void;
-}
-
-export const lensProxyCertificateInjectionToken = getInjectionToken<LensProxyCertificateValue>({
-  id: "lens-proxy-certificate-token",
-});

src/common/certificate/lens-proxy-certificate.global-override-for-injectable.ts

@@ -3,8 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { SelfSignedCert } from "selfsigned";
+import { getGlobalOverride } from "../test-utils/get-global-override";
-import { getGlobalOverride } from "../../common/test-utils/get-global-override";
 import lensProxyCertificateInjectable from "./lens-proxy-certificate.injectable";
 
 export default getGlobalOverride(lensProxyCertificateInjectable, () => {
@@ -13,8 +12,8 @@ export default getGlobalOverride(lensProxyCertificateInjectable, () => {
       public: "<public-data>",
       private: "<private-data>",
       cert: "<ca-data>",
-    }) as SelfSignedCert,
+    }),
-    set: () => null,
+    set: () => {},
   };
 });
 

src/common/certificate/lens-proxy-certificate.injectable.ts

@@ -4,7 +4,6 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { SelfSignedCert } from "selfsigned";
-import { lensProxyCertificateInjectionToken } from "../../common/certificate/lens-proxy-certificate-injection-token";
 
 const lensProxyCertificateInjectable = getInjectable({
   id: "lens-proxy-certificate",
@@ -19,13 +18,16 @@ const lensProxyCertificateInjectable = getInjectable({
         return certState;
       },
       set: (certificate: SelfSignedCert) => {
+        if (certState) {
+          throw "certificate has already been set";
+        }
+
         certState = certificate;
       },
     };
 
     return cert;
   },
-  injectionToken: lensProxyCertificateInjectionToken,
 });
 
 export default lensProxyCertificateInjectable;

src/common/k8s-api/create-json-api.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { Agent } from "https";
 import type { RequestInit } from "node-fetch";
-import { lensProxyCertificateInjectionToken } from "../certificate/lens-proxy-certificate-injection-token";
+import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable";
 import fetchInjectable from "../fetch/fetch.injectable";
 import loggerInjectable from "../logger.injectable";
 import type { JsonApiConfig, JsonApiData, JsonApiDependencies, JsonApiParams } from "./json-api";
@@ -20,7 +20,7 @@ const createJsonApiInjectable = getInjectable({
       fetch: di.inject(fetchInjectable),
       logger: di.inject(loggerInjectable),
     };
-    const lensProxyCert = di.inject(lensProxyCertificateInjectionToken);
+    const lensProxyCert = di.inject(lensProxyCertificateInjectable);
 
     return (config, reqInit) => {
       if (!config.getRequestOptions) {

src/common/k8s-api/create-kube-json-api.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { Agent } from "https";
 import type { RequestInit } from "node-fetch";
-import { lensProxyCertificateInjectionToken } from "../certificate/lens-proxy-certificate-injection-token";
+import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable";
 import fetchInjectable from "../fetch/fetch.injectable";
 import loggerInjectable from "../logger.injectable";
 import type { JsonApiConfig, JsonApiDependencies } from "./json-api";
@@ -20,7 +20,7 @@ const createKubeJsonApiInjectable = getInjectable({
       fetch: di.inject(fetchInjectable),
       logger: di.inject(loggerInjectable),
     };
-    const lensProxyCert = di.inject(lensProxyCertificateInjectionToken);
+    const lensProxyCert = di.inject(lensProxyCertificateInjectable);
 
     return (config, reqInit) => {
       if (!config.getRequestOptions) {

src/main/k8s-request.injectable.ts

@@ -7,7 +7,7 @@ import request from "request-promise-native";
 import type { Cluster } from "../common/cluster/cluster";
 import { getInjectable } from "@ogre-tools/injectable";
 import lensProxyPortInjectable from "./lens-proxy/lens-proxy-port.injectable";
-import lensProxyCertificateInjectable from "./lens-proxy/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../common/certificate/lens-proxy-certificate.injectable";
 
 export type K8sRequest = (cluster: Cluster, path: string, options?: RequestPromiseOptions) => Promise<any>;
 

src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts

@@ -14,7 +14,7 @@ import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable
 import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import writeFileInjectable from "../../common/fs/write-file.injectable";
 import removePathInjectable from "../../common/fs/remove.injectable";
-import lensProxyCertificateInjectable from "../lens-proxy/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";
 
 export interface KubeConfigManagerInstantiationParameter {
   cluster: Cluster;

src/main/lens-proxy/lens-proxy-certificate-request-handler.injectable.ts

@@ -5,7 +5,7 @@
 import type { SelfSignedCert } from "selfsigned";
 import { lensProxyCertificateChannel } from "../../common/certificate/lens-proxy-certificate-channel";
 import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
-import lensProxyCertificateInjectable from "./lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";
 
 const lensProxyCertificateRequestHandlerInjectable = getRequestChannelListenerInjectable({
   channel: lensProxyCertificateChannel,

src/main/lens-proxy/lens-proxy-certificate.injectable.ts

@@ -1,28 +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 type { SelfSignedCert } from "selfsigned";
-import { lensProxyCertificateInjectionToken } from "../../common/certificate/lens-proxy-certificate-injection-token";
-
-const lensProxyCertificateInjectable = getInjectable({
-  id: "lens-proxy-certificate",
-  instantiate: () => {
-    let certState: SelfSignedCert;
-
-    return {
-      get: () => certState,
-      set: (cert: SelfSignedCert): void => {
-        if (certState) {
-          throw "cannot override cert";
-        }
-        certState = cert;
-      },
-    };
-  },
-  injectionToken: lensProxyCertificateInjectionToken,
-  causesSideEffects: true,
-});
-
-export default lensProxyCertificateInjectable;

src/main/lens-proxy/lens-proxy.injectable.ts

@@ -13,7 +13,7 @@ import lensProxyPortInjectable from "./lens-proxy-port.injectable";
 import contentSecurityPolicyInjectable from "../../common/vars/content-security-policy.injectable";
 import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
 import loggerInjectable from "../../common/logger.injectable";
-import lensProxyCertificateInjectable from "./lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";
 
 const lensProxyInjectable = getInjectable({
   id: "lens-proxy",

src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts

@@ -15,7 +15,7 @@ import lensResourcesDirInjectable from "../../../../common/vars/lens-resources-d
 import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
 import applicationInformationToken from "../../../../common/vars/application-information-token";
 import pathExistsSyncInjectable from "../../../../common/fs/path-exists-sync.injectable";
-import lensProxyCertificateInjectable from "../../../lens-proxy/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../../../common/certificate/lens-proxy-certificate.injectable";
 
 export type ElectronWindowTitleBarStyle = "hiddenInset" | "hidden" | "default" | "customButtonsOnHover";
 

src/main/start-main-application/runnables/setup-lens-proxy-certificate.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { generate } from "selfsigned";
-import lensProxyCertificateInjectable from "../../lens-proxy/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable";
 import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
 
 const setupLensProxyCertificateInjectable = getInjectable({

src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts

@@ -12,7 +12,7 @@ import showErrorPopupInjectable from "../../electron-app/features/show-error-pop
 import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
 import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 import initializeBuildVersionInjectable from "../../vars/build-version/init.injectable";
-import lensProxyCertificateInjectable from "../../lens-proxy/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable";
 import fetchInjectable from "../../../common/fetch/fetch.injectable";
 import { Agent } from "https";
 

src/renderer/before-frame-starts/runnables/setup-lens-proxy-certificate.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsFirstInjectionToken } from "../tokens";
-import lensProxyCertificateInjectable from "../../certificate/lens-proxy-certificate.injectable";
+import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable";
 import requestLensProxyCertificateInjectable from "../../certificate/request-lens-proxy-certificate.injectable";
 
 const setupLensProxyCertificateInjectable = getInjectable({

src/renderer/certificate/lens-proxy-certificate.global-override-for-injectable.ts

@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getGlobalOverride } from "../../common/test-utils/get-global-override";
-import lensProxyCertificateInjectable from "./lens-proxy-certificate.injectable";
-
-export default getGlobalOverride(lensProxyCertificateInjectable, () => {
-  return {
-    get: () => ({
-      public: "",
-      private: "",
-      cert: "",
-    }),
-    set: () => {},
-  };
-});
-