From ef631815d59c540d3e56724496b8495a4eff5c4e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 14 Sep 2022 12:47:36 -0400 Subject: [PATCH] Move GetCustomKubeConfigDirectory Signed-off-by: Sebastian Malton --- src/common/__tests__/cluster-store.test.ts | 2 +- .../get-custom-kube-config-directory.injectable.ts | 4 ++-- src/migrations/cluster-store/3.6.0-beta.1.ts | 2 +- src/renderer/components/+add-cluster/add-cluster.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/common/app-paths/{get-custom-kube-config-directory => }/get-custom-kube-config-directory.injectable.ts (80%) diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts index f95ba43a20..0e81ed67fa 100644 --- a/src/common/__tests__/cluster-store.test.ts +++ b/src/common/__tests__/cluster-store.test.ts @@ -10,7 +10,7 @@ import fse from "fs-extra"; import type { ClusterStore } from "../cluster-store/cluster-store"; import { Console } from "console"; import { stdout, stderr } from "process"; -import getCustomKubeConfigDirectoryInjectable from "../app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable"; +import getCustomKubeConfigDirectoryInjectable from "../app-paths/get-custom-kube-config-directory.injectable"; import clusterStoreInjectable from "../cluster-store/cluster-store.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import type { CreateCluster } from "../cluster/create-cluster-injection-token"; diff --git a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts b/src/common/app-paths/get-custom-kube-config-directory.injectable.ts similarity index 80% rename from src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts rename to src/common/app-paths/get-custom-kube-config-directory.injectable.ts index 8f4c38c238..16f6168523 100644 --- a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts +++ b/src/common/app-paths/get-custom-kube-config-directory.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import directoryForKubeConfigsInjectable from "../directory-for-kube-configs.injectable"; -import joinPathsInjectable from "../../path/join-paths.injectable"; +import directoryForKubeConfigsInjectable from "./directory-for-kube-configs.injectable"; +import joinPathsInjectable from "../path/join-paths.injectable"; const getCustomKubeConfigDirectoryInjectable = getInjectable({ id: "get-custom-kube-config-directory", diff --git a/src/migrations/cluster-store/3.6.0-beta.1.ts b/src/migrations/cluster-store/3.6.0-beta.1.ts index 28a5255ecd..6ee40ed29a 100644 --- a/src/migrations/cluster-store/3.6.0-beta.1.ts +++ b/src/migrations/cluster-store/3.6.0-beta.1.ts @@ -14,7 +14,7 @@ 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.injectable"; import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs.injectable"; -import getCustomKubeConfigDirectoryInjectable from "../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable"; +import getCustomKubeConfigDirectoryInjectable from "../../common/app-paths/get-custom-kube-config-directory.injectable"; import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index 5af1e13b48..39ad59d396 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -20,7 +20,7 @@ import { Notifications } from "../notifications"; import { SettingLayout } from "../layout/setting-layout"; import { MonacoEditor } from "../monaco-editor"; import { withInjectables } from "@ogre-tools/injectable-react"; -import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable"; +import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory.injectable"; import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import type { EmitAppEvent } from "../../../common/app-event-bus/emit-event.injectable";