Move Cluster.apiUrl to seperate injectable (#7354)

* Refactor out Cluster.apiUrl to direct reading

- Should help prevent using stale data

- Removes some uses of synchronous FS operations

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

* Fix type errors

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

* Rename helper function to better communicate intent

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

* Improve prometheus handler tests to override less things

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

---------

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

packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx

@@ -53,8 +53,6 @@ describe("<HpaDetails/>", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     render = renderFor(di);

packages/core/src/renderer/components/+config-secrets/__tests__/secret-details.test.tsx

@@ -31,8 +31,6 @@ describe("SecretDetails tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     const secret = new Secret({

packages/core/src/renderer/components/+namespaces/namespace-select-filter.test.tsx

@@ -62,8 +62,6 @@ describe("<NamespaceSelectFilter />", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     namespaceStore = di.inject(namespaceStoreInjectable);

packages/core/src/renderer/components/+namespaces/namespace-store.test.ts

@@ -115,8 +115,6 @@ describe("NamespaceStore", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     namespaceStore = di.inject(namespaceStoreInjectable);

packages/core/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx

@@ -40,8 +40,6 @@ describe("ClusterRoleBindingDialog tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     render = renderFor(di);

packages/core/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx

@@ -36,8 +36,6 @@ describe("RoleBindingDialog tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     render = renderFor(di);

packages/core/src/renderer/components/__tests__/cronjob.store.test.ts

@@ -131,8 +131,6 @@ describe("CronJob Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     cronJobStore = di.inject(cronJobStoreInjectable);

packages/core/src/renderer/components/__tests__/daemonset.store.test.ts

@@ -148,8 +148,6 @@ describe("DaemonSet Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     const podStore = di.inject(podStoreInjectable);

packages/core/src/renderer/components/__tests__/deployments.store.test.ts

@@ -220,8 +220,6 @@ describe("Deployment Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     const podStore = di.inject(podStoreInjectable);

packages/core/src/renderer/components/__tests__/job.store.test.ts

@@ -185,8 +185,6 @@ describe("Job Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     jobStore = di.inject(jobStoreInjectable);

packages/core/src/renderer/components/__tests__/pods.store.test.ts

@@ -131,8 +131,6 @@ describe("Pod Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     podStore = di.inject(podStoreInjectable);

packages/core/src/renderer/components/__tests__/replicaset.store.test.ts

@@ -148,8 +148,6 @@ describe("ReplicaSet Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     const podStore = di.inject(podStoreInjectable);

packages/core/src/renderer/components/__tests__/statefulset.store.test.ts

@@ -148,8 +148,6 @@ describe("StatefulSet Store tests", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     statefulSetStore = di.inject(statefulSetStoreInjectable);

packages/core/src/renderer/components/cluster-settings/__tests__/cluster-local-terminal-settings.test.tsx

@@ -55,8 +55,6 @@ describe("ClusterLocalTerminalSettings", () => {
         terminalCWD: "/foobar",
         defaultNamespace: "kube-system",
       },
-    }, {
-      clusterServerUrl: "https://localhost:12345",
     });
     const dom = render(<ClusterLocalTerminalSetting cluster={cluster}/>);
 
@@ -76,8 +74,6 @@ describe("ClusterLocalTerminalSettings", () => {
       preferences: {
         terminalCWD: "/foobar",
       },
-    }, {
-      clusterServerUrl: "https://localhost:12345",
     });
 
     const dom = render(<ClusterLocalTerminalSetting cluster={cluster}/>);
@@ -98,8 +94,6 @@ describe("ClusterLocalTerminalSettings", () => {
       preferences: {
         terminalCWD: "/foobar",
       },
-    }, {
-      clusterServerUrl: "https://localhost:12345",
     });
 
     const dom = render(<ClusterLocalTerminalSetting cluster={cluster}/>);
@@ -129,8 +123,6 @@ describe("ClusterLocalTerminalSettings", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some/path",
-    }, {
-      clusterServerUrl: "https://localhost:12345",
     });
 
     const dom = render(<ClusterLocalTerminalSetting cluster={cluster}/>);
@@ -161,8 +153,6 @@ describe("ClusterLocalTerminalSettings", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some/path",
-    }, {
-      clusterServerUrl: "https://localhost:12345",
     });
 
     const dom = render(<ClusterLocalTerminalSetting cluster={cluster}/>);

packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx

@@ -17,32 +17,6 @@ import { clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInje
 import { runInAction } from "mobx";
 import { getInjectable, type DiContainer } from "@ogre-tools/injectable";
 
-const cluster = new Cluster({
-  contextName: "some-context",
-  id: "some-id",
-  kubeConfigPath: "/some/path/to/kubeconfig",
-  preferences: {
-    clusterName: "some-cluster-name",
-  },
-}, {
-  clusterServerUrl: "https://localhost:9999",
-});
-
-const clusterEntity = new KubernetesCluster({
-  metadata: {
-    labels: {},
-    name: "some-kubernetes-cluster",
-    uid: "some-entity-id",
-  },
-  spec: {
-    kubeconfigContext: "some-context",
-    kubeconfigPath: "/some/path/to/kubeconfig",
-  },
-  status: {
-    phase: "connecting",
-  },
-});
-
 const newMenuItem = getInjectable({
   id: "cluster-icon-settings-menu-test-item",
 
@@ -67,7 +41,7 @@ function CustomSettingsComponent(props: ClusterIconSettingComponentProps) {
       </span>
     </div>
   );
-} 
+}
 
 const newSettingsReactComponent = getInjectable({
   id: "cluster-icon-settings-react-component",
@@ -86,8 +60,31 @@ describe("Icon settings", () => {
 
   beforeEach(() => {
     di = getDiForUnitTesting();
-    
+
     const render = renderFor(di);
+    const cluster = new Cluster({
+      contextName: "some-context",
+      id: "some-id",
+      kubeConfigPath: "/some/path/to/kubeconfig",
+      preferences: {
+        clusterName: "some-cluster-name",
+      },
+    });
+
+    const clusterEntity = new KubernetesCluster({
+      metadata: {
+        labels: {},
+        name: "some-kubernetes-cluster",
+        uid: "some-entity-id",
+      },
+      spec: {
+        kubeconfigContext: "some-context",
+        kubeconfigPath: "/some/path/to/kubeconfig",
+      },
+      status: {
+        phase: "connecting",
+      },
+    });
 
     rendered = render(
       <ClusterIconSetting cluster={cluster} entity={clusterEntity} />,

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

@@ -38,8 +38,6 @@ describe("kube-object-list-layout", () => {
       contextName: "some-context-name",
       id: "some-cluster-id",
       kubeConfigPath: "/some-path-to-a-kubeconfig",
-    }, {
-      clusterServerUrl: "https://localhost:8080",
     }));
 
     render = renderFor(di);

packages/core/src/renderer/components/test-utils/get-application-builder.tsx

@@ -528,8 +528,6 @@ export const getApplicationBuilder = () => {
           id: "some-cluster-id",
           contextName: "some-context-name",
           kubeConfigPath: "/some-path-to-kube-config",
-        }, {
-          clusterServerUrl: "https://localhost:12345",
         });
 
         windowDi.override(activeKubernetesClusterInjectable, () =>

packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx

@@ -48,16 +48,11 @@ describe("<ClusterFrame />", () => {
 
     testUsingFakeTime("2000-01-01 12:00:00am");
 
-    cluster = new Cluster(
-      {
-        contextName: "my-cluster",
-        id: "123456",
-        kubeConfigPath: "/irrelavent",
-      },
-      {
-        clusterServerUrl: "https://localhost",
-      },
-    );
+    cluster = new Cluster({
+      contextName: "my-cluster",
+      id: "123456",
+      kubeConfigPath: "/irrelavent",
+    });
 
     di.override(hostedClusterInjectable, () => cluster);
     di.override(hostedClusterIdInjectable, () => cluster.id);