Remove uses of legacy global logger from injectables (#6660)

- Clean up some of them to use more injectables

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

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

src/main/routes/metrics/add-metrics-route.injectable.ts

@@ -7,13 +7,13 @@ import { apiPrefix } from "../../../common/vars";
 import { getRouteInjectable } from "../../router/router.injectable";
 import type { ClusterPrometheusMetadata } from "../../../common/cluster-types";
 import { ClusterMetadataKey } from "../../../common/cluster-types";
-import logger from "../../logger";
 import type { Cluster } from "../../../common/cluster/cluster";
 import { clusterRoute } from "../../router/route";
 import { isObject } from "lodash";
-import { isRequestError } from "../../../common/utils";
+import { isRequestError, object } from "../../../common/utils";
 import type { GetMetrics } from "../../get-metrics.injectable";
 import getMetricsInjectable from "../../get-metrics.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 // This is used for backoff retry tracking.
 const ATTEMPTS = [false, false, false, false, true];
@@ -55,13 +55,15 @@ const loadMetricsFor = (getMetrics: GetMetrics) => async (promQueries: string[],
 const addMetricsRouteInjectable = getRouteInjectable({
   id: "add-metrics-route",
 
-  instantiate: (di) => clusterRoute({
+  instantiate: (di) => {
+    const getMetrics = di.inject(getMetricsInjectable);
+    const loadMetrics = loadMetricsFor(getMetrics);
+    const logger = di.inject(loggerInjectable);
+
+    return clusterRoute({
       method: "post",
       path: `${apiPrefix}/metrics`,
     })(async ({ cluster, payload, query }) => {
-    const getMetrics = di.inject(getMetricsInjectable);
-    const loadMetrics = loadMetricsFor(getMetrics);
-
       const queryParams: Partial<Record<string, string>> = Object.fromEntries(query.entries());
       const prometheusMetadata: ClusterPrometheusMetadata = {};
 
@@ -91,17 +93,18 @@ const addMetricsRouteInjectable = getRouteInjectable({
         }
 
         if (isObject(payload)) {
-        const queries = Object.entries(payload as Record<string, Record<string, string>>)
+          const data = payload as Record<string, Record<string, string>>;
+          const queries = object.entries(data)
             .map(([queryName, queryOpts]) => (
               provider.getQuery(queryOpts, queryName)
             ));
 
           const result = await loadMetrics(queries, cluster, prometheusPath, queryParams);
-        const data = Object.fromEntries(Object.keys(payload).map((metricName, i) => [metricName, result[i]]));
+          const response = object.fromEntries(object.keys(data).map((metricName, i) => [metricName, result[i]]));
 
           prometheusMetadata.success = true;
 
-        return { response: data };
+          return { response };
         }
 
         return { response: {}};
@@ -114,7 +117,8 @@ const addMetricsRouteInjectable = getRouteInjectable({
       } finally {
         cluster.metadata[ClusterMetadataKey.PROMETHEUS] = prometheusMetadata;
       }
-  }),
+    });
+  },
 });
 
 export default addMetricsRouteInjectable;

src/main/routes/port-forward/start-port-forward-route.injectable.ts

@@ -5,15 +5,16 @@
 import { getRouteInjectable } from "../../router/router.injectable";
 import { apiPrefix } from "../../../common/vars";
 import { PortForward } from "./functionality/port-forward";
-import logger from "../../logger";
 import createPortForwardInjectable from "./functionality/create-port-forward.injectable";
 import { clusterRoute } from "../../router/route";
+import loggerInjectable from "../../../common/logger.injectable";
 
 const startPortForwardRouteInjectable = getRouteInjectable({
   id: "start-current-port-forward-route",
 
   instantiate: (di) => {
     const createPortForward = di.inject(createPortForwardInjectable);
+    const logger = di.inject(loggerInjectable);
 
     return clusterRoute({
       method: "post",

src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts

@@ -5,13 +5,16 @@
 import { getRouteInjectable } from "../../router/router.injectable";
 import { apiPrefix } from "../../../common/vars";
 import { PortForward } from "./functionality/port-forward";
-import logger from "../../logger";
 import { clusterRoute } from "../../router/route";
+import loggerInjectable from "../../../common/logger.injectable";
 
 const stopCurrentPortForwardRouteInjectable = getRouteInjectable({
   id: "stop-current-port-forward-route",
 
-  instantiate: () => clusterRoute({
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return clusterRoute({
       method: "delete",
       path: `${apiPrefix}/pods/port-forward/{namespace}/{resourceType}/{resourceName}`,
     })(async ({ params, query, cluster }) => {
@@ -35,9 +38,9 @@ const stopCurrentPortForwardRouteInjectable = getRouteInjectable({
             message: `error stopping a forward port ${port}`,
           },
         };
-
       }
-  }),
+    });
+  },
 });
 
 export default stopCurrentPortForwardRouteInjectable;

src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx

@@ -5,16 +5,15 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
 import { validatePackage } from "./validate-package";
-import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery";
 import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
-import logger from "../../../../main/logger";
-import { Notifications } from "../../notifications";
-import path from "path";
-import fse from "fs-extra";
 import React from "react";
-import os from "os";
 import type { LensExtensionId, LensExtensionManifest } from "../../../../extensions/lens-extension";
 import type { InstallRequest } from "./attempt-install.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import writeFileInjectable from "../../../../common/fs/write-file.injectable";
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import tempDirectoryPathInjectable from "../../../../common/os/temp-directory-path.injectable";
+import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
 
 export interface InstallRequestValidated {
   fileName: string;
@@ -24,26 +23,32 @@ export interface InstallRequestValidated {
   tempFile: string; // temp system path to packed extension for unpacking
 }
 
-interface Dependencies {
-  extensionDiscovery: ExtensionDiscovery;
-}
-
 export type CreateTempFilesAndValidate = (request: InstallRequest) => Promise<InstallRequestValidated | null>;
 
-const createTempFilesAndValidate = ({
+const createTempFilesAndValidateInjectable = getInjectable({
-  extensionDiscovery,
+  id: "create-temp-files-and-validate",
-}: Dependencies): CreateTempFilesAndValidate => (
+  instantiate: (di): CreateTempFilesAndValidate => {
-  async ({ fileName, data }) => {
+    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
-    // copy files to temp
+    const logger = di.inject(loggerInjectable);
-    await fse.ensureDir(getExtensionPackageTemp());
+    const writeFile = di.inject(writeFileInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const tempDirectoryPath = di.inject(tempDirectoryPathInjectable);
 
+    const getTempExtensionPackagePath = (fileName: string) => joinPaths(
+      tempDirectoryPath,
+      "lens-extensions",
+      fileName,
+    );
+
+    return async ({ fileName, data }) => {
       // validate packages
-    const tempFile = getExtensionPackageTemp(fileName);
+      const tempFile = getTempExtensionPackagePath(fileName);
 
       try {
-      await fse.writeFile(tempFile, data);
+        await writeFile(tempFile, data);
         const manifest = await validatePackage(tempFile);
-      const id = path.join(
+        const id = joinPaths(
           extensionDiscovery.nodeModulesPath,
           manifest.name,
           "package.json",
@@ -63,7 +68,7 @@ const createTempFilesAndValidate = ({
           `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
           { error },
         );
-      Notifications.error((
+        showErrorNotification((
           <div className="flex column gaps">
             <p>
               {"Installing "}
@@ -79,19 +84,8 @@ const createTempFilesAndValidate = ({
       }
 
       return null;
-  }
+    };
-);
+  },
-
-
-function getExtensionPackageTemp(fileName = "") {
-  return path.join(os.tmpdir(), "lens-extensions", fileName);
-}
-
-const createTempFilesAndValidateInjectable = getInjectable({
-  id: "create-temp-files-and-validate",
-  instantiate: (di) => createTempFilesAndValidate({
-    extensionDiscovery: di.inject(extensionDiscoveryInjectable),
-  }),
 });
 
 export default createTempFilesAndValidateInjectable;