From 9276cdff76965aefbd75738b6c81cc0ff8204f41 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 14 Sep 2022 12:45:42 -0400
Subject: [PATCH] Convert DirectoryForKubectlBinaries to LazyInitializableState

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../directory-for-kubectl-binaries.injectable.ts           | 7 +++----
 .../kubectl-path-to-binary/kubectl-path-to-binary.tsx      | 7 ++++---
 src/main/kubectl/create-kubectl.injectable.ts              | 2 +-
 src/main/kubectl/kubectl.ts                                | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)
 rename src/common/app-paths/{directory-for-kubectl-binaries => }/directory-for-kubectl-binaries.injectable.ts (69%)

diff --git a/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts b/src/common/app-paths/directory-for-kubectl-binaries.injectable.ts
similarity index 69%
rename from src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts
rename to src/common/app-paths/directory-for-kubectl-binaries.injectable.ts
index 3a28184266..178a79ad98 100644
--- a/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts
+++ b/src/common/app-paths/directory-for-kubectl-binaries.injectable.ts
@@ -2,13 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import directoryForBinariesInjectable from "../directory-for-binaries.injectable";
-import joinPathsInjectable from "../../path/join-paths.injectable";
-import { createLazyInitializableState } from "../../initializable-state/create-lazy";
+import directoryForBinariesInjectable from "./directory-for-binaries.injectable";
+import { createLazyInitializableState } from "../initializable-state/create-lazy";
+import joinPathsInjectable from "../path/join-paths.injectable";
 
 const directoryForKubectlBinariesInjectable = createLazyInitializableState({
   id: "directory-for-kubectl-binaries",
-
   init: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
     const directoryForBinaries = di.inject(directoryForBinariesInjectable);
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx
index ec5482cb88..da70a65cc9 100644
--- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx
@@ -9,11 +9,12 @@ import type { UserStore } from "../../../../../../../common/user-store";
 import userStoreInjectable from "../../../../../../../common/user-store/user-store.injectable";
 import { observer } from "mobx-react";
 import { Input, InputValidators } from "../../../../../../../renderer/components/input";
-import directoryForKubectlBinariesInjectable from "../../../../../../../common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable";
+import directoryForKubectlBinariesInjectable from "../../../../../../../common/app-paths/directory-for-kubectl-binaries.injectable";
+import type { LazyInitializableState } from "../../../../../../../common/initializable-state/create-lazy";
 
 interface Dependencies {
   userStore: UserStore;
-  defaultPathForKubectlBinaries: string;
+  defaultPathForKubectlBinaries: LazyInitializableState<string>;
 }
 
 const NonInjectedKubectlPathToBinary = observer(
@@ -30,7 +31,7 @@ const NonInjectedKubectlPathToBinary = observer(
         <SubTitle title="Path to kubectl binary" />
         <Input
           theme="round-black"
-          placeholder={defaultPathForKubectlBinaries}
+          placeholder={defaultPathForKubectlBinaries.get()}
           value={binariesPath}
           validators={pathValidator}
           onChange={setBinariesPath}
diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts
index f5a278ab7b..f0a242ab2e 100644
--- a/src/main/kubectl/create-kubectl.injectable.ts
+++ b/src/main/kubectl/create-kubectl.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { KubectlDependencies } from "./kubectl";
 import { Kubectl } from "./kubectl";
-import directoryForKubectlBinariesInjectable from "../../common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable";
+import directoryForKubectlBinariesInjectable from "../../common/app-paths/directory-for-kubectl-binaries.injectable";
 import userStoreInjectable from "../../common/user-store/user-store.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "./normalized-arch.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
diff --git a/src/main/kubectl/kubectl.ts b/src/main/kubectl/kubectl.ts
index b77dbba97d..edcc288206 100644
--- a/src/main/kubectl/kubectl.ts
+++ b/src/main/kubectl/kubectl.ts
@@ -17,11 +17,12 @@ import { noop } from "lodash/fp";
 import type { JoinPaths } from "../../common/path/join-paths.injectable";
 import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
 import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable";
+import type { LazyInitializableState } from "../../common/initializable-state/create-lazy";
 
 const initScriptVersionString = "# lens-initscript v3";
 
 export interface KubectlDependencies {
-  readonly directoryForKubectlBinaries: string;
+  readonly directoryForKubectlBinaries: LazyInitializableState<string>;
   readonly normalizedDownloadPlatform: "darwin" | "linux" | "windows";
   readonly normalizedDownloadArch: "amd64" | "arm64" | "386";
   readonly kubectlBinaryName: string;
@@ -88,12 +89,12 @@ export class Kubectl {
     return this.dependencies.userStore.kubectlBinariesPath || this.getBundledPath();
   }
 
-  protected getDownloadDir() {
+  protected getDownloadDir(): string {
     if (this.dependencies.userStore.downloadBinariesPath) {
       return this.dependencies.joinPaths(this.dependencies.userStore.downloadBinariesPath, "kubectl");
     }
 
-    return this.dependencies.directoryForKubectlBinaries;
+    return this.dependencies.directoryForKubectlBinaries.get();
   }
 
   public getPath = async (bundled = false): Promise<string> => {