Convert DirectoryForUserData to LazyInitializableState

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

src/common/__tests__/base-store.test.ts

@@ -7,7 +7,7 @@ import mockFs from "mock-fs";
 import { BaseStore } from "../base-store";
 import { action, comparer, makeObservable, observable, toJS } from "mobx";
 import { readFileSync } from "fs";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 
@@ -79,7 +79,9 @@ describe("BaseStore", () => {
   beforeEach(() => {
     const mainDi = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory");
+    mainDi.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-user-data-directory",
+    }));
     mainDi.permitSideEffects(getConfigurationFileModelInjectable);
 
     TestStore.resetInstance();

src/common/__tests__/cluster-store.test.ts

@@ -15,7 +15,7 @@ import clusterStoreInjectable from "../cluster-store/cluster-store.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 import type { CreateCluster } from "../cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../cluster/create-cluster-injection-token";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 import assert from "assert";
@@ -86,7 +86,9 @@ describe("cluster-store", () => {
 
     mockFs();
 
-    mainDi.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    mainDi.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     mainDi.override(directoryForTempInjectable, () => "some-temp-directory");
     mainDi.override(kubectlBinaryNameInjectable, () => "kubectl");
     mainDi.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");

src/common/__tests__/hotbar-store.test.ts

@@ -17,7 +17,7 @@ import hasCategoryForEntityInjectable from "../catalog/has-category-for-entity.i
 import catalogCatalogEntityInjectable from "../catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable";
 import loggerInjectable from "../logger.injectable";
 import type { Logger } from "../logger";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
 import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 
 function getMockCatalogEntity(data: Partial<CatalogEntityData> & CatalogEntityKindData): CatalogEntity {
@@ -100,7 +100,9 @@ describe("HotbarStore", () => {
 
     di.override(loggerInjectable, () => loggerMock);
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
     const catalogCatalogEntity = di.inject(catalogCatalogEntityInjectable);

src/common/__tests__/user-store.test.ts

@@ -26,7 +26,7 @@ import { Console } from "console";
 import { stdout, stderr } from "process";
 import userStoreInjectable from "../user-store/user-store.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
 import type { ClusterStoreModel } from "../cluster-store/cluster-store";
 import { defaultThemeId } from "../vars";
 import writeFileInjectable from "../fs/write-file.injectable";
@@ -48,7 +48,9 @@ describe("user store tests", () => {
     mockFs();
 
     di.override(writeFileInjectable, () => () => Promise.resolve());
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(userStoreInjectable);
 

src/common/app-paths/directory-for-binaries.injectable.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import directoryForUserDataInjectable from "./directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "./directory-for-user-data.injectable";
 import { createLazyInitializableState } from "../initializable-state/create-lazy";
 import joinPathsInjectable from "../path/join-paths.injectable";
 

src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts

@@ -2,18 +2,18 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../directory-for-user-data.injectable";
 import joinPathsInjectable from "../../path/join-paths.injectable";
+import { createLazyInitializableState } from "../../initializable-state/create-lazy";
 
-const directoryForKubeConfigsInjectable = getInjectable({
+const directoryForKubeConfigsInjectable = createLazyInitializableState({
   id: "directory-for-kube-configs",
 
-  instantiate: (di) => {
+  init: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return joinPaths(directoryForUserData, "kubeconfigs");
+    return joinPaths(directoryForUserData.get(), "kubeconfigs");
   },
 });
 

src/common/app-paths/directory-for-user-data.injectable.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { createLazyInitializableState } from "../initializable-state/create-lazy";
+import { appPathsInjectionToken } from "./token";
+
+const directoryForUserDataInjectable = createLazyInitializableState({
+  id: "directory-for-user-data",
+  init: (di) => di.inject(appPathsInjectionToken).get().userData,
+});
+
+export default directoryForUserDataInjectable;

src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts

@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { appPathsInjectionToken } from "../app-path-injection-token";
-
-const directoryForUserDataInjectable = getInjectable({
-  id: "directory-for-user-data",
-  instantiate: (di) => di.inject(appPathsInjectionToken).userData,
-});
-
-export default directoryForUserDataInjectable;

src/common/base-store.ts

@@ -17,7 +17,7 @@ import isEqual from "lodash/isEqual";
 import { isTestEnv } from "./vars";
 import { kebabCase } from "lodash";
 import { getLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "./app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "./app-paths/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "./get-configuration-file-model/get-configuration-file-model.injectable";
 import storeMigrationVersionInjectable from "./vars/store-migration-version.injectable";
 
@@ -94,10 +94,10 @@ export abstract class BaseStore<T extends object> extends Singleton {
     return this.storeConfig?.path || "";
   }
 
-  protected cwd() {
+  protected cwd(): string {
     const di = getLegacyGlobalDiForExtensionApi();
 
-    return di.inject(directoryForUserDataInjectable);
+    return di.inject(directoryForUserDataInjectable).get();
   }
 
   protected saveToFile(model: T) {

src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts

@@ -2,21 +2,18 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
+import { createLazyInitializableState } from "../initializable-state/create-lazy";
 import joinPathsInjectable from "../path/join-paths.injectable";
 
-const directoryForLensLocalStorageInjectable = getInjectable({
+const directoryForLensLocalStorageInjectable = createLazyInitializableState({
   id: "directory-for-lens-local-storage",
 
-  instantiate: (di) => {
+  init: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return joinPaths(
-      directoryForUserData,
-      "lens-local-storage",
-    );
+    return joinPaths(directoryForUserData.get(), "lens-local-storage");
   },
 });
 

src/common/user-store/file-name-migration.injectable.ts

@@ -4,7 +4,7 @@
  */
 
 import fse from "fs-extra";
-import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data.injectable";
 import { isErrnoException } from "../utils";
 import { getInjectable } from "@ogre-tools/injectable";
 import joinPathsInjectable from "../path/join-paths.injectable";
@@ -14,7 +14,7 @@ export type UserStoreFileNameMigration = () => Promise<void>;
 const userStoreFileNameMigrationInjectable = getInjectable({
   id: "user-store-file-name-migration",
   instantiate: (di): UserStoreFileNameMigration => {
-    const userDataPath = di.inject(directoryForUserDataInjectable);
+    const userDataPath = di.inject(directoryForUserDataInjectable).get();
     const joinPaths = di.inject(joinPathsInjectable);
     const configJsonPath = joinPaths(userDataPath, "config.json");
     const lensUserStoreJsonPath = joinPaths(userDataPath, "lens-user-store.json");

src/extensions/extension-discovery/extension-discovery.test.ts

@@ -8,7 +8,7 @@ import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import extensionDiscoveryInjectable from "../extension-discovery/extension-discovery.injectable";
 import type { ExtensionDiscovery } from "../extension-discovery/extension-discovery";
 import installExtensionInjectable from "../extension-installer/install-extension/install-extension.injectable";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import { delay } from "../../renderer/utils";
 import { observable, runInAction, when } from "mobx";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
@@ -31,7 +31,9 @@ describe("ExtensionDiscovery", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "/some-directory-for-user-data",
+    }));
     di.override(installExtensionInjectable, () => () => Promise.resolve());
     di.override(extensionApiVersionInjectable, () => "5.0.0");
 

src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.injectable.ts

@@ -3,8 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable
-  from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 
 const extensionPackageRootDirectoryInjectable = getInjectable({
   id: "extension-package-root-directory",

src/extensions/extension-loader/file-system-provisioner-store/directory-for-extension-data.injectable.ts

@@ -2,18 +2,18 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
+import { createLazyInitializableState } from "../../../common/initializable-state/create-lazy";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 
-const directoryForExtensionDataInjectable = getInjectable({
+const directoryForExtensionDataInjectable = createLazyInitializableState({
   id: "directory-for-extension-data",
 
-  instantiate: (di) => {
+  init: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return joinPaths(directoryForUserData, "extension_data");
+    return joinPaths(directoryForUserData.get(), "extension_data");
   },
 });
 

src/extensions/extension-packages-root/extension-packages-root.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable
-  from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+  from "../../common/app-paths/directory-for-user-data.injectable";
 
 const extensionPackagesRootInjectable = getInjectable({
   id: "extension-packages-root",

src/main/__test__/cluster.test.ts

@@ -14,7 +14,7 @@ import listNamespacesInjectable from "../../common/cluster/list-namespaces.injec
 import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable";
 import type { ClusterContextHandler } from "../context-handler/context-handler";
 import { parse } from "url";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
@@ -32,7 +32,9 @@ describe("create clusters", () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
     const clusterServerUrl = "https://192.168.64.3:8443";
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(directoryForTempInjectable, () => "some-directory-for-temp");
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");

src/main/__test__/kube-auth-proxy.test.ts

@@ -22,7 +22,7 @@ import { createClusterInjectionToken } from "../../common/cluster/create-cluster
 import path from "path";
 import spawnInjectable from "../child-process/spawn.injectable";
 import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
@@ -71,7 +71,9 @@ describe("kube auth proxy tests", () => {
 
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(directoryForTempInjectable, () => "some-directory-for-temp");
 
     spawnMock = jest.fn();

src/main/__test__/kubeconfig-manager.test.ts

@@ -13,7 +13,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import { parse } from "url";
 import loggerInjectable from "../../common/logger.injectable";
 import type { Logger } from "../../common/logger";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
@@ -46,7 +46,9 @@ describe("kubeconfig manager tests", () => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(directoryForTempInjectable, () => "/some-directory-for-temp");
-    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "/some-directory-for-user-data",
+    }));
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(normalizedPlatformInjectable, () => "darwin");

src/main/catalog-sources/__test__/kubeconfig-sync.test.ts

@@ -8,7 +8,7 @@ import type { CatalogEntity } from "../../../common/catalog";
 import { loadFromOptions } from "../../../common/kube-helpers";
 import type { Cluster } from "../../../common/cluster/cluster";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import directoryForTempInjectable from "../../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
 import { iter, strictGet } from "../../../common/utils";
 import type { ComputeKubeconfigDiff } from "../kubeconfig-sync/compute-diff.injectable";
@@ -30,6 +30,9 @@ import watchInjectable from "../../../common/fs/watch/watch.injectable";
 import EventEmitter from "events";
 import type { ReadStream, Stats } from "fs";
 import createReadFileStreamInjectable from "../../../common/fs/create-read-file-stream.injectable";
+import kubectlBinaryNameInjectable from "../../kubectl/binary-name.injectable";
+import kubectlDownloadingNormalizedArchInjectable from "../../kubectl/normalized-arch.injectable";
+import normalizedPlatformInjectable from "../../../common/vars/normalized-platform.injectable";
 
 describe("kubeconfig-sync.source tests", () => {
   let computeKubeconfigDiff: ComputeKubeconfigDiff;
@@ -41,11 +44,17 @@ describe("kubeconfig-sync.source tests", () => {
   beforeEach(async () => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
     di.override(directoryForTempInjectable, () => "/some-directory-for-temp");
 
     clusters = new Map();
     di.override(getClusterByIdInjectable, () => id => clusters.get(id));
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
+    di.override(directoryForTempInjectable, () => "some-directory-for-temp");
+    di.override(kubectlBinaryNameInjectable, () => "kubectl");
+    di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
+    di.override(normalizedPlatformInjectable, () => "darwin");
 
     kubeconfigSyncs = observable.map();
 

src/main/protocol-handler/__test__/router.test.ts

@@ -17,7 +17,7 @@ import { LensExtension } from "../../../extensions/lens-extension";
 import type { LensExtensionId } from "../../../extensions/lens-extension";
 import type { ObservableMap } from "mobx";
 import extensionInstancesInjectable from "../../../extensions/extension-loader/extension-instances.injectable";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import broadcastMessageInjectable from "../../../common/ipc/broadcast-message.injectable";
 
 function throwIfDefined(val: any): void {
@@ -43,7 +43,9 @@ describe("protocol router tests", () => {
 
     di.permitSideEffects(getConfigurationFileModelInjectable);
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     broadcastMessageMock = jest.fn();
     di.override(broadcastMessageInjectable, () => broadcastMessageMock);

src/main/router/router.test.ts

@@ -14,7 +14,7 @@ import asyncFn from "@async-fn/jest";
 import parseRequestInjectable from "./parse-request.injectable";
 import { contentTypes } from "./router-content-types";
 import mockFs from "mock-fs";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import type { Route } from "./route";
 import type { SetRequired } from "type-fest";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
@@ -39,7 +39,9 @@ describe("router", () => {
       payload: "some-payload",
       mime: "some-mime",
     }));
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(normalizedPlatformInjectable, () => "darwin");

src/migrations/cluster-store/3.6.0-beta.1.ts

@@ -12,12 +12,9 @@ import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
 import type { ClusterModel } from "../../common/cluster-types";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable
-  from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import directoryForKubeConfigsInjectable
-  from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
-import getCustomKubeConfigDirectoryInjectable
-  from "../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
+import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import getCustomKubeConfigDirectoryInjectable from "../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
 import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
@@ -74,7 +71,7 @@ export default {
         if (clusterModel.preferences?.icon) {
           migrationLog(`migrating ${clusterModel.preferences.icon} for ${clusterModel.preferences.clusterName}`);
           const iconPath = clusterModel.preferences.icon.replace("store://", "");
-          const fileData = fse.readFileSync(joinPaths(userDataPath, iconPath));
+          const fileData = fse.readFileSync(joinPaths(userDataPath.get(), iconPath));
 
           clusterModel.preferences.icon = `data:;base64,${fileData.toString("base64")}`;
         } else {

src/migrations/cluster-store/5.0.0-beta.10.ts

@@ -7,7 +7,7 @@ import fse from "fs-extra";
 import type { ClusterModel } from "../../common/cluster-types";
 import type { MigrationDeclaration } from "../helpers";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import { isErrnoException } from "../../common/utils";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
@@ -27,7 +27,7 @@ export default {
     const joinPaths = di.inject(joinPathsInjectable);
 
     try {
-      const workspaceData: Pre500WorkspaceStoreModel = fse.readJsonSync(joinPaths(userDataPath, "lens-workspace-store.json"));
+      const workspaceData: Pre500WorkspaceStoreModel = fse.readJsonSync(joinPaths(userDataPath.get(), "lens-workspace-store.json"));
       const workspaces = new Map<string, string>(); // mapping from WorkspaceId to name
 
       for (const { id, name } of workspaceData.workspaces) {

src/migrations/cluster-store/5.0.0-beta.13.ts

@@ -9,7 +9,7 @@ import { migrationLog } from "../helpers";
 import { generateNewIdFor } from "../utils";
 import { moveSync, removeSync } from "fs-extra";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import { isDefined } from "../../common/utils";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
@@ -100,7 +100,7 @@ export default {
       }
     };
 
-    const folder = joinPaths(userDataPath, "lens-local-storage");
+    const folder = joinPaths(userDataPath.get(), "lens-local-storage");
     const oldClusters: ClusterModel[] = store.get("clusters") ?? [];
     const clusters = new Map<string, ClusterModel>();
 

src/migrations/hotbar-store/5.0.0-beta.10.ts

@@ -13,7 +13,7 @@ import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
 import { generateNewIdFor } from "../utils";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import catalogCatalogEntityInjectable from "../../common/catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable";
 import { isDefined, isErrnoException } from "../../common/utils";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
@@ -39,7 +39,7 @@ export default {
 
     const di = getLegacyGlobalDiForExtensionApi();
 
-    const userDataPath = di.inject(directoryForUserDataInjectable);
+    const userDataPath = di.inject(directoryForUserDataInjectable).get();
     const joinPaths = di.inject(joinPathsInjectable);
 
     // Hotbars might be empty, if some of the previous migrations weren't run

src/migrations/user-store/5.0.3-beta.1.ts

@@ -11,7 +11,7 @@ import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
 import { isErrnoException } from "../../common/utils";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data.injectable";
 import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
 import isLogicalChildPathInjectable from "../../common/path/is-logical-child-path.injectable";
@@ -25,7 +25,7 @@ export default {
 
       const di = getLegacyGlobalDiForExtensionApi();
 
-      const userDataPath = di.inject(directoryForUserDataInjectable);
+      const userDataPath = di.inject(directoryForUserDataInjectable).get();
       const kubeConfigsPath = di.inject(directoryForKubeConfigsInjectable);
       const joinPaths = di.inject(joinPathsInjectable);
       const isLogicalChildPath = di.inject(isLogicalChildPathInjectable);

src/renderer/components/+catalog/catalog.test.tsx

@@ -18,7 +18,7 @@ import catalogEntityStoreInjectable from "./catalog-entity-store/catalog-entity-
 import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
 import type { DiRender } from "../test-utils/renderFor";
 import { renderFor } from "../test-utils/renderFor";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import type { AppEvent } from "../../../common/app-event-bus/event-bus";
 import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
@@ -65,7 +65,9 @@ describe("<Catalog />", () => {
   beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     di.override(broadcastMessageInjectable, () => async () => {});
 

src/renderer/components/+extensions/__tests__/extensions.test.tsx

@@ -15,7 +15,7 @@ import extensionLoaderInjectable from "../../../../extensions/extension-loader/e
 import type { DiRender } from "../../test-utils/renderFor";
 import { renderFor } from "../../test-utils/renderFor";
 import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
-import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data.injectable";
 import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
 import assert from "assert";
 import type { InstallExtensionFromInput } from "../install-extension-from-input.injectable";
@@ -43,7 +43,9 @@ describe("Extensions", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads");
 
     render = renderFor(di);

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

@@ -7,7 +7,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
 import React from "react";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import { Namespace } from "../../../common/k8s-api/endpoints";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
@@ -36,7 +36,9 @@ describe("<NamespaceSelectFilter />", () => {
 
   beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
-    di.override(directoryForUserDataInjectable, () => "/some-directory");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "/some-directory",
+    }));
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
     namespaceStore = di.inject(namespaceStoreInjectable);
 

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

@@ -10,7 +10,7 @@ import { RoleBindingDialog } from "../dialog";
 import { getDiForUnitTesting } from "../../../../getDiForUnitTesting";
 import type { DiRender } from "../../../test-utils/renderFor";
 import { renderFor } from "../../../test-utils/renderFor";
-import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data.injectable";
 import clusterRoleStoreInjectable from "../../+cluster-roles/store.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../../../stores-apis-can-be-created.injectable";
 
@@ -21,7 +21,9 @@ describe("RoleBindingDialog tests", () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     render = renderFor(di);
 

src/renderer/components/dock/__test__/dock-store.test.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data.injectable";
 import hostedClusterIdInjectable from "../../../cluster-frame-context/hosted-cluster-id.injectable";
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import type { DockStore, DockTab } from "../dock/store";
@@ -25,7 +25,9 @@ describe("DockStore", () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(hostedClusterIdInjectable, () => "some-cluster-id");
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     dockStore = di.inject(dockStoreInjectable);
   });

src/renderer/components/dock/__test__/dock-tabs.test.tsx

@@ -15,7 +15,7 @@ import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import dockStoreInjectable from "../dock/store.injectable";
 import type { DiRender } from "../../test-utils/renderFor";
 import { renderFor } from "../../test-utils/renderFor";
-import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import assert from "assert";
 import hostedClusterIdInjectable from "../../../cluster-frame-context/hosted-cluster-id.injectable";
@@ -77,10 +77,9 @@ describe("<DockTabs />", () => {
     render = renderFor(di);
 
     di.override(hostedClusterIdInjectable, () => "some-cluster-id");
-    di.override(
-      directoryForUserDataInjectable,
-      () => "some-test-suite-specific-directory-for-user-data",
-    );
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-test-suite-specific-directory-for-user-data",
+    }));
 
     di.permitSideEffects(getConfigurationFileModelInjectable);
 

src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx

@@ -12,7 +12,7 @@ import mockFs from "mock-fs";
 import { getDiForUnitTesting } from "../../../../getDiForUnitTesting";
 import type { DiRender } from "../../../test-utils/renderFor";
 import { renderFor } from "../../../test-utils/renderFor";
-import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data.injectable";
 import callForLogsInjectable from "../call-for-logs.injectable";
 import type { LogTabViewModelDependencies } from "../logs-view-model";
 import { LogTabViewModel } from "../logs-view-model";
@@ -130,7 +130,9 @@ describe("<LogResourceSelector />", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(callForLogsInjectable, () => () => Promise.resolve("some-logs"));
 
     di.permitSideEffects(getConfigurationFileModelInjectable);

src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx

@@ -14,7 +14,7 @@ import { renderFor } from "../../test-utils/renderFor";
 import hotbarStoreInjectable from "../../../../common/hotbars/store.injectable";
 import { ConfirmDialog } from "../../confirm-dialog";
 import mockFs from "mock-fs";
-import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import type { HotbarStore } from "../../../../common/hotbars/store";
 import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
@@ -44,7 +44,9 @@ describe("<HotbarRemoveCommand />", () => {
     mockFs();
 
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     di.permitSideEffects(hotbarStoreInjectable);
     di.permitSideEffects(getConfigurationFileModelInjectable);

src/renderer/components/select/select.test.tsx

@@ -11,7 +11,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import type { DiRender } from "../test-utils/renderFor";
 import { renderFor } from "../test-utils/renderFor";
 import mockFs from "mock-fs";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
 import { computed } from "mobx";
 import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
@@ -34,7 +34,9 @@ describe("<Select />", () => {
 
     mockFs();
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
     di.override(rendererExtensionsInjectable, () => computed(() => [] as LensRendererExtension[]));
 
     di.permitSideEffects(getConfigurationFileModelInjectable);

src/renderer/components/status-bar/status-bar.test.tsx

@@ -9,7 +9,7 @@ import type { IObservableArray } from "mobx";
 import { computed, observable } from "mobx";
 import type { StatusBarItems } from "./status-bar-items.injectable";
 import statusBarItemsInjectable from "./status-bar-items.injectable";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import type { ApplicationBuilder } from "../test-utils/get-application-builder";
 import { getApplicationBuilder } from "../test-utils/get-application-builder";
 import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable";
@@ -26,7 +26,9 @@ describe("<StatusBar />", () => {
     builder.beforeWindowStart((windowDi) => {
       windowDi.unoverride(getRandomIdInjectable);
       windowDi.permitSideEffects(getRandomIdInjectable);
-      windowDi.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+      windowDi.override(directoryForUserDataInjectable, () => ({
+        get: () => "some-directory-for-user-data",
+      }));
     });
 
     builder.extensions.enable({

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

@@ -17,7 +17,7 @@ import { computed } from "mobx";
 import type { Cluster } from "../../../common/cluster/cluster";
 import createClusterInjectable from "../../create-cluster/create-cluster.injectable";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
-import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import legacyOnChannelListenInjectable from "../../ipc/legacy-channel-listen.injectable";
 import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
@@ -43,7 +43,9 @@ describe("<ClusterFrame />", () => {
 
     di.override(subscribeStoresInjectable, () => jest.fn().mockImplementation(() => jest.fn()));
     di.override(legacyOnChannelListenInjectable, () => jest.fn().mockImplementation(() => jest.fn()));
-    di.override(directoryForUserDataInjectable, () => "/some/irrelavent/path");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "/some/irrelavent/path",
+    }));
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
     useFakeTime("2000-01-01 12:00:00am");

src/renderer/search-store/search-store.test.ts

@@ -8,7 +8,7 @@ import { Console } from "console";
 import { stdout, stderr } from "process";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import directoryForUserDataInjectable
-  from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+  from "../../common/app-paths/directory-for-user-data.injectable";
 import searchStoreInjectable from "./search-store.injectable";
 
 jest.mock("electron", () => ({
@@ -31,7 +31,9 @@ describe("search store tests", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => ({
+      get: () => "some-directory-for-user-data",
+    }));
 
     searchStore = di.inject(searchStoreInjectable);
   });