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/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,74 +23,69 @@ 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 = ({
-  extensionDiscovery,
-}: Dependencies): CreateTempFilesAndValidate => (
-  async ({ fileName, data }) => {
-    // copy files to temp
-    await fse.ensureDir(getExtensionPackageTemp());
-
-    // validate packages
-    const tempFile = getExtensionPackageTemp(fileName);
-
-    try {
-      await fse.writeFile(tempFile, data);
-      const manifest = await validatePackage(tempFile);
-      const id = path.join(
-        extensionDiscovery.nodeModulesPath,
-        manifest.name,
-        "package.json",
-      );
-
-      return {
-        fileName,
-        data,
-        manifest,
-        tempFile,
-        id,
-      };
-    } catch (error) {
-      const message = getMessageFromError(error);
-
-      logger.info(
-        `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
-        { error },
-      );
-      Notifications.error((
-        <div className="flex column gaps">
-          <p>
-            {"Installing "}
-            <em>{fileName}</em>
-            {" has failed, skipping."}
-          </p>
-          <p>
-            {"Reason: "}
-            <em>{message}</em>
-          </p>
-        </div>
-      ));
-    }
-
-    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),
-  }),
+  instantiate: (di): CreateTempFilesAndValidate => {
+    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
+    const logger = di.inject(loggerInjectable);
+    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 = getTempExtensionPackagePath(fileName);
+
+      try {
+        await writeFile(tempFile, data);
+        const manifest = await validatePackage(tempFile);
+        const id = joinPaths(
+          extensionDiscovery.nodeModulesPath,
+          manifest.name,
+          "package.json",
+        );
+
+        return {
+          fileName,
+          data,
+          manifest,
+          tempFile,
+          id,
+        };
+      } catch (error) {
+        const message = getMessageFromError(error);
+
+        logger.info(
+          `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
+          { error },
+        );
+        showErrorNotification((
+          <div className="flex column gaps">
+            <p>
+              {"Installing "}
+              <em>{fileName}</em>
+              {" has failed, skipping."}
+            </p>
+            <p>
+              {"Reason: "}
+              <em>{message}</em>
+            </p>
+          </div>
+        ));
+      }
+
+      return null;
+    };
+  },
 });
 
 export default createTempFilesAndValidateInjectable;