From a7d214fba83411329f061715cf92fd7a4197e33f Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 22 Dec 2022 14:12:37 -0500
Subject: [PATCH] Add global override for logger

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../logger.global-override-for-injectable.ts     | 16 ++++++++++++++++
 src/main/getDiForUnitTesting.ts                  | 11 +----------
 src/renderer/getDiForUnitTesting.tsx             |  9 ---------
 3 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 src/common/logger.global-override-for-injectable.ts

diff --git a/src/common/logger.global-override-for-injectable.ts b/src/common/logger.global-override-for-injectable.ts
new file mode 100644
index 0000000000..cad548cd22
--- /dev/null
+++ b/src/common/logger.global-override-for-injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import loggerInjectable from "./logger.injectable";
+import { getGlobalOverride } from "./test-utils/get-global-override";
+import { noop } from "./utils";
+
+export default getGlobalOverride(loggerInjectable, () => ({
+  warn: noop,
+  debug: noop,
+  error: noop,
+  info: noop,
+  silly: noop,
+}));
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 7cc454045e..12ae52c667 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -3,11 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { kebabCase, noop, chunk } from "lodash/fp";
+import { kebabCase, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
 import { createContainer, isInjectable, getInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import loggerInjectable from "../common/logger.injectable";
 import spawnInjectable from "./child-process/spawn.injectable";
 import commandLineArgumentsInjectable from "./utils/command-line-arguments.injectable";
 import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable";
@@ -133,14 +132,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
         on: jest.fn(),
       } as never;
     });
-
-    di.override(loggerInjectable, () => ({
-      warn: noop,
-      debug: noop,
-      error: noop,
-      info: noop,
-      silly: noop,
-    }));
   }
 
   return di;
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 4d0f336f8a..71cc855a98 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -8,7 +8,6 @@ import type { Injectable } from "@ogre-tools/injectable";
 import { createContainer, isInjectable, getInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import requestFromChannelInjectable from "./utils/channel/request-from-channel.injectable";
-import loggerInjectable from "../common/logger.injectable";
 import { getOverrideFsWithFakes } from "../test-utils/override-fs-with-fakes";
 import { createMemoryHistory } from "history";
 import focusWindowInjectable from "./navigation/focus-window.injectable";
@@ -113,14 +112,6 @@ export const getDiForUnitTesting = (
     getOverrideFsWithFakes()(di);
 
     di.override(focusWindowInjectable, () => () => {});
-
-    di.override(loggerInjectable, () => ({
-      warn: noop,
-      debug: noop,
-      error: noop,
-      info: noop,
-      silly: noop,
-    }));
   }
 
   return di;