From d55b363df96dca5391aff6893c9ff1b04997e008 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 12 Apr 2022 15:56:12 -0400
Subject: [PATCH] fix api-kube

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/k8s-api/__tests__/deployment.api.test.ts    |  4 ++--
 src/common/k8s-api/__tests__/stateful-set.api.test.ts  |  2 +-
 src/common/k8s-api/api-kube.ts                         |  9 +++++++--
 .../k8s-api => renderer/k8s}/api-kube.injectable.ts    | 10 ++++++----
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename src/{common/k8s-api => renderer/k8s}/api-kube.injectable.ts (66%)

diff --git a/src/common/k8s-api/__tests__/deployment.api.test.ts b/src/common/k8s-api/__tests__/deployment.api.test.ts
index 21394a65f4..05e6a34cec 100644
--- a/src/common/k8s-api/__tests__/deployment.api.test.ts
+++ b/src/common/k8s-api/__tests__/deployment.api.test.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
+import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting";
 import createStoresAndApisInjectable from "../../../renderer/create-stores-apis.injectable";
-import apiKubeInjectable from "../api-kube.injectable";
+import apiKubeInjectable from "../../../renderer/k8s/api-kube.injectable";
 import type { DeploymentApi } from "../endpoints/deployment.api";
 import deploymentApiInjectable from "../endpoints/deployment.api.injectable";
 import type { KubeJsonApi } from "../kube-json-api";
diff --git a/src/common/k8s-api/__tests__/stateful-set.api.test.ts b/src/common/k8s-api/__tests__/stateful-set.api.test.ts
index e6939b8b99..fb08164c66 100644
--- a/src/common/k8s-api/__tests__/stateful-set.api.test.ts
+++ b/src/common/k8s-api/__tests__/stateful-set.api.test.ts
@@ -5,7 +5,7 @@
 
 import createStoresAndApisInjectable from "../../../renderer/create-stores-apis.injectable";
 import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting";
-import apiKubeInjectable from "../api-kube.injectable";
+import apiKubeInjectable from "../../../renderer/k8s/api-kube.injectable";
 import type { StatefulSetApi } from "../endpoints";
 import statefulSetApiInjectable from "../endpoints/stateful-set.api.injectable";
 import type { KubeJsonApi } from "../kube-json-api";
diff --git a/src/common/k8s-api/api-kube.ts b/src/common/k8s-api/api-kube.ts
index 3c5351f4b1..4154ec2f00 100644
--- a/src/common/k8s-api/api-kube.ts
+++ b/src/common/k8s-api/api-kube.ts
@@ -3,7 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { getInjectionToken } from "@ogre-tools/injectable";
 import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import apiKubeInjectable from "./api-kube.injectable";
+import type { KubeJsonApi } from "./kube-json-api";
 
-export const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectable);
+export const apiKubeInjectionToken = getInjectionToken<KubeJsonApi>({
+  id: "api-kube-injection-token",
+});
+
+export const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectionToken);
diff --git a/src/common/k8s-api/api-kube.injectable.ts b/src/renderer/k8s/api-kube.injectable.ts
similarity index 66%
rename from src/common/k8s-api/api-kube.injectable.ts
rename to src/renderer/k8s/api-kube.injectable.ts
index c3d051d9bd..9972573c53 100644
--- a/src/common/k8s-api/api-kube.injectable.ts
+++ b/src/renderer/k8s/api-kube.injectable.ts
@@ -4,10 +4,11 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
-import { onApiError } from "../../renderer/api/on-api-error";
-import { apiKubePrefix, isDevelopment } from "../vars";
-import { createStoresAndApisInjectionToken } from "./create-stores-apis.token";
-import { KubeJsonApi } from "./kube-json-api";
+import { onApiError } from "../api/on-api-error";
+import { apiKubePrefix, isDevelopment } from "../../common/vars";
+import { apiKubeInjectionToken } from "../../common/k8s-api/api-kube";
+import { createStoresAndApisInjectionToken } from "../../common/k8s-api/create-stores-apis.token";
+import { KubeJsonApi } from "../../common/k8s-api/kube-json-api";
 
 const apiKubeInjectable = getInjectable({
   id: "api-kube",
@@ -28,6 +29,7 @@ const apiKubeInjectable = getInjectable({
 
     return apiKube;
   },
+  injectionToken: apiKubeInjectionToken,
 });
 
 export default apiKubeInjectable;