diff --git a/packages/core/src/common/cluster/create-can-i.injectable.ts b/packages/core/src/common/cluster/create-can-i.injectable.ts index e41ea819c4..d442bc3f6d 100644 --- a/packages/core/src/common/cluster/create-can-i.injectable.ts +++ b/packages/core/src/common/cluster/create-can-i.injectable.ts @@ -5,7 +5,7 @@ import type { AuthorizationV1Api, V1ResourceAttributes } from "@kubernetes/client-node"; import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; /** * Requests the permissions for actions on the kube cluster @@ -19,7 +19,7 @@ export type CreateCanI = (api: AuthorizationV1Api) => CanI; const createCanIInjectable = getInjectable({ id: "create-can-i", instantiate: (di): CreateCanI => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (api) => async (resourceAttributes: V1ResourceAttributes): Promise => { try { diff --git a/packages/core/src/common/cluster/create-request-namespace-list-permissions.injectable.ts b/packages/core/src/common/cluster/create-request-namespace-list-permissions.injectable.ts index eb5bf15e2e..dc8c58cfcc 100644 --- a/packages/core/src/common/cluster/create-request-namespace-list-permissions.injectable.ts +++ b/packages/core/src/common/cluster/create-request-namespace-list-permissions.injectable.ts @@ -5,7 +5,7 @@ import type { AuthorizationV1Api } from "@kubernetes/client-node"; import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { KubeApiResource } from "../rbac"; export type CanListResource = (resource: KubeApiResource) => boolean; @@ -21,7 +21,7 @@ export type CreateRequestNamespaceListPermissions = (api: AuthorizationV1Api) => const createRequestNamespaceListPermissionsInjectable = getInjectable({ id: "create-request-namespace-list-permissions", instantiate: (di): CreateRequestNamespaceListPermissions => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (api) => async (namespace) => { try { diff --git a/packages/core/src/common/ipc/ipc.ts b/packages/core/src/common/ipc/ipc.ts index 192095be94..d67f2c62b5 100644 --- a/packages/core/src/common/ipc/ipc.ts +++ b/packages/core/src/common/ipc/ipc.ts @@ -12,7 +12,7 @@ import { toJS } from "../utils/toJS"; import type { Disposer } from "@k8slens/utilities"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import ipcMainInjectionToken from "./ipc-main-injection-token"; import clusterFramesInjectable from "../cluster-frames.injectable"; @@ -38,7 +38,7 @@ export async function broadcastMessage(channel: string, ...args: any[]): Promise } const di = getLegacyGlobalDiForExtensionApi(); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const clusterFrames = di.inject(clusterFramesInjectable); ipcMain.listeners(channel).forEach((func) => func({ diff --git a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts index 88236d5bb2..1f02b9aa62 100644 --- a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts @@ -11,7 +11,7 @@ import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable"; import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import directoryForUserDataInjectable from "../../app-paths/directory-for-user-data/directory-for-user-data.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { ApiManager } from "../api-manager"; import apiManagerInjectable from "../api-manager/manager.injectable"; import { KubeApi } from "../kube-api"; @@ -61,7 +61,7 @@ describe("ApiManager", () => { const apiBase = "apis/v1/foo"; const fallbackApiBase = "/apis/extensions/v1beta1/foo"; const kubeApi = new TestApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { objectConstructor: KubeObject, @@ -72,7 +72,7 @@ describe("ApiManager", () => { }); const kubeStore = new TestStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, kubeApi); apiManager.registerApi(kubeApi); @@ -136,7 +136,7 @@ describe("ApiManager", () => { return Object.assign( new KubeApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { objectConstructor }), { @@ -189,7 +189,7 @@ describe("ApiManager", () => { apiManager.registerStore(Object.assign( new KubeObjectStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api), { someField: 2, diff --git a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts index e96569b9ef..e82e33fc37 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts @@ -20,7 +20,7 @@ import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kub import apiManagerInjectable from "../api-manager/manager.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import ingressApiInjectable from "../endpoints/ingress.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { Cluster } from "../../cluster/cluster"; @@ -709,7 +709,7 @@ describe("KubeApi", () => { beforeEach(async () => { horizontalPodAutoscalerApi = new HorizontalPodAutoscalerApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { allowedUsableVersions: { diff --git a/packages/core/src/common/k8s-api/api-manager/create-custom-resource-store.injectable.ts b/packages/core/src/common/k8s-api/api-manager/create-custom-resource-store.injectable.ts index 16bc745eb7..028a316ec0 100644 --- a/packages/core/src/common/k8s-api/api-manager/create-custom-resource-store.injectable.ts +++ b/packages/core/src/common/k8s-api/api-manager/create-custom-resource-store.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../renderer/cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { KubeApi } from "../kube-api"; import type { KubeObject } from "../kube-object"; import type { KubeObjectStoreDependencies } from "../kube-object.store"; @@ -17,7 +17,7 @@ const createCustomResourceStoreInjectable = getInjectable({ instantiate: (di): CreateCustomResourceStore => { const deps: KubeObjectStoreDependencies = { context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; return (api) => new CustomResourceStore(deps, api); diff --git a/packages/core/src/common/k8s-api/create-json-api.injectable.ts b/packages/core/src/common/k8s-api/create-json-api.injectable.ts index 0a0bc66341..65c207ab10 100644 --- a/packages/core/src/common/k8s-api/create-json-api.injectable.ts +++ b/packages/core/src/common/k8s-api/create-json-api.injectable.ts @@ -7,7 +7,7 @@ import { Agent } from "https"; import type { RequestInit } from "@k8slens/node-fetch"; import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable"; import fetchInjectable from "../fetch/fetch.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { JsonApiConfig, JsonApiData, JsonApiDependencies, JsonApiParams } from "./json-api"; import { JsonApi } from "./json-api"; @@ -18,7 +18,7 @@ const createJsonApiInjectable = getInjectable({ instantiate: (di): CreateJsonApi => { const deps: JsonApiDependencies = { fetch: di.inject(fetchInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; const lensProxyCert = di.inject(lensProxyCertificateInjectable); diff --git a/packages/core/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts b/packages/core/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts index 7b25b1815d..2954a6bd87 100644 --- a/packages/core/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts +++ b/packages/core/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { apiKubePrefix } from "../vars"; import isDevelopmentInjectable from "../vars/is-development.injectable"; import apiBaseInjectable from "./api-base.injectable"; @@ -37,7 +37,7 @@ const createKubeApiForClusterInjectable = getInjectable({ const apiBase = di.inject(apiBaseInjectable); const isDevelopment = di.inject(isDevelopmentInjectable); const createKubeJsonApi = di.inject(createKubeJsonApiInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return ( cluster: CreateKubeApiForLocalClusterConfig, diff --git a/packages/core/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts b/packages/core/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts index 3728499d7d..207faa5341 100644 --- a/packages/core/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts +++ b/packages/core/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { AgentOptions } from "https"; import { Agent } from "https"; import type { RequestInit } from "@k8slens/node-fetch"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import isDevelopmentInjectable from "../vars/is-development.injectable"; import createKubeJsonApiInjectable from "./create-kube-json-api.injectable"; import type { KubeApiOptions } from "./kube-api"; @@ -53,7 +53,7 @@ const createKubeApiForRemoteClusterInjectable = getInjectable({ instantiate: (di): CreateKubeApiForRemoteCluster => { const isDevelopment = di.inject(isDevelopmentInjectable); const createKubeJsonApi = di.inject(createKubeJsonApiInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return ( config: CreateKubeApiForRemoteClusterConfig, diff --git a/packages/core/src/common/k8s-api/create-kube-api.injectable.ts b/packages/core/src/common/k8s-api/create-kube-api.injectable.ts index 01e67677b7..c2201aaf8a 100644 --- a/packages/core/src/common/k8s-api/create-kube-api.injectable.ts +++ b/packages/core/src/common/k8s-api/create-kube-api.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { DerivedKubeApiOptions, KubeApiDependencies } from "./kube-api"; import maybeKubeApiInjectable from "./maybe-kube-api.injectable"; @@ -15,7 +15,7 @@ const createKubeApiInjectable = getInjectable({ id: "create-kube-api", instantiate: (di): CreateKubeApi => { const deps: KubeApiDependencies = { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }; diff --git a/packages/core/src/common/k8s-api/create-kube-json-api.injectable.ts b/packages/core/src/common/k8s-api/create-kube-json-api.injectable.ts index 4945207b50..9c72de0076 100644 --- a/packages/core/src/common/k8s-api/create-kube-json-api.injectable.ts +++ b/packages/core/src/common/k8s-api/create-kube-json-api.injectable.ts @@ -7,7 +7,7 @@ import { Agent } from "https"; import type { RequestInit } from "@k8slens/node-fetch"; import lensProxyCertificateInjectable from "../certificate/lens-proxy-certificate.injectable"; import fetchInjectable from "../fetch/fetch.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { JsonApiConfig, JsonApiDependencies } from "./json-api"; import { KubeJsonApi } from "./kube-json-api"; @@ -18,7 +18,7 @@ const createKubeJsonApiInjectable = getInjectable({ instantiate: (di): CreateKubeJsonApi => { const dependencies: JsonApiDependencies = { fetch: di.inject(fetchInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; const lensProxyCert = di.inject(lensProxyCertificateInjectable); diff --git a/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts index 1c79c1cd59..b242c1e006 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ClusterRoleBindingApi } from "./cluster-role-binding.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterRoleBindingApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const clusterRoleBindingApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "clusterRoleBindingApi is only accessible in certain environments"); return new ClusterRoleBindingApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts index 6b70108aff..202a587afa 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ClusterRoleApi } from "./cluster-role.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterRoleApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const clusterRoleApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "clusterRoleApi is only available in certain environments"); return new ClusterRoleApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts index d075ea878e..12f9244c01 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ClusterApi } from "./cluster.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const clusterApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "clusterApi is only available in certain environments"); return new ClusterApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts index d8f4ec935d..63e9ea20cd 100644 --- a/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts @@ -8,7 +8,7 @@ import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-c import { ComponentStatusApi } from "./component-status.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const componentStatusApiInjectable = getInjectable({ id: "component-status-api", @@ -16,7 +16,7 @@ const componentStatusApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "componentStatusApi is only available in certain environments"); return new ComponentStatusApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts index 281787f113..f2a2545c27 100644 --- a/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ConfigMapApi } from "./config-map.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const configMapApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const configMapApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "configMapApi is only available in certain environments"); return new ConfigMapApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts index 5532cc67d5..0c6f0a4fa0 100644 --- a/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { CronJobApi } from "./cron-job.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const cronJobApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const cronJobApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "cronJobApi is only available in certain environments"); return new CronJobApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { checkPreferredVersion: true, diff --git a/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts index b80bf83d7d..b9cf1272bf 100644 --- a/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts @@ -8,7 +8,7 @@ import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-c import { CustomResourceDefinitionApi } from "./custom-resource-definition.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const customResourceDefinitionApiInjectable = getInjectable({ id: "custom-resource-definition-api", @@ -16,7 +16,7 @@ const customResourceDefinitionApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "customResourceDefinitionApi is only available in certain environments"); return new CustomResourceDefinitionApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts index 857dc73360..d7f5fac749 100644 --- a/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { DaemonSetApi } from "./daemon-set.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const daemonSetApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const daemonSetApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "daemonSetApi is only available in certain environements"); return new DaemonSetApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts index 3495898020..2424db923e 100644 --- a/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { DeploymentApi } from "./deployment.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const deploymentApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const deploymentApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "deploymentApi is only available in certain environments"); return new DeploymentApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts index a30da804a5..8b940ebb76 100644 --- a/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { EndpointsApi } from "./endpoint.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const endpointsApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const endpointsApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "endpointsApi is only available in certain environments"); return new EndpointsApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts index ecb040b6ba..3dcb34a500 100644 --- a/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { KubeEventApi } from "./events.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const kubeEventApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const kubeEventApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "kubeEventApi is only available in certain environments"); return new KubeEventApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts index 4ec0c9b7fe..8cc58c3554 100644 --- a/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { HorizontalPodAutoscalerApi } from "./horizontal-pod-autoscaler.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const horizontalPodAutoscalerApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const horizontalPodAutoscalerApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "horizontalPodAutoscalerApi is only available in certain environments"); return new HorizontalPodAutoscalerApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts index be56ae68a7..b04adb5bdc 100644 --- a/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts @@ -5,13 +5,13 @@ import { getInjectable } from "@ogre-tools/injectable"; import { IngressClassApi } from "./ingress-class.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const ingressClassApiInjectable = getInjectable({ id: "ingress-class-api", instantiate: (di) => new IngressClassApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }), diff --git a/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts index ee70c08969..57f1553a50 100644 --- a/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { IngressApi } from "./ingress.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const ingressApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const ingressApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "ingressApi is only available in certain environments"); return new IngressApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts index 40e0786924..9e291544b3 100644 --- a/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { JobApi } from "./job.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const jobApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const jobApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "jobApi is only available in certain environments"); return new JobApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { checkPreferredVersion: true, diff --git a/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts index 014e2fc9a1..a137b5f817 100644 --- a/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { LeaseApi } from "./lease.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const leaseApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const leaseApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "leaseApi is only available in certain environments"); return new LeaseApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts index 8752debb05..b1d8fc04a2 100644 --- a/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { LimitRangeApi } from "./limit-range.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const limitRangeApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const limitRangeApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "limitRangeApi is only available in certain environments"); return new LimitRangeApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts index 42b1603d72..12f7aec364 100644 --- a/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { MutatingWebhookConfigurationApi } from "./mutating-webhook-configuration.api"; @@ -16,7 +16,7 @@ const mutatingWebhookConfigurationApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "mutatingWebhookApi is only available in certain environments"); return new MutatingWebhookConfigurationApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts index 3a1e93e0a4..dbc890ea30 100644 --- a/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { NamespaceApi } from "./namespace.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const namespaceApiInjectable = getInjectable({ @@ -17,7 +17,7 @@ const namespaceApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "namespaceApi is only available in certain environments"); return new NamespaceApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts index 2a0ad3c923..4a489fd99f 100644 --- a/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { NetworkPolicyApi } from "./network-policy.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const networkPolicyApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const networkPolicyApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "networkPolicyApi is only available in certain environments"); return new NetworkPolicyApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts index 2cbf959349..3c257d7cbf 100644 --- a/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { NodeApi } from "./node.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const nodeApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const nodeApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "nodeApi is only available in certain environments"); return new NodeApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts index 3f0127f2e7..82d392d994 100644 --- a/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PersistentVolumeClaimApi } from "./persistent-volume-claim.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const persistentVolumeClaimApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const persistentVolumeClaimApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "persistentVolumeClaimApi is only available in certain environments"); return new PersistentVolumeClaimApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts index edbcd8753c..59bbd1fdcc 100644 --- a/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PersistentVolumeApi } from "./persistent-volume.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const persistentVolumeApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const persistentVolumeApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "persistentVolumeApi is only available in certain environments"); return new PersistentVolumeApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts index 0113d660ab..859f26461b 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PodDisruptionBudgetApi } from "./pod-disruption-budget.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podDisruptionBudgetApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const podDisruptionBudgetApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "podDisruptionBudgetApi is only available in certain environments"); return new PodDisruptionBudgetApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { checkPreferredVersion: true, diff --git a/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts index e671119599..4c1abaf59d 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PodMetricsApi } from "./pod-metrics.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podMetricsApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const podMetricsApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "podMetricsApi is only available in certain environments"); return new PodMetricsApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts index 36537b40b0..4e6b6d7d40 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PodSecurityPolicyApi } from "./pod-security-policy.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podSecurityPolicyApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const podSecurityPolicyApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "podSecurityPolicyApi is only available in certain environments"); return new PodSecurityPolicyApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts index 966e5202cd..c173f35d55 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PodApi } from "./pod.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podApiInjectable = getInjectable({ @@ -17,7 +17,7 @@ const podApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "podApi is only available in certain environments"); return new PodApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts index 5b65a68c01..40587d0ee6 100644 --- a/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { PriorityClassApi } from "./priority-class.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const priorityClassApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const priorityClassApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "PriorityClassApi is only available in certain environments"); return new PriorityClassApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts index 2dcadedd8c..0121d25a5f 100644 --- a/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ReplicaSetApi } from "./replica-set.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const replicaSetApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const replicaSetApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "replicaSetApi is only available in certain environments"); return new ReplicaSetApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts index ae53717793..2885107caf 100644 --- a/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { ReplicationControllerApi } from "./replication-controller.api"; @@ -12,7 +12,7 @@ const replicationControllerApiInjectable = getInjectable({ id: "replication-controller-api", instantiate: (di) => { return new ReplicationControllerApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts index 5ac6caed4c..2c9d293f5b 100644 --- a/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ResourceQuotaApi } from "./resource-quota.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const resourceQuotaApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const resourceQuotaApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "resourceQuotaApi is only available in certain environments"); return new ResourceQuotaApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts index 3d55e8d55f..07b1bf964e 100644 --- a/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { RoleBindingApi } from "./role-binding.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const roleBindingApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const roleBindingApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "roleBindingApi is only available in certain environments"); return new RoleBindingApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts index 4f892b113f..c42c109c3c 100644 --- a/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { RoleApi } from "./role.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const roleApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const roleApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "roleApi is only available in certain environments"); return new RoleApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts index 9f34037e01..b1a01ca7ad 100644 --- a/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { RuntimeClassApi } from "./runtime-class.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const runtimeClassApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const runtimeClassApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "RuntimeClassApi is only available in certain environments"); return new RuntimeClassApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts index 9feb63be68..fca61018f6 100644 --- a/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { SecretApi } from "./secret.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const secretApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const secretApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "secretApi is only available in certain environments"); return new SecretApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts index ea625ca84c..5975b42470 100644 --- a/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { SelfSubjectRulesReviewApi } from "./self-subject-rules-reviews.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const selfSubjectRulesReviewApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const selfSubjectRulesReviewApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "selfSubjectRulesReviewApi is only available in certain environments"); return new SelfSubjectRulesReviewApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts index f4635617a7..0fe092dbf2 100644 --- a/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ServiceAccountApi } from "./service-account.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const serviceAccountApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const serviceAccountApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "serviceAccountApi is only available in certain environments"); return new ServiceAccountApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts index 70f0bacba6..df68250f1a 100644 --- a/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { ServiceApi } from "./service.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const serviceApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const serviceApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "serviceApi is only available in certain environments"); return new ServiceApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts index 561ffbecd1..a6ebecbabf 100644 --- a/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { StatefulSetApi } from "./stateful-set.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const statefulSetApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const statefulSetApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "statefulSetApi is only available in certain environments"); return new StatefulSetApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts index 495a4c0d67..e8e006a39a 100644 --- a/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { StorageClassApi } from "./storage-class.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const storageClassApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const storageClassApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "storageClassApi is only available in certain environments"); return new StorageClassApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts index 1c2fd704ef..8254b3350d 100644 --- a/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { ValidatingWebhookConfigurationApi } from "./validating-webhook-configuration.api"; @@ -16,7 +16,7 @@ const validatingWebhookConfigurationApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "validatingWebhookApi is only available in certain environments"); return new ValidatingWebhookConfigurationApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts index 82a73cbdb7..575b0ea34e 100644 --- a/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; import { VerticalPodAutoscalerApi } from "./vertical-pod-autoscaler.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const verticalPodAutoscalerApiInjectable = getInjectable({ @@ -16,7 +16,7 @@ const verticalPodAutoscalerApiInjectable = getInjectable({ assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "verticalPodAutoscalerApi is only available in certain environments"); return new VerticalPodAutoscalerApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }); }, diff --git a/packages/core/src/common/k8s/create-resource-stack.injectable.ts b/packages/core/src/common/k8s/create-resource-stack.injectable.ts index 2c4b142042..a05862cd8e 100644 --- a/packages/core/src/common/k8s/create-resource-stack.injectable.ts +++ b/packages/core/src/common/k8s/create-resource-stack.injectable.ts @@ -7,7 +7,7 @@ import type { KubernetesCluster } from "../catalog-entities"; import readDirectoryInjectable from "../fs/read-directory.injectable"; import readFileInjectable from "../fs/read-file.injectable"; import { kubectlApplyAllInjectionToken, kubectlDeleteAllInjectionToken } from "../kube-helpers/channels"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import joinPathsInjectable from "../path/join-paths.injectable"; import type { ResourceApplyingStack, ResourceStackDependencies } from "./resource-stack"; import { ResourceStack } from "./resource-stack"; @@ -21,7 +21,7 @@ const createResourceStackInjectable = getInjectable({ joinPaths: di.inject(joinPathsInjectable), kubectlApplyAll: di.inject(kubectlApplyAllInjectionToken), kubectlDeleteAll: di.inject(kubectlDeleteAllInjectionToken), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), readDirectory: di.inject(readDirectoryInjectable), readFile: di.inject(readFileInjectable), }; diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/common/persistent-storage/create.injectable.ts index bf265e4388..7e9d093ddd 100644 --- a/packages/core/src/common/persistent-storage/create.injectable.ts +++ b/packages/core/src/common/persistent-storage/create.injectable.ts @@ -10,7 +10,7 @@ import type { IEqualsComparer } from "mobx"; import { reaction } from "mobx"; import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import getBasenameOfPathInjectable from "../path/get-basename.injectable"; import { enlistMessageChannelListenerInjectionToken, sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import type { MessageChannel } from "@k8slens/messaging"; @@ -63,7 +63,7 @@ const createPersistentStorageInjectable = getInjectable({ instantiate: (di): CreatePersistentStorage => { const directoryForUserData = di.inject(directoryForUserDataInjectable); const getConfigurationFileModel = di.inject(getConfigurationFileModelInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const getBasenameOfPath = di.inject(getBasenameOfPathInjectable); const ipcChannelPrefixes = di.inject(persistentStorageIpcChannelPrefixesInjectionToken); const persistStateToConfig = di.inject(persistStateToConfigInjectionToken); diff --git a/packages/core/src/common/persistent-storage/migrations.injectable.ts b/packages/core/src/common/persistent-storage/migrations.injectable.ts index acd3314482..f2feede7d9 100644 --- a/packages/core/src/common/persistent-storage/migrations.injectable.ts +++ b/packages/core/src/common/persistent-storage/migrations.injectable.ts @@ -4,7 +4,7 @@ */ import type { InjectionToken } from "@ogre-tools/injectable"; import { lifecycleEnum, getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { getOrInsert, iter, object } from "@k8slens/utilities"; export type AllowedSetValue = T extends (...args: any[]) => any @@ -32,7 +32,7 @@ export interface MigrationDeclaration { const persistentStorageMigrationsInjectable = getInjectable({ id: "persistent-storage-migrations", instantiate: (di, token) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const declarations = di.injectMany(token); const migrations = new Map(); diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts index d700c55729..293e68030f 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; export type WithErrorLoggingFor = ( getErrorMessage: (error: unknown) => string @@ -15,7 +15,7 @@ const withErrorLoggingInjectable = getInjectable({ id: "with-error-logging", instantiate: (di): WithErrorLoggingFor => { - const logError = di.inject(logErrorInjectable); + const logError = di.inject(logErrorInjectionToken); return (getErrorMessage) => (toBeDecorated) => diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts index 1badbc594e..5e8d730656 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts @@ -9,7 +9,7 @@ import { pipeline } from "@ogre-tools/fp"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getPromiseStatus } from "@k8slens/test-utils"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("with-error-logging", () => { describe("given decorated sync function", () => { @@ -22,7 +22,7 @@ describe("with-error-logging", () => { logErrorMock = jest.fn(); - di.override(logErrorInjectable, () => logErrorMock); + di.override(logErrorInjectionToken, () => logErrorMock); const withErrorLoggingFor = di.inject(withErrorLoggingInjectable); @@ -120,7 +120,7 @@ describe("with-error-logging", () => { logErrorMock = jest.fn(); - di.override(logErrorInjectable, () => logErrorMock); + di.override(logErrorInjectionToken, () => logErrorMock); const withErrorLoggingFor = di.inject(withErrorLoggingInjectable); diff --git a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts index dbbe9408b4..a4eed716a0 100644 --- a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts +++ b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts @@ -6,7 +6,7 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting"; import withOrphanPromiseInjectable from "./with-orphan-promise.injectable"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("with orphan promise, when called", () => { let toBeDecorated: AsyncFnMock<(arg1: string, arg2: string) => Promise>; @@ -18,7 +18,7 @@ describe("with orphan promise, when called", () => { logErrorMock = jest.fn(); - di.override(logErrorInjectable, () => logErrorMock); + di.override(logErrorInjectionToken, () => logErrorMock); const withOrphanPromise = di.inject(withOrphanPromiseInjectable); diff --git a/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts b/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts index c5f951e2f9..836d8fa111 100644 --- a/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts +++ b/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts @@ -5,7 +5,7 @@ import type { Injectable } from "@ogre-tools/injectable"; import { asLegacyGlobalForExtensionApi } from "./as-legacy-global-object-for-extension-api"; import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface LegacySingleton { createInstance(): T; @@ -32,7 +32,7 @@ export function asLegacyGlobalSingletonForExtensionApi { const di = getLegacyGlobalDiForExtensionApi(); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); logger.warn( `resetInstance() for a legacy global singleton of "${injectable.id}" does nothing.`, diff --git a/packages/core/src/extensions/common-api/index.ts b/packages/core/src/extensions/common-api/index.ts index 86c5090594..86f4d8010d 100644 --- a/packages/core/src/extensions/common-api/index.ts +++ b/packages/core/src/extensions/common-api/index.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; // APIs @@ -20,4 +20,4 @@ export type { LensExtension } from "../lens-extension"; export type { PackageJson } from "type-fest"; export type { LensExtensionManifest, InstalledExtension } from "@k8slens/legacy-extensions"; -export const logger = asLegacyGlobalForExtensionApi(loggerInjectable); +export const logger = asLegacyGlobalForExtensionApi(loggerInjectionToken); diff --git a/packages/core/src/extensions/common-api/k8s-api.ts b/packages/core/src/extensions/common-api/k8s-api.ts index a5dbd73d81..27179482fe 100644 --- a/packages/core/src/extensions/common-api/k8s-api.ts +++ b/packages/core/src/extensions/common-api/k8s-api.ts @@ -22,7 +22,7 @@ import type { DerivedKubeApiOptions, KubeApiDependencies, KubeApiOptions } from import { KubeApi as InternalKubeApi } from "../../common/k8s-api/kube-api"; import clusterFrameContextForNamespacedResourcesInjectable from "../../renderer/cluster-frame-context/for-namespaced-resources.injectable"; import type { ClusterContext } from "../../renderer/cluster-frame-context/cluster-frame-context"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import maybeKubeApiInjectable from "../../common/k8s-api/maybe-kube-api.injectable"; import { DeploymentApi as InternalDeploymentApi, IngressApi as InternalIngressApi, NodeApi, PersistentVolumeClaimApi, PodApi } from "../../common/k8s-api/endpoints"; @@ -44,7 +44,7 @@ const getKubeApiDeps = (): KubeApiDependencies => { const di = getLegacyGlobalDiForExtensionApi(); return { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }; }; @@ -185,7 +185,7 @@ export abstract class KubeObjectStore< super( { context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, // eslint-disable-next-line @typescript-eslint/no-non-null-assertion api!, diff --git a/packages/core/src/extensions/extension-discovery/extension-discovery.injectable.ts b/packages/core/src/extensions/extension-discovery/extension-discovery.injectable.ts index 64029eef23..5a43473034 100644 --- a/packages/core/src/extensions/extension-discovery/extension-discovery.injectable.ts +++ b/packages/core/src/extensions/extension-discovery/extension-discovery.injectable.ts @@ -10,7 +10,7 @@ import extensionInstallationStateStoreInjectable from "../extension-installation import installExtensionInjectable from "../install-extension/install-extension.injectable"; import extensionPackageRootDirectoryInjectable from "../install-extension/extension-package-root-directory.injectable"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import watchInjectable from "../../common/fs/watch/watch.injectable"; import accessPathInjectable from "../../common/fs/access-path.injectable"; @@ -43,7 +43,7 @@ const extensionDiscoveryInjectable = getInjectable({ readJsonFile: di.inject(readJsonFileInjectable), pathExists: di.inject(pathExistsInjectable), watch: di.inject(watchInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), accessPath: di.inject(accessPathInjectable), copy: di.inject(copyInjectable), removePath: di.inject(removePathInjectable), diff --git a/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts b/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts index f1ed75a48f..07d5759366 100644 --- a/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts +++ b/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts @@ -3,13 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { ExtensionInstallationStateStore } from "./extension-installation-state-store"; const extensionInstallationStateStoreInjectable = getInjectable({ id: "extension-installation-state-store", instantiate: (di) => new ExtensionInstallationStateStore({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/extensions/extension-loader/extension-loader.injectable.ts b/packages/core/src/extensions/extension-loader/extension-loader.injectable.ts index 4daa398d29..d2d3c93277 100644 --- a/packages/core/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/packages/core/src/extensions/extension-loader/extension-loader.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { ExtensionLoader } from "./extension-loader"; import extensionInstancesInjectable from "./extension-instances.injectable"; import extensionInjectable from "./extension/extension.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions"; @@ -22,7 +22,7 @@ const extensionLoaderInjectable = getInjectable({ getExtension: (instance) => di.inject(extensionInjectable, instance), bundledExtensions: di.injectMany(bundledExtensionInjectionToken), extensionEntryPointName: di.inject(extensionEntryPointNameInjectionToken), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), joinPaths: di.inject(joinPathsInjectable), getDirnameOfPath: di.inject(getDirnameOfPathInjectable), }), diff --git a/packages/core/src/extensions/install-extension/install-extension.injectable.ts b/packages/core/src/extensions/install-extension/install-extension.injectable.ts index ea4a5c66dd..9d87d6e530 100644 --- a/packages/core/src/extensions/install-extension/install-extension.injectable.ts +++ b/packages/core/src/extensions/install-extension/install-extension.injectable.ts @@ -7,7 +7,7 @@ import { fork } from "child_process"; import AwaitLock from "await-lock"; import pathToNpmCliInjectable from "../../common/app-paths/path-to-npm-cli.injectable"; import extensionPackageRootDirectoryInjectable from "./extension-package-root-directory.injectable"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import type { PackageJson } from "../common-api"; @@ -36,7 +36,7 @@ const installExtensionInjectable = getInjectable({ const readJsonFile = di.inject(readJsonFileInjectable); const writeJsonFile = di.inject(writeJsonFileInjectable); const joinPaths = di.inject(joinPathsInjectable); - const logger = di.inject(prefixedLoggerInjectable, "EXTENSION-INSTALLER"); + const logger = di.inject(prefixedLoggerInjectionToken, "EXTENSION-INSTALLER"); const forkNpm = (...args: string[]) => new Promise((resolve, reject) => { const child = fork(pathToNpmCli, args, { diff --git a/packages/core/src/extensions/ipc/ipc-main.ts b/packages/core/src/extensions/ipc/ipc-main.ts index 16ebebb1e8..6208dbe6ce 100644 --- a/packages/core/src/extensions/ipc/ipc-main.ts +++ b/packages/core/src/extensions/ipc/ipc-main.ts @@ -11,7 +11,7 @@ import { once } from "lodash"; import { ipcMainHandle } from "../../common/ipc"; import type { Logger } from "../common-api"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; interface Dependencies { readonly logger: Logger; @@ -26,7 +26,7 @@ export abstract class IpcMain extends IpcRegistrar { const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi("main"); this.dependencies = { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; // Call the static method on the bottom child class. diff --git a/packages/core/src/extensions/lens-main-extension.ts b/packages/core/src/extensions/lens-main-extension.ts index 19a0389932..712dff490f 100644 --- a/packages/core/src/extensions/lens-main-extension.ts +++ b/packages/core/src/extensions/lens-main-extension.ts @@ -16,7 +16,7 @@ import type { InstalledExtension } from "./common-api"; import type { CatalogEntityRegistry } from "../main/catalog"; import type { NavigateForExtension } from "../main/start-main-application/lens-window/navigate-for-extension.injectable"; import catalogEntityRegistryInjectable from "../main/catalog/entity-registry.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import navigateForExtensionInjectable from "../main/start-main-application/lens-window/navigate-for-extension.injectable"; import ensureHashedDirectoryForExtensionInjectable from "./extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable"; @@ -40,7 +40,7 @@ export class LensMainExtension extends LensExtension { ensureHashedDirectoryForExtension: di.inject(ensureHashedDirectoryForExtensionInjectable), navigate: di.inject(navigateForExtensionInjectable), entityRegistry: di.inject(catalogEntityRegistryInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; super(deps, extension); diff --git a/packages/core/src/extensions/lens-renderer-extension.ts b/packages/core/src/extensions/lens-renderer-extension.ts index 76f6eb810b..9ed8287140 100644 --- a/packages/core/src/extensions/lens-renderer-extension.ts +++ b/packages/core/src/extensions/lens-renderer-extension.ts @@ -39,7 +39,7 @@ import type { InstalledExtension } from "./common-api"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "./as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import catalogCategoryRegistryInjectable from "../common/catalog/category-registry.injectable"; import catalogEntityRegistryInjectable from "../renderer/api/catalog/entity/registry.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import getExtensionPageParametersInjectable from "../renderer/routes/get-extension-page-parameters.injectable"; import navigateToRouteInjectable from "../renderer/routes/navigate-to-route.injectable"; import routesInjectable from "../renderer/routes/routes.injectable"; @@ -89,7 +89,7 @@ export class LensRendererExtension extends LensExtension { categoryRegistry: di.inject(catalogCategoryRegistryInjectable), entityRegistry: di.inject(catalogEntityRegistryInjectable), routes: di.inject(routesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; super(deps, extension); diff --git a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts index b8477e0f15..c722f71361 100644 --- a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts +++ b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts @@ -9,7 +9,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("application-menu-in-legacy-extension-api", () => { let builder: ApplicationBuilder; @@ -28,7 +28,7 @@ describe("application-menu-in-legacy-extension-api", () => { logErrorMock = jest.fn(); - mainDi.override(logErrorInjectable, () => logErrorMock); + mainDi.override(logErrorInjectionToken, () => logErrorMock); }); await builder.startHidden(); diff --git a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts index 4e5c9bf282..d6cff6ae26 100644 --- a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts +++ b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts @@ -10,7 +10,7 @@ import { getCompositePaths } from "../../common/utils/composite/get-composite-pa import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; import { runInAction } from "mobx"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("handling-of-orphan-application-menu-items, given orphan menu item", () => { let builder: ApplicationBuilder; @@ -44,7 +44,7 @@ describe("handling-of-orphan-application-menu-items, given orphan menu item", () mainDi.register(someOrphanMenuItemInjectable); }); - mainDi.override(logErrorInjectable, () => logErrorMock); + mainDi.override(logErrorInjectionToken, () => logErrorMock); mainDi.override( populateApplicationMenuInjectable, diff --git a/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts index 319b5ffcd7..f2ead0844d 100644 --- a/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts +++ b/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts @@ -12,7 +12,7 @@ import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-ite import type { RootComposite } from "../../../common/utils/composite/interfaces"; import type { Discriminable } from "../../../common/utils/composable-responsibilities/discriminable/discriminable"; import { orderByOrderNumber } from "../../../common/utils/composable-responsibilities/orderable/orderable"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable"; export type MenuItemRoot = Discriminable<"root"> & RootComposite<"root">; @@ -22,7 +22,7 @@ const applicationMenuItemCompositeInjectable = getInjectable({ instantiate: (di) => { const menuItems = di.inject(applicationMenuItemsInjectable); - const logError = di.inject(logErrorInjectable); + const logError = di.inject(logErrorInjectionToken); return computed((): Composite => { const items = menuItems.get(); diff --git a/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts b/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts index e7a682ae3a..c4291910d7 100644 --- a/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts +++ b/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts @@ -15,13 +15,13 @@ import type { } from "./menu-items/application-menu-item-injection-token"; import applicationMenuItemInjectionToken from "./menu-items/application-menu-item-injection-token"; import type { MenuRegistration } from "./menu-registration"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; const applicationMenuItemRegistratorInjectable = getInjectable({ id: "application-menu-item-registrator", instantiate: (di) => { - const logError = di.inject(logErrorInjectable); + const logError = di.inject(logErrorInjectionToken); const toRecursedInjectables = toRecursedInjectablesFor(logError); return (ext) => { diff --git a/packages/core/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts b/packages/core/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts index 2111d2ceda..f5264a28e4 100644 --- a/packages/core/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts +++ b/packages/core/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts @@ -6,14 +6,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token"; import { docsUrl } from "../../../../../../common/vars"; import openLinkInBrowserInjectable from "../../../../../../common/utils/open-link-in-browser.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const openDocumentationMenuItemInjectable = getInjectable({ id: "open-documentation-menu-item", instantiate: (di) => { const openLinkInBrowser = di.inject(openLinkInBrowserInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return { kind: "clickable-menu-item" as const, diff --git a/packages/core/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts b/packages/core/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts index 805b8b6fb8..2803228c09 100644 --- a/packages/core/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts +++ b/packages/core/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts @@ -6,14 +6,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token"; import { supportUrl } from "../../../../../../common/vars"; import openLinkInBrowserInjectable from "../../../../../../common/utils/open-link-in-browser.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const openSupportItemInjectable = getInjectable({ id: "open-support-menu-item", instantiate: (di) => { const openLinkInBrowser = di.inject(openLinkInBrowserInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return { kind: "clickable-menu-item" as const, diff --git a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts index d8cc3ffea5..585a6be61e 100644 --- a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts +++ b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; import type { UpdateChannel } from "../../../common/update-channels"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { UpdateCheckResult } from "electron-updater"; export type CheckForUpdatesResult = { @@ -22,7 +22,7 @@ const checkForPlatformUpdatesInjectable = getInjectable({ instantiate: (di): CheckForPlatformUpdates => { const electronUpdater = di.inject(electronUpdaterInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (updateChannel, { allowDowngrade }) => { electronUpdater.channel = updateChannel.id; diff --git a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts index 5996e16123..bda214c12f 100644 --- a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts +++ b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts @@ -11,7 +11,7 @@ import type { CheckForPlatformUpdates } from "./check-for-platform-updates.injec import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable"; import type { UpdateChannel, ReleaseChannel } from "../../../common/update-channels"; import { getPromiseStatus } from "@k8slens/test-utils"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { noop } from "@k8slens/utilities"; describe("check-for-platform-updates", () => { @@ -39,7 +39,7 @@ describe("check-for-platform-updates", () => { logErrorMock = jest.fn(); - di.override(loggerInjectable, () => ({ + di.override(loggerInjectionToken, () => ({ error: logErrorMock, debug: noop, info: noop, diff --git a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts index 2948f8fe64..2ada16ba64 100644 --- a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts +++ b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { ProgressInfo } from "electron-updater"; import type { ProgressOfDownload } from "../../../common/progress-of-update-download/progress-of-update-download.injectable"; @@ -17,7 +17,7 @@ const downloadPlatformUpdateInjectable = getInjectable({ instantiate: (di): DownloadPlatformUpdate => { const electronUpdater = di.inject(electronUpdaterInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (onDownloadProgress) => { onDownloadProgress({ percentage: 0 }); diff --git a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts index eb2bd1c149..1cc4aa1e6b 100644 --- a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts +++ b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts @@ -11,7 +11,7 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getPromiseStatus } from "@k8slens/test-utils"; import type { DiContainer } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { noop } from "@k8slens/utilities"; describe("download-platform-update", () => { @@ -45,7 +45,7 @@ describe("download-platform-update", () => { di.override(electronUpdaterInjectable, () => electronUpdaterFake); logErrorMock = jest.fn(); - di.override(loggerInjectable, () => ({ + di.override(loggerInjectionToken, () => ({ error: logErrorMock, debug: noop, info: noop, diff --git a/packages/core/src/features/certificate-authorities/main/darwin-request-system-cas.injectable.ts b/packages/core/src/features/certificate-authorities/main/darwin-request-system-cas.injectable.ts index 8fd40ee3a4..4169e16b21 100644 --- a/packages/core/src/features/certificate-authorities/main/darwin-request-system-cas.injectable.ts +++ b/packages/core/src/features/certificate-authorities/main/darwin-request-system-cas.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import execFileInjectable from "../../../common/fs/exec-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; import { platformSpecificRequestSystemCAsInjectionToken } from "../common/request-system-cas-token"; @@ -17,7 +17,7 @@ const darwinRequestSystemCAsInjectable = getInjectable({ platform: "darwin" as const, instantiate: () => { const execFile = di.inject(execFileInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const execSecurity = async (...args: string[]): AsyncResult => { const result = await execFile("/usr/bin/security", args); diff --git a/packages/core/src/features/certificate-authorities/main/win32-request-system-cas.injectable.ts b/packages/core/src/features/certificate-authorities/main/win32-request-system-cas.injectable.ts index dedd25381c..7c0ff1e6de 100644 --- a/packages/core/src/features/certificate-authorities/main/win32-request-system-cas.injectable.ts +++ b/packages/core/src/features/certificate-authorities/main/win32-request-system-cas.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import execFileInjectable from "../../../common/fs/exec-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { platformSpecificRequestSystemCAsInjectionToken } from "../common/request-system-cas-token"; const pemEncoding = (hexEncodedCert: String) => { @@ -27,7 +27,7 @@ const win32RequestSystemCAsInjectable = getInjectable({ instantiate: () => { const winCARootsExePath: string = __non_webpack_require__.resolve("win-ca/lib/roots.exe"); const execFile = di.inject(execFileInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async () => { /** diff --git a/packages/core/src/features/cluster/storage/common/storage.injectable.ts b/packages/core/src/features/cluster/storage/common/storage.injectable.ts index f12ffbd4a3..a981cd38a0 100644 --- a/packages/core/src/features/cluster/storage/common/storage.injectable.ts +++ b/packages/core/src/features/cluster/storage/common/storage.injectable.ts @@ -8,7 +8,7 @@ import { comparer, action } from "mobx"; import { clusterStoreMigrationInjectionToken } from "./migration-token"; import type { ClusterId, ClusterModel } from "../../../../common/cluster-types"; import { Cluster } from "../../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable"; import storeMigrationVersionInjectable from "../../../../common/vars/store-migration-version.injectable"; @@ -23,7 +23,7 @@ const clustersPersistentStorageInjectable = getInjectable({ instantiate: (di) => { const createPersistentStorage = di.inject(createPersistentStorageInjectable); const clustersState = di.inject(clustersStateInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return createPersistentStorage({ configName: "lens-cluster-store", diff --git a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable.ts b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable.ts index 908faf21e0..2b9a506379 100644 --- a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable.ts +++ b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable.ts @@ -7,7 +7,7 @@ import { sortBy } from "lodash/fp"; import proxyDownloadJsonInjectable from "../../../../../../../common/fetch/download-json/proxy.injectable"; import { withTimeout } from "../../../../../../../common/fetch/timeout-controller"; import type { HelmRepo } from "../../../../../../../common/helm/helm-repo"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const publicHelmReposUrl = "https://github.com/lensapp/artifact-hub-repositories/releases/download/latest/repositories.json"; @@ -16,7 +16,7 @@ const requestPublicHelmRepositoriesInjectable = getInjectable({ instantiate: (di) => { const downloadJson = di.inject(proxyDownloadJsonInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (): Promise => { const controller = withTimeout(10_000); diff --git a/packages/core/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/packages/core/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts index a9628e7416..54a5004f4a 100644 --- a/packages/core/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts +++ b/packages/core/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts @@ -12,7 +12,7 @@ import asyncFn from "@async-fn/jest"; import type { HelmRepositoriesFromYaml } from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; import execFileInjectable, { type ExecFile } from "../../common/fs/exec-file.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; import requestPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; @@ -45,7 +45,7 @@ describe("listing active helm repositories in preferences", () => { mainDi.override(readYamlFileInjectable, () => readYamlFileMock); mainDi.override(execFileInjectable, () => execFileMock); mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); - mainDi.override(loggerInjectable, () => loggerStub); + mainDi.override(loggerInjectionToken, () => loggerStub); }); builder.beforeWindowStart(({ windowDi }) => { diff --git a/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts b/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts index 75a2cb88b4..2087bee6b1 100644 --- a/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts +++ b/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { CreateHotbarData } from "./types"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; import type { HotbarDependencies } from "./hotbar"; import { Hotbar } from "./hotbar"; @@ -14,7 +14,7 @@ const createHotbarInjectable = getInjectable({ id: "create-hotbar", instantiate: (di): CreateHotbar => { const deps: HotbarDependencies = { - logger: di.inject(prefixedLoggerInjectable, "HOTBAR"), + logger: di.inject(prefixedLoggerInjectionToken, "HOTBAR"), }; return (data) => new Hotbar(deps, data); diff --git a/packages/core/src/features/hotbar/storage/main/5.0.0-beta.10.injectable.ts b/packages/core/src/features/hotbar/storage/main/5.0.0-beta.10.injectable.ts index 24c3667fe7..ec79e94b40 100644 --- a/packages/core/src/features/hotbar/storage/main/5.0.0-beta.10.injectable.ts +++ b/packages/core/src/features/hotbar/storage/main/5.0.0-beta.10.injectable.ts @@ -11,7 +11,7 @@ import joinPathsInjectable from "../../../../common/path/join-paths.injectable"; import { getInjectable } from "@ogre-tools/injectable"; import { hotbarStoreMigrationInjectionToken } from "../common/migrations-token"; import readJsonSyncInjectable from "../../../../common/fs/read-json-sync.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { generateNewIdFor } from "../../../../common/utils/generate-new-id-for"; import type { ClusterModel } from "../../../../common/cluster-types"; import { defaultHotbarCells } from "../common/types"; @@ -43,7 +43,7 @@ const v500Beta10HotbarStoreMigrationInjectable = getInjectable({ const joinPaths = di.inject(joinPathsInjectable); const readJsonSync = di.inject(readJsonSyncInjectable); const catalogCatalogEntity = di.inject(catalogCatalogEntityInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const createHotbar = di.inject(createHotbarInjectable); const rawHotbars = store.get("hotbars"); const hotbars: HotbarData[] = Array.isArray(rawHotbars) ? rawHotbars.filter(h => h && typeof h === "object") : []; diff --git a/packages/core/src/features/hotbar/storage/storage-technical.test.ts b/packages/core/src/features/hotbar/storage/storage-technical.test.ts index 6c6bd30d12..fd73d0eff2 100644 --- a/packages/core/src/features/hotbar/storage/storage-technical.test.ts +++ b/packages/core/src/features/hotbar/storage/storage-technical.test.ts @@ -12,7 +12,7 @@ import type { IComputedValue } from "mobx"; import { computed } from "mobx"; import hasCategoryForEntityInjectable from "../../../common/catalog/has-category-for-entity.injectable"; import catalogCatalogEntityInjectable from "../../../common/catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable"; @@ -109,7 +109,7 @@ describe("Hotbars technical tests", () => { silly: jest.fn(), }; - di.override(loggerInjectable, () => loggerMock); + di.override(loggerInjectionToken, () => loggerMock); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); diff --git a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts index 8657b72577..08bee34c6f 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { DiContainer } from "@ogre-tools/injectable"; -import { winstonLoggerInjectable } from "@k8slens/logging"; +import { winstonLoggerInjectionToken } from "@k8slens/logging"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type winston from "winston"; @@ -52,7 +52,7 @@ describe("Population of logs to a file", () => { }); builder.beforeWindowStart(({ windowDi }) => { - windowDi.unoverride(winstonLoggerInjectable); + windowDi.unoverride(winstonLoggerInjectionToken); // Now that we have the actual winston logger in use, let's not be noisy and deregister console transport runInAction(() => { @@ -69,7 +69,7 @@ describe("Population of logs to a file", () => { await builder.render(); windowDi = builder.applicationWindow.only.di; - const winstonLogger = windowDi.inject(winstonLoggerInjectable); + const winstonLogger = windowDi.inject(winstonLoggerInjectionToken); logWarningInRenderer = winstonLogger.warn; } diff --git a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts index 3a33c4160d..26bb7880a3 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts @@ -6,7 +6,7 @@ import type winston from "winston"; import type { SendMessageToChannel } from "@k8slens/messaging"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import type { DiContainer } from "@ogre-tools/injectable"; -import { winstonLoggerInjectable } from "@k8slens/logging"; +import { winstonLoggerInjectionToken } from "@k8slens/logging"; import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; @@ -27,7 +27,7 @@ describe("close renderer file logging", () => { } as any as winston.Logger; ipcTransportMock = { name: "ipc-renderer-transport" } as IpcLogTransport; - di.override(winstonLoggerInjectable, () => winstonMock); + di.override(winstonLoggerInjectionToken, () => winstonMock); di.override(sendMessageToChannelInjectionToken, () => sendIpcMock); di.override(rendererLogFileIdInjectable, () => "some-log-id"); di.override(ipcLogTransportInjectable, () => ipcTransportMock); diff --git a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts index 15fce473b8..33b3fe22f0 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts @@ -4,7 +4,7 @@ */ import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { getInjectable } from "@ogre-tools/injectable"; -import { winstonLoggerInjectable } from "@k8slens/logging"; +import { winstonLoggerInjectionToken } from "@k8slens/logging"; import { closeIpcFileLoggerChannel } from "../common/ipc-file-logger-channel"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; @@ -12,7 +12,7 @@ import ipcLogTransportInjectable from "./ipc-transport.injectable"; const closeRendererLogFileInjectable = getInjectable({ id: "close-renderer-log-file", instantiate: (di) => { - const winstonLogger = di.inject(winstonLoggerInjectable); + const winstonLogger = di.inject(winstonLoggerInjectionToken); const ipcLogTransport = di.inject(ipcLogTransportInjectable); const messageToChannel = di.inject(sendMessageToChannelInjectionToken); const fileId = di.inject(rendererLogFileIdInjectable); diff --git a/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx b/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx index 750ffbd64e..42e6304566 100644 --- a/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx +++ b/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx @@ -10,7 +10,7 @@ import "@testing-library/jest-dom/extend-expect"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import type { Discover } from "@k8slens/react-testing-library-discovery"; import { discoverFor } from "@k8slens/react-testing-library-discovery"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("preferences - navigation to extension specific preferences", () => { let builder: ApplicationBuilder; @@ -28,7 +28,7 @@ describe("preferences - navigation to extension specific preferences", () => { logErrorMock = jest.fn(); builder.beforeWindowStart(({ windowDi }) => { - windowDi.override(logErrorInjectable, () => logErrorMock); + windowDi.override(logErrorInjectionToken, () => logErrorMock); builder.preferences.navigate(); }); diff --git a/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/discover-sync-kind.injectable.ts b/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/discover-sync-kind.injectable.ts index cbdebee0b0..a800d3964d 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/discover-sync-kind.injectable.ts +++ b/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/discover-sync-kind.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import statInjectable from "../../../../../../common/fs/stat.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface SyncKind { type: "file" | "folder" | "unknown"; @@ -16,7 +16,7 @@ const discoverKubeconfigSyncKindInjectable = getInjectable({ id: "discover-kubeconfig-sync-kind", instantiate: (di): DiscoverKubeconfigSyncKind => { const stat = di.inject(statInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (path) => { try { diff --git a/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx b/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx index fabb142ce4..ab84e0ba1e 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx +++ b/packages/core/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx @@ -13,7 +13,7 @@ import { PathPicker } from "../../../../../../renderer/components/path-picker/pa import { Spinner } from "../../../../../../renderer/components/spinner"; import { RemovableItem } from "../../../removable-item/removable-item"; import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; import type { DiscoverAllKubeconfigSyncKinds } from "./discover-all-sync-kinds.injectable"; import type { DiscoverKubeconfigSyncKind, SyncKind } from "./discover-sync-kind.injectable"; @@ -179,7 +179,7 @@ export const KubeconfigSync = withInjectables(NonInjectedKubeconfi getProps: (di) => ({ state: di.inject(userPreferencesStateInjectable), isWindows: di.inject(isWindowsInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), discoverAllKubeconfigSyncKinds: di.inject(discoverAllKubeconfigSyncKindsInjectable), discoverKubeconfigSyncKind: di.inject(discoverKubeconfigSyncKindInjectable), }), diff --git a/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts index 1bbf520fa7..d66a964021 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts +++ b/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts @@ -10,7 +10,7 @@ import { preferenceItemInjectionToken } from "./preference-item-injection-token" import { pipeline } from "@ogre-tools/fp"; import type { PreferenceTabsRoot } from "./preference-tab-root"; import { preferenceTabsRoot } from "./preference-tab-root"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; import { isShown } from "../../../../common/utils/composable-responsibilities/showable/showable"; import { orderByOrderNumber } from "../../../../common/utils/composable-responsibilities/orderable/orderable"; import { getCompositeFor } from "../../../../common/utils/composite/get-composite/get-composite"; @@ -21,7 +21,7 @@ const preferencesCompositeInjectable = getInjectable({ instantiate: (di) => { const computedInjectMany = di.inject(computedInjectManyInjectable); const preferenceItems = computedInjectMany(preferenceItemInjectionToken); - const logError = di.inject(logErrorInjectable); + const logError = di.inject(logErrorInjectionToken); const getComposite = getCompositeFor({ getId: (x) => x.id, diff --git a/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts b/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts index 99406d7dbb..633a98b38a 100644 --- a/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts +++ b/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts @@ -7,7 +7,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable"; import spawnInjectable from "../../../main/child-process/spawn.injectable"; import randomUUIDInjectable from "../../../main/crypto/random-uuid.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import processExecPathInjectable from "./execPath.injectable"; import processEnvInjectable from "./env.injectable"; import { object } from "@k8slens/utilities"; @@ -56,7 +56,7 @@ const computeUnixShellEnvironmentInjectable = getInjectable({ const getBasenameOfPath = di.inject(getBasenameOfPathInjectable); const spawn = di.inject(spawnInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const randomUUID = di.inject(randomUUIDInjectable); const processExecPath = di.inject(processExecPathInjectable); const processEnv = di.inject(processEnvInjectable); diff --git a/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts b/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts index adafde9620..02fcc1242b 100644 --- a/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts +++ b/packages/core/src/features/shell-sync/main/setup-shell.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import electronAppInjectable from "../../../main/electron-app/electron-app.injectable"; @@ -17,7 +17,7 @@ const setupShellInjectable = getInjectable({ instantiate: (di) => ({ run: async () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const isSnapPackage = di.inject(isSnapPackageInjectable); const electronApp = di.inject(electronAppInjectable); const resolvedUserShellSetting = di.inject(userShellSettingInjectable); diff --git a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts index 17610402fe..33c076316f 100644 --- a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts +++ b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts @@ -8,7 +8,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting"; import telemetryWhiteListForParameterlessFunctionsInjectable from "./renderer/telemetry-white-list-for-parameterless-functions.injectable"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; import telemetryDecoratorInjectable from "./renderer/telemetry-decorator.injectable"; describe("emit-telemetry-from-specific-function-calls", () => { @@ -57,7 +57,7 @@ describe("emit-telemetry-from-specific-function-calls", () => { ); }); - di.override(logErrorInjectable, () => logErrorMock); + di.override(logErrorInjectionToken, () => logErrorMock); whiteListedFunction = di.inject(whiteListedInjectable); nonWhiteListedFunction = di.inject(nonWhiteListedInjectable); diff --git a/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts b/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts index b2267e923b..d4e7fbf7c3 100644 --- a/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts +++ b/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts @@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import getRandomIdInjectable from "../../common/utils/get-random-id.injectable"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; describe("clicking tray menu item originating from extension", () => { let builder: ApplicationBuilder; @@ -18,7 +18,7 @@ describe("clicking tray menu item originating from extension", () => { builder.beforeApplicationStart(({ mainDi }) => { logErrorMock = jest.fn(); - mainDi.override(logErrorInjectable, () => logErrorMock); + mainDi.override(logErrorInjectionToken, () => logErrorMock); mainDi.override(getRandomIdInjectable, () => () => "some-random-id"); }); diff --git a/packages/core/src/features/user-preferences/common/storage.injectable.ts b/packages/core/src/features/user-preferences/common/storage.injectable.ts index 3b21525db3..a2aab97b04 100644 --- a/packages/core/src/features/user-preferences/common/storage.injectable.ts +++ b/packages/core/src/features/user-preferences/common/storage.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { action } from "mobx"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../common/persistent-storage/migrations.injectable"; import { userPreferencesMigrationInjectionToken } from "./migrations-token"; @@ -24,7 +24,7 @@ const userPreferencesPersistentStorageInjectable = getInjectable({ id: "user-preferences-persistent-storage", instantiate: (di) => { const createPersistentStorage = di.inject(createPersistentStorageInjectable); - const logger = di.inject(prefixedLoggerInjectable, "USER-PREFERENCES"); + const logger = di.inject(prefixedLoggerInjectionToken, "USER-PREFERENCES"); const descriptors = di.inject(userPreferenceDescriptorsInjectable); const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable); const state = di.inject(userPreferencesStateInjectable); diff --git a/packages/core/src/features/user-preferences/main/5.0.3-beta.1.injectable.ts b/packages/core/src/features/user-preferences/main/5.0.3-beta.1.injectable.ts index 54d78d3d52..3c770c0079 100644 --- a/packages/core/src/features/user-preferences/main/5.0.3-beta.1.injectable.ts +++ b/packages/core/src/features/user-preferences/main/5.0.3-beta.1.injectable.ts @@ -13,7 +13,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { userPreferencesMigrationInjectionToken } from "../../../features/user-preferences/common/migrations-token"; import readJsonSyncInjectable from "../../../common/fs/read-json-sync.injectable"; import homeDirectoryPathInjectable from "../../../common/os/home-directory-path.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; import type { ClusterStoreModel } from "../../../features/cluster/storage/common/storage.injectable"; import type { UserPreferencesModel, KubeconfigSyncEntry } from "../common/preferences-helpers"; @@ -24,7 +24,7 @@ const v503Beta1UserPreferencesStorageMigrationInjectable = getInjectable({ const userDataPath = di.inject(directoryForUserDataInjectable); const kubeConfigsPath = di.inject(directoryForKubeConfigsInjectable); const joinPaths = di.inject(joinPathsInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const isLogicalChildPath = di.inject(isLogicalChildPathInjectable); const getDirnameOfPath = di.inject(getDirnameOfPathInjectable); const readJsonSync = di.inject(readJsonSyncInjectable); diff --git a/packages/core/src/main/__test__/kubeconfig-manager.test.ts b/packages/core/src/main/__test__/kubeconfig-manager.test.ts index 4b9534e7b1..7422d7d85c 100644 --- a/packages/core/src/main/__test__/kubeconfig-manager.test.ts +++ b/packages/core/src/main/__test__/kubeconfig-manager.test.ts @@ -8,7 +8,7 @@ import { Cluster } from "../../common/cluster/cluster"; import kubeconfigManagerInjectable from "../kubeconfig-manager/kubeconfig-manager.injectable"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; @@ -73,7 +73,7 @@ describe("kubeconfig manager tests", () => { silly: jest.fn(), }; - di.override(loggerInjectable, () => loggerMock); + di.override(loggerInjectionToken, () => loggerMock); ensureServerMock = asyncFn(); diff --git a/packages/core/src/main/base-store/persist-state-to-config.injectable.ts b/packages/core/src/main/base-store/persist-state-to-config.injectable.ts index 9f53bc7704..dc860b20d0 100644 --- a/packages/core/src/main/base-store/persist-state-to-config.injectable.ts +++ b/packages/core/src/main/base-store/persist-state-to-config.injectable.ts @@ -4,12 +4,12 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { persistStateToConfigInjectionToken } from "../../common/persistent-storage/save-to-file"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const persistStateToConfigInjectable = getInjectable({ id: "persist-state-to-config", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (config, state) => { logger.info(`[BASE-STORE]: saving ${config.path}...`); diff --git a/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts b/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts index a7a1745d16..375268b733 100644 --- a/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts +++ b/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; const kubeconfigSyncLoggerInjectable = getInjectable({ id: "kubeconfig-sync-logger", - instantiate: (di) => di.inject(prefixedLoggerInjectable, "KUBECONFIG-SYNC"), + instantiate: (di) => di.inject(prefixedLoggerInjectionToken, "KUBECONFIG-SYNC"), }); export default kubeconfigSyncLoggerInjectable; diff --git a/packages/core/src/main/cluster/broadcast-connection-update.injectable.ts b/packages/core/src/main/cluster/broadcast-connection-update.injectable.ts index 223b695683..385665c978 100644 --- a/packages/core/src/main/cluster/broadcast-connection-update.injectable.ts +++ b/packages/core/src/main/cluster/broadcast-connection-update.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { KubeAuthUpdate } from "../../common/cluster-types"; import type { Cluster } from "../../common/cluster/cluster"; import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export type BroadcastConnectionUpdate = (update: KubeAuthUpdate) => void; @@ -14,7 +14,7 @@ const broadcastConnectionUpdateInjectable = getInjectable({ id: "broadcast-connection-update", instantiate: (di, cluster): BroadcastConnectionUpdate => { const broadcastMessage = di.inject(broadcastMessageInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (update) => { logger.debug(`[CLUSTER]: broadcasting connection update`, { ...update, meta: cluster.getMeta() }); diff --git a/packages/core/src/main/cluster/cluster-connection.injectable.ts b/packages/core/src/main/cluster/cluster-connection.injectable.ts index 4d911892ee..7ecf48b071 100644 --- a/packages/core/src/main/cluster/cluster-connection.injectable.ts +++ b/packages/core/src/main/cluster/cluster-connection.injectable.ts @@ -25,7 +25,7 @@ import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injec import createListNamespacesInjectable from "../../common/cluster/list-namespaces.injectable"; import kubeAuthProxyServerInjectable from "./kube-auth-proxy-server.injectable"; import loadProxyKubeconfigInjectable from "./load-proxy-kubeconfig.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import prometheusHandlerInjectable from "./prometheus-handler/prometheus-handler.injectable"; import removeProxyKubeconfigInjectable from "./remove-proxy-kubeconfig.injectable"; import requestApiResourcesInjectable from "./request-api-resources.injectable"; @@ -407,7 +407,7 @@ const clusterConnectionInjectable = getInjectable({ { clusterVersionDetector: di.inject(clusterVersionDetectorInjectable), kubeAuthProxyServer: di.inject(kubeAuthProxyServerInjectable, cluster), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), prometheusHandler: di.inject(prometheusHandlerInjectable, cluster), broadcastConnectionUpdate: di.inject(broadcastConnectionUpdateInjectable, cluster), broadcastMessage: di.inject(broadcastMessageInjectable), diff --git a/packages/core/src/main/cluster/manager.injectable.ts b/packages/core/src/main/cluster/manager.injectable.ts index 5dbd7239c3..9ab4ffe40b 100644 --- a/packages/core/src/main/cluster/manager.injectable.ts +++ b/packages/core/src/main/cluster/manager.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import addClusterInjectable from "../../features/cluster/storage/common/add.injectable"; import clustersInjectable from "../../features/cluster/storage/common/clusters.injectable"; import getClusterByIdInjectable from "../../features/cluster/storage/common/get-by-id.injectable"; @@ -22,7 +22,7 @@ const clusterManagerInjectable = getInjectable({ catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable), clustersThatAreBeingDeleted: di.inject(clustersThatAreBeingDeletedInjectable), visibleCluster: di.inject(visibleClusterInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), addCluster: di.inject(addClusterInjectable), clusters: di.inject(clustersInjectable), getClusterById: di.inject(getClusterByIdInjectable), diff --git a/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.injectable.ts b/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.injectable.ts index 6586c77e42..08fc2daf24 100644 --- a/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.injectable.ts +++ b/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.injectable.ts @@ -7,7 +7,7 @@ import type { Cluster } from "../../../common/cluster/cluster"; import { createClusterPrometheusHandler } from "./prometheus-handler"; import getPrometheusProviderByKindInjectable from "../../prometheus/get-by-kind.injectable"; import prometheusProvidersInjectable from "../../prometheus/providers.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import loadProxyKubeconfigInjectable from "../load-proxy-kubeconfig.injectable"; const prometheusHandlerInjectable = getInjectable({ @@ -17,7 +17,7 @@ const prometheusHandlerInjectable = getInjectable({ { getPrometheusProviderByKind: di.inject(getPrometheusProviderByKindInjectable), prometheusProviders: di.inject(prometheusProvidersInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), loadProxyKubeconfig: di.inject(loadProxyKubeconfigInjectable, cluster), }, cluster, diff --git a/packages/core/src/main/cluster/request-api-resources.injectable.ts b/packages/core/src/main/cluster/request-api-resources.injectable.ts index 41e6705056..c7743e0330 100644 --- a/packages/core/src/main/cluster/request-api-resources.injectable.ts +++ b/packages/core/src/main/cluster/request-api-resources.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { KubeApiResource } from "../../common/rbac"; import type { Cluster } from "../../common/cluster/cluster"; import { apiVersionsRequesterInjectionToken } from "./api-versions-requester"; @@ -24,7 +24,7 @@ export interface KubeResourceListGroup { const requestApiResourcesInjectable = getInjectable({ id: "request-api-resources", instantiate: (di): RequestApiResources => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const apiVersionRequesters = di.injectMany(apiVersionsRequesterInjectionToken) .sort(byOrderNumber); const requestKubeApiResourcesFor = di.inject(requestKubeApiResourcesForInjectable); diff --git a/packages/core/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts b/packages/core/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts index 2ceed91ebb..50c932427e 100644 --- a/packages/core/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts +++ b/packages/core/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts @@ -20,7 +20,7 @@ interface Pre360ClusterModel extends ClusterModel { import { getInjectable } from "@ogre-tools/injectable"; import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token"; import readFileBufferSyncInjectable from "../../../common/fs/read-file-buffer-sync.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import writeFileSyncInjectable from "../../../common/fs/write-file-sync.injectable"; const v360Beta1ClusterStoreMigrationInjectable = getInjectable({ @@ -31,7 +31,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({ const readFileSync = di.inject(readFileSyncInjectable); const readFileBufferSync = di.inject(readFileBufferSyncInjectable); const joinPaths = di.inject(joinPathsInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const writeFileSync = di.inject(writeFileSyncInjectable); return { diff --git a/packages/core/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts b/packages/core/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts index 9d24db235e..86e79d1736 100644 --- a/packages/core/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts +++ b/packages/core/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts @@ -9,7 +9,7 @@ import directoryForUserDataInjectable from "../../../common/app-paths/directory- import { isDefined } from "@k8slens/utilities"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token"; import { generateNewIdFor } from "../../../common/utils/generate-new-id-for"; @@ -77,7 +77,7 @@ const v500Beta13ClusterStoreMigrationInjectable = getInjectable({ instantiate: (di) => { const userDataPath = di.inject(directoryForUserDataInjectable); const joinPaths = di.inject(joinPathsInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const moveStorageFolder = ({ folder, newId, oldId }: { folder: string; newId: string; oldId: string }): void => { const oldPath = joinPaths(folder, `${oldId}.json`); diff --git a/packages/core/src/main/cluster/store-migrations/snap.injectable.ts b/packages/core/src/main/cluster/store-migrations/snap.injectable.ts index c34f164379..307e20cb99 100644 --- a/packages/core/src/main/cluster/store-migrations/snap.injectable.ts +++ b/packages/core/src/main/cluster/store-migrations/snap.injectable.ts @@ -7,7 +7,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import type { ClusterModel } from "../../../common/cluster-types"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; @@ -17,7 +17,7 @@ const clusterStoreSnapMigrationInjectable = getInjectable({ id: "cluster-store-snap-migration", instantiate: (di) => { const { version } = di.inject(applicationInformationToken); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const isSnapPackage = di.inject(isSnapPackageInjectable); const pathExistsSync = di.inject(pathExistsSyncInjectable); diff --git a/packages/core/src/main/electron-app/runnables/setup-deep-linking.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-deep-linking.injectable.ts index 9ab2275ff7..8f6e5b549c 100644 --- a/packages/core/src/main/electron-app/runnables/setup-deep-linking.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-deep-linking.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import electronAppInjectable from "../electron-app.injectable"; import openDeepLinkInjectable from "../../protocol-handler/lens-protocol-router-main/open-deep-link-for-url/open-deep-link.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable"; import { startsWith, toLower } from "lodash/fp"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; @@ -17,7 +17,7 @@ const setupDeepLinkingInjectable = getInjectable({ instantiate: (di) => ({ run: async () => { const app = di.inject(electronAppInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const openDeepLinkForUrl = di.inject(openDeepLinkInjectable); const showApplicationWindow = di.inject(showApplicationWindowInjectable); const firstInstanceCommandLineArguments = di.inject(commandLineArgumentsInjectable); diff --git a/packages/core/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts index ff4a05498e..b08a07d8d9 100644 --- a/packages/core/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { nodeEnvInjectionToken } from "../../../common/vars/node-env-injection-token"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ @@ -12,7 +12,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ instantiate: (di) => ({ run: () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const nodeEnv = di.inject(nodeEnvInjectionToken); if (nodeEnv !== "development") { diff --git a/packages/core/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts index 55f2e452d6..9c83e2df0b 100644 --- a/packages/core/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { setupIpcMainHandlers } from "./setup-ipc-main-handlers"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import applicationMenuItemCompositeInjectable from "../../../../features/application-menu/main/application-menu-item-composite.injectable"; import pushCatalogToRendererInjectable from "../../../catalog-sync-to-renderer/push-catalog-to-renderer.injectable"; @@ -17,7 +17,7 @@ const setupIpcMainHandlersInjectable = getInjectable({ instantiate: (di) => ({ run: () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); logger.debug("[APP-MAIN] initializing ipc main handlers"); diff --git a/packages/core/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts index cb80b4adbb..3764845ea1 100644 --- a/packages/core/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import electronAppInjectable from "../electron-app.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; @@ -15,7 +15,7 @@ const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({ run: () => { const app = di.inject(electronAppInjectable); const showApplicationWindow = di.inject(showApplicationWindowInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); app.on("activate", (_, windowIsVisible) => { logger.info("APP:ACTIVATE", { hasVisibleWindows: windowIsVisible }); diff --git a/packages/core/src/main/helm/helm-chart-manager.injectable.ts b/packages/core/src/main/helm/helm-chart-manager.injectable.ts index 664cffb0bd..56f73ad11f 100644 --- a/packages/core/src/main/helm/helm-chart-manager.injectable.ts +++ b/packages/core/src/main/helm/helm-chart-manager.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { HelmRepo } from "../../common/helm/helm-repo"; import { HelmChartManager } from "./helm-chart-manager"; import helmChartManagerCacheInjectable from "./helm-chart-manager-cache.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import execHelmInjectable from "./exec-helm/exec-helm.injectable"; import readFileInjectable from "../../common/fs/read-file.injectable"; import statInjectable from "../../common/fs/stat.injectable"; @@ -16,7 +16,7 @@ const helmChartManagerInjectable = getInjectable({ instantiate: (di, repo: HelmRepo) => new HelmChartManager({ cache: di.inject(helmChartManagerCacheInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), execHelm: di.inject(execHelmInjectable), readFile: di.inject(readFileInjectable), stat: di.inject(statInjectable), diff --git a/packages/core/src/main/helm/helm-service/delete-helm-release.injectable.ts b/packages/core/src/main/helm/helm-service/delete-helm-release.injectable.ts index 6384262bc2..63170c8245 100644 --- a/packages/core/src/main/helm/helm-service/delete-helm-release.injectable.ts +++ b/packages/core/src/main/helm/helm-service/delete-helm-release.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { DeleteHelmReleaseData } from "../delete-helm-release.injectable"; import deleteHelmReleaseInjectable from "../delete-helm-release.injectable"; @@ -13,7 +13,7 @@ const deleteClusterHelmReleaseInjectable = getInjectable({ id: "delete-cluster-helm-release", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable); return async (cluster: Cluster, data: DeleteHelmReleaseData) => { diff --git a/packages/core/src/main/helm/helm-service/get-helm-release-history.injectable.ts b/packages/core/src/main/helm/helm-service/get-helm-release-history.injectable.ts index ba5663e017..fa4e9a27cb 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release-history.injectable.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release-history.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { GetHelmReleaseHistoryData } from "../get-helm-release-history.injectable"; import getHelmReleaseHistoryInjectable from "../get-helm-release-history.injectable"; @@ -13,7 +13,7 @@ const getClusterHelmReleaseHistoryInjectable = getInjectable({ id: "get-cluster-helm-release-history", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const getHelmReleaseHistory = di.inject(getHelmReleaseHistoryInjectable); return async (cluster: Cluster, data: GetHelmReleaseHistoryData) => { diff --git a/packages/core/src/main/helm/helm-service/get-helm-release-values.injectable.ts b/packages/core/src/main/helm/helm-service/get-helm-release-values.injectable.ts index e7a7375cb1..6e0c79e876 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release-values.injectable.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release-values.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Cluster } from "../../../common/cluster/cluster"; import type { GetHelmReleaseValuesData } from "../get-helm-release-values.injectable"; import getHelmReleaseValuesInjectable from "../get-helm-release-values.injectable"; @@ -13,7 +13,7 @@ const getClusterHelmReleaseValuesInjectable = getInjectable({ id: "get-cluster-helm-release-values", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const getHelmReleaseValues = di.inject(getHelmReleaseValuesInjectable); return async (cluster: Cluster, data: GetHelmReleaseValuesData) => { diff --git a/packages/core/src/main/helm/helm-service/get-helm-release.injectable.ts b/packages/core/src/main/helm/helm-service/get-helm-release.injectable.ts index eb34dc7baf..b1ea6f84b4 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release.injectable.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import { isObject, json } from "@k8slens/utilities"; import execHelmInjectable from "../exec-helm/exec-helm.injectable"; @@ -14,7 +14,7 @@ const getHelmReleaseInjectable = getInjectable({ id: "get-helm-release", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const execHelm = di.inject(execHelmInjectable); const getHelmReleaseResources = di.inject(getHelmReleaseResourcesInjectable); diff --git a/packages/core/src/main/helm/helm-service/list-helm-releases.injectable.ts b/packages/core/src/main/helm/helm-service/list-helm-releases.injectable.ts index 4bb78798cb..dbdf7ec85f 100644 --- a/packages/core/src/main/helm/helm-service/list-helm-releases.injectable.ts +++ b/packages/core/src/main/helm/helm-service/list-helm-releases.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import listHelmReleasesInjectable from "../list-helm-releases.injectable"; @@ -12,7 +12,7 @@ const listClusterHelmReleasesInjectable = getInjectable({ id: "list-cluster-helm-releases", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const listHelmReleases = di.inject(listHelmReleasesInjectable); return async (cluster: Cluster, namespace?: string) => { diff --git a/packages/core/src/main/helm/helm-service/rollback-helm-release.injectable.ts b/packages/core/src/main/helm/helm-service/rollback-helm-release.injectable.ts index 03216bce8b..95f5f84d3b 100644 --- a/packages/core/src/main/helm/helm-service/rollback-helm-release.injectable.ts +++ b/packages/core/src/main/helm/helm-service/rollback-helm-release.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { RollbackHelmReleaseData } from "../rollback-helm-release.injectable"; import rollbackHelmReleaseInjectable from "../rollback-helm-release.injectable"; @@ -13,7 +13,7 @@ const rollbackClusterHelmReleaseInjectable = getInjectable({ id: "rollback-cluster-helm-release", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const rollbackHelmRelease = di.inject(rollbackHelmReleaseInjectable); return async (cluster: Cluster, data: RollbackHelmReleaseData) => { diff --git a/packages/core/src/main/helm/helm-service/update-helm-release.injectable.ts b/packages/core/src/main/helm/helm-service/update-helm-release.injectable.ts index 44243cdbd7..0cad7b2c49 100644 --- a/packages/core/src/main/helm/helm-service/update-helm-release.injectable.ts +++ b/packages/core/src/main/helm/helm-service/update-helm-release.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../../common/cluster/cluster"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import tempy from "tempy"; import getHelmReleaseInjectable from "./get-helm-release.injectable"; import writeFileInjectable from "../../../common/fs/write-file.injectable"; @@ -22,7 +22,7 @@ const updateHelmReleaseInjectable = getInjectable({ id: "update-helm-release", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const getHelmRelease = di.inject(getHelmReleaseInjectable); const writeFile = di.inject(writeFileInjectable); const removePath = di.inject(removePathInjectable); diff --git a/packages/core/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts b/packages/core/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts index 3b22f7b0eb..d772289eb5 100644 --- a/packages/core/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts +++ b/packages/core/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { HelmRepo } from "../../../../common/helm/helm-repo"; const addHelmRepositoryInjectable = getInjectable({ @@ -12,7 +12,7 @@ const addHelmRepositoryInjectable = getInjectable({ instantiate: (di) => { const execHelm = di.inject(execHelmInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (repo: HelmRepo) => { const { diff --git a/packages/core/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/packages/core/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts index 863569706c..23b4b0247b 100644 --- a/packages/core/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts +++ b/packages/core/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts @@ -8,7 +8,7 @@ import type { ReadYamlFile } from "../../../../common/fs/read-yaml-file.injectab import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injectable"; import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable"; import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; interface HelmRepositoryFromYaml { @@ -34,7 +34,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({ const readYamlFile = di.inject(readYamlFileInjectable); const execHelm = di.inject(execHelmInjectable); const getHelmEnv = di.inject(getHelmEnvInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const getRepositories = getRepositoriesFor(readYamlFile); diff --git a/packages/core/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts b/packages/core/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts index 6ce9a0b4b9..2c9f9f0461 100644 --- a/packages/core/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts +++ b/packages/core/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; import type { HelmRepo } from "../../../../common/helm/helm-repo"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; const removeHelmRepositoryInjectable = getInjectable({ @@ -13,7 +13,7 @@ const removeHelmRepositoryInjectable = getInjectable({ instantiate: (di) => { const execHelm = di.inject(execHelmInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (repo: HelmRepo): AsyncResult => { logger.info(`[HELM]: removing repo ${repo.name} (${repo.url})`); diff --git a/packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts index 1a9b547951..193211c8f0 100644 --- a/packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts +++ b/packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { Cluster } from "../../common/cluster/cluster"; import spawnInjectable from "../child-process/spawn.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable"; import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable"; import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable"; @@ -39,7 +39,7 @@ const createKubeAuthProxyInjectable = getInjectable({ instantiate: (di, cluster): CreateKubeAuthProxy => { const lensK8sProxyPath = di.inject(lensK8sProxyPathInjectable); const spawn = di.inject(spawnInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const waitUntilPortIsUsed = di.inject(waitUntilPortIsUsedInjectable); const getPortFromStream = di.inject(getPortFromStreamInjectable); const getDirnameOfPath = di.inject(getDirnameOfPathInjectable); diff --git a/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.injectable.ts b/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.injectable.ts index be2b4677d4..107c8d0e0c 100644 --- a/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.injectable.ts +++ b/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { Cluster } from "../../common/cluster/cluster"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import { KubeconfigManager } from "./kubeconfig-manager"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; @@ -23,7 +23,7 @@ const kubeconfigManagerInjectable = getInjectable({ instantiate: (di, cluster) => new KubeconfigManager( { directoryForTemp: di.inject(directoryForTempInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), joinPaths: di.inject(joinPathsInjectable), getDirnameOfPath: di.inject(getDirnameOfPathInjectable), removePath: di.inject(removePathInjectable), diff --git a/packages/core/src/main/kubectl/create-kubectl.injectable.ts b/packages/core/src/main/kubectl/create-kubectl.injectable.ts index a146b80a1b..d82545017a 100644 --- a/packages/core/src/main/kubectl/create-kubectl.injectable.ts +++ b/packages/core/src/main/kubectl/create-kubectl.injectable.ts @@ -16,7 +16,7 @@ import kubectlVersionMapInjectable from "./version-map.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import unlinkInjectable from "../../common/fs/unlink.injectable"; import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable"; @@ -37,7 +37,7 @@ const createKubectlInjectable = getInjectable({ baseBundledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable), bundledKubectlVersion: di.inject(bundledKubectlVersionInjectable), kubectlVersionMap: di.inject(kubectlVersionMapInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), getDirnameOfPath: di.inject(getDirnameOfPathInjectable), joinPaths: di.inject(joinPathsInjectable), getBasenameOfPath: di.inject(getBasenameOfPathInjectable), diff --git a/packages/core/src/main/lens-proxy/lens-proxy.injectable.ts b/packages/core/src/main/lens-proxy/lens-proxy.injectable.ts index ba2c01842a..de3a0a684c 100644 --- a/packages/core/src/main/lens-proxy/lens-proxy.injectable.ts +++ b/packages/core/src/main/lens-proxy/lens-proxy.injectable.ts @@ -10,7 +10,7 @@ import shellApiRequestInjectable from "./proxy-functions/shell-api-request.injec import lensProxyPortInjectable from "./lens-proxy-port.injectable"; import contentSecurityPolicyInjectable from "../../common/vars/content-security-policy.injectable"; import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; import getClusterForRequestInjectable from "./get-cluster-for-request.injectable"; import kubeAuthProxyServerInjectable from "../cluster/kube-auth-proxy-server.injectable"; @@ -28,7 +28,7 @@ const lensProxyInjectable = getInjectable({ lensProxyPort: di.inject(lensProxyPortInjectable), contentSecurityPolicy: di.inject(contentSecurityPolicyInjectable), emitAppEvent: di.inject(emitAppEventInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), certificate: di.inject(lensProxyCertificateInjectable).get(), getKubeAuthProxyServer: (cluster) => di.inject(kubeAuthProxyServerInjectable, cluster), }), diff --git a/packages/core/src/main/lens-proxy/proxy-functions/shell-api-request.injectable.ts b/packages/core/src/main/lens-proxy/proxy-functions/shell-api-request.injectable.ts index 1596c736cb..59cd5427a5 100644 --- a/packages/core/src/main/lens-proxy/proxy-functions/shell-api-request.injectable.ts +++ b/packages/core/src/main/lens-proxy/proxy-functions/shell-api-request.injectable.ts @@ -8,7 +8,7 @@ import openShellSessionInjectable from "../../shell-session/create-shell-session import type { LensProxyApiRequest } from "../lens-proxy"; import URLParse from "url-parse"; import { Server as WebSocketServer } from "ws"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import getClusterForRequestInjectable from "../get-cluster-for-request.injectable"; const shellApiRequestInjectable = getInjectable({ @@ -18,7 +18,7 @@ const shellApiRequestInjectable = getInjectable({ const openShellSession = di.inject(openShellSessionInjectable); const authenticateRequest = di.inject(shellRequestAuthenticatorInjectable).authenticate; const getClusterForRequest = di.inject(getClusterForRequestInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return ({ req, socket, head }) => { const cluster = getClusterForRequest(req); diff --git a/packages/core/src/main/logger/log-on-quit.injectable.ts b/packages/core/src/main/logger/log-on-quit.injectable.ts index 643485fc66..7f1258865b 100644 --- a/packages/core/src/main/logger/log-on-quit.injectable.ts +++ b/packages/core/src/main/logger/log-on-quit.injectable.ts @@ -3,14 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { onQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; const logOnQuitOfBackendInjectable = getInjectable({ id: "log-on-quit-of-backend", instantiate: (di) => ({ run: () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); logger.info("Quitting application ..."); }, diff --git a/packages/core/src/main/logger/log-on-start.injectable.ts b/packages/core/src/main/logger/log-on-start.injectable.ts index cc67e05e22..62b9a0b0ba 100644 --- a/packages/core/src/main/logger/log-on-start.injectable.ts +++ b/packages/core/src/main/logger/log-on-start.injectable.ts @@ -4,7 +4,7 @@ */ import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application"; import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import appNameInjectable from "../../common/vars/app-name.injectable"; import { buildVersionInitializable } from "../../features/vars/build-version/common/token"; import { buildVersionInitializationInjectable } from "../../features/vars/build-version/main/init.injectable"; @@ -13,7 +13,7 @@ const logVersionOnStartInjectable = getInjectable({ id: "log-version-on-start", instantiate: (di) => ({ run: () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const buildVersion = di.inject(buildVersionInitializable.stateToken); const appName = di.inject(appNameInjectable); diff --git a/packages/core/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts b/packages/core/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts index 8b1b706085..31f472786f 100644 --- a/packages/core/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts +++ b/packages/core/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts @@ -7,7 +7,7 @@ import extensionLoaderInjectable from "../../../extensions/extension-loader/exte import { LensProtocolRouterMain } from "./lens-protocol-router-main"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; import broadcastMessageInjectable from "../../../common/ipc/broadcast-message.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable"; const lensProtocolRouterMainInjectable = getInjectable({ @@ -18,7 +18,7 @@ const lensProtocolRouterMainInjectable = getInjectable({ isExtensionEnabled: di.inject(isExtensionEnabledInjectable), showApplicationWindow: di.inject(showApplicationWindowInjectable), broadcastMessage: di.inject(broadcastMessageInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/main/resource-applier/create-resource-applier.injectable.ts b/packages/core/src/main/resource-applier/create-resource-applier.injectable.ts index 7fb3d4b5d7..3b36f85c83 100644 --- a/packages/core/src/main/resource-applier/create-resource-applier.injectable.ts +++ b/packages/core/src/main/resource-applier/create-resource-applier.injectable.ts @@ -7,7 +7,7 @@ import emitAppEventInjectable from "../../common/app-event-bus/emit-event.inject import removePathInjectable from "../../common/fs/remove.injectable"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import { ResourceApplier } from "./resource-applier"; import createKubectlInjectable from "../kubectl/create-kubectl.injectable"; @@ -22,7 +22,7 @@ const resourceApplierInjectable = getInjectable({ emitAppEvent: di.inject(emitAppEventInjectable), execFile: di.inject(execFileInjectable), joinPaths: di.inject(joinPathsInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), writeFile: di.inject(writeFileInjectable), createKubectl: di.inject(createKubectlInjectable), proxyKubeconfigManager: di.inject(kubeconfigManagerInjectable, cluster), diff --git a/packages/core/src/main/router/create-handler-for-route.injectable.ts b/packages/core/src/main/router/create-handler-for-route.injectable.ts index c8702cc6d3..b5f63b60a9 100644 --- a/packages/core/src/main/router/create-handler-for-route.injectable.ts +++ b/packages/core/src/main/router/create-handler-for-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { ServerResponse } from "http"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { object } from "@k8slens/utilities"; import type { LensApiRequest, Route } from "./route"; import { contentTypes } from "./router-content-types"; @@ -44,7 +44,7 @@ const writeServerResponseFor = (serverResponse: ServerResponse) => ({ const createHandlerForRouteInjectable = getInjectable({ id: "create-handler-for-route", instantiate: (di): CreateHandlerForRoute => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (route) => async (request, response) => { const writeServerResponse = writeServerResponseFor(response); diff --git a/packages/core/src/main/routes/files/production.injectable.ts b/packages/core/src/main/routes/files/production.injectable.ts index 587b5ba8de..f1399823e8 100644 --- a/packages/core/src/main/routes/files/production.injectable.ts +++ b/packages/core/src/main/routes/files/production.injectable.ts @@ -10,7 +10,7 @@ import type { LensApiRequest } from "../../router/route"; import path from "path"; import type { SupportedFileExtension } from "../../router/router-content-types"; import { contentTypes } from "../../router/router-content-types"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { publicPath } from "../../../common/vars"; const prodStaticFileRouteHandlerInjectable = getInjectable({ @@ -19,7 +19,7 @@ const prodStaticFileRouteHandlerInjectable = getInjectable({ const readFileBuffer = di.inject(readFileBufferInjectable); const joinPaths = di.inject(joinPathsInjectable); const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async ({ params }: LensApiRequest<"/{path*}">) => { let filePath = params.path; diff --git a/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts b/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts index 3cbe3cd620..873e456f89 100644 --- a/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts +++ b/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts @@ -13,7 +13,7 @@ import { isObject } from "lodash"; import { isRequestError, object } from "@k8slens/utilities"; import type { GetMetrics } from "../../get-metrics.injectable"; import getMetricsInjectable from "../../get-metrics.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import prometheusHandlerInjectable from "../../cluster/prometheus-handler/prometheus-handler.injectable"; import { runInAction } from "mobx"; @@ -60,7 +60,7 @@ const addMetricsRouteInjectable = getRouteInjectable({ instantiate: (di) => { const getMetrics = di.inject(getMetricsInjectable); const loadMetrics = loadMetricsFor(getMetrics); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return clusterRoute({ method: "post", diff --git a/packages/core/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts b/packages/core/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts index 8c88539884..26853da057 100644 --- a/packages/core/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts +++ b/packages/core/src/main/routes/port-forward/functionality/create-port-forward.injectable.ts @@ -7,7 +7,7 @@ import type { PortForwardArgs, PortForwardDependencies } from "./port-forward"; import { PortForward } from "./port-forward"; import bundledKubectlInjectable from "../../../kubectl/bundled-kubectl.injectable"; import getPortFromStreamInjectable from "../../../utils/get-port-from-stream.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export type CreatePortForward = (pathToKubeConfig: string, args: PortForwardArgs) => PortForward; @@ -18,7 +18,7 @@ const createPortForwardInjectable = getInjectable({ const dependencies: PortForwardDependencies = { getKubectlBinPath: di.inject(bundledKubectlInjectable).getPath, getPortFromStream: di.inject(getPortFromStreamInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; return (pathToKubeConfig, args) => new PortForward(dependencies, pathToKubeConfig, args); diff --git a/packages/core/src/main/routes/port-forward/start-port-forward-route.injectable.ts b/packages/core/src/main/routes/port-forward/start-port-forward-route.injectable.ts index eed4766f62..da78dbe94e 100644 --- a/packages/core/src/main/routes/port-forward/start-port-forward-route.injectable.ts +++ b/packages/core/src/main/routes/port-forward/start-port-forward-route.injectable.ts @@ -7,7 +7,7 @@ import { apiPrefix } from "../../../common/vars"; import { PortForward } from "./functionality/port-forward"; import createPortForwardInjectable from "./functionality/create-port-forward.injectable"; import { clusterRoute } from "../../router/route"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; const startPortForwardRouteInjectable = getRouteInjectable({ @@ -15,7 +15,7 @@ const startPortForwardRouteInjectable = getRouteInjectable({ instantiate: (di) => { const createPortForward = di.inject(createPortForwardInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return clusterRoute({ method: "post", diff --git a/packages/core/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts b/packages/core/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts index 933655ab41..fc73d0136e 100644 --- a/packages/core/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts +++ b/packages/core/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts @@ -6,13 +6,13 @@ import { getRouteInjectable } from "../../router/router.injectable"; import { apiPrefix } from "../../../common/vars"; import { PortForward } from "./functionality/port-forward"; import { clusterRoute } from "../../router/route"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const stopCurrentPortForwardRouteInjectable = getRouteInjectable({ id: "stop-current-port-forward-route", instantiate: (di) => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return clusterRoute({ method: "delete", diff --git a/packages/core/src/main/shell-session/local-shell-session/open.injectable.ts b/packages/core/src/main/shell-session/local-shell-session/open.injectable.ts index 0802032b38..745f7ec6a1 100644 --- a/packages/core/src/main/shell-session/local-shell-session/open.injectable.ts +++ b/packages/core/src/main/shell-session/local-shell-session/open.injectable.ts @@ -11,7 +11,7 @@ import directoryForBinariesInjectable from "../../../common/app-paths/directory- import isMacInjectable from "../../../common/vars/is-mac.injectable"; import type { Cluster } from "../../../common/cluster/cluster"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type WebSocket from "ws"; import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; @@ -45,7 +45,7 @@ const openLocalShellSessionInjectable = getInjectable({ directoryForBinaries: di.inject(directoryForBinariesInjectable), isMac: di.inject(isMacInjectable), isWindows: di.inject(isWindowsInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), state: di.inject(userPreferencesStateInjectable), userShellSetting: di.inject(userShellSettingInjectable), appName: di.inject(appNameInjectable), diff --git a/packages/core/src/main/shell-session/node-shell-session/open.injectable.ts b/packages/core/src/main/shell-session/node-shell-session/open.injectable.ts index 514d075e16..a6c076c764 100644 --- a/packages/core/src/main/shell-session/node-shell-session/open.injectable.ts +++ b/packages/core/src/main/shell-session/node-shell-session/open.injectable.ts @@ -10,7 +10,7 @@ import type { NodeShellSessionDependencies } from "./node-shell-session"; import { NodeShellSession } from "./node-shell-session"; import isMacInjectable from "../../../common/vars/is-mac.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable"; import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable"; import spawnPtyInjectable from "../spawn-pty.injectable"; @@ -41,7 +41,7 @@ const openNodeShellSessionInjectable = getInjectable({ const dependencies: Omit = { isMac: di.inject(isMacInjectable), isWindows: di.inject(isWindowsInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), userShellSetting: di.inject(userShellSettingInjectable), appName: di.inject(appNameInjectable), buildVersion: di.inject(buildVersionInitializable.stateToken), diff --git a/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts index a07b89aeca..58ef4f615f 100644 --- a/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts +++ b/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import applicationWindowStateInjectable from "./application-window-state.injectable"; import { BrowserWindow } from "electron"; import type { ElectronWindow } from "./create-lens-window.injectable"; @@ -49,7 +49,7 @@ const createElectronWindowInjectable = getInjectable({ id: "create-electron-window", instantiate: (di): CreateElectronWindow => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const openLinkInBrowser = di.inject(openLinkInBrowserInjectable); const getAbsolutePath = di.inject(getAbsolutePathInjectable); const lensResourcesDir = di.inject(lensResourcesDirInjectable); diff --git a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts index 23604af3db..f879104a01 100644 --- a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { onQuitOfBackEndInjectionToken } from "../runnable-tokens/phases"; import shellSessionProcessesInjectable from "../../shell-session/processes.injectable"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; const cleanUpShellSessionsInjectable = getInjectable({ id: "clean-up-shell-sessions", @@ -13,7 +13,7 @@ const cleanUpShellSessionsInjectable = getInjectable({ instantiate: (di) => ({ run: () => { const shellSessionProcesses = di.inject(shellSessionProcessesInjectable); - const logger = di.inject(prefixedLoggerInjectable, "SHELL-SESSIONS"); + const logger = di.inject(prefixedLoggerInjectionToken, "SHELL-SESSIONS"); logger.info("Killing all remaining shell sessions"); diff --git a/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts b/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts index 1d5b6a6019..16c785dca2 100644 --- a/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; @@ -15,7 +15,7 @@ const initializeExtensionsInjectable = getInjectable({ instantiate: (di) => ({ run: async () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const extensionDiscovery = di.inject(extensionDiscoveryInjectable); const extensionLoader = di.inject(extensionLoaderInjectable); const showErrorPopup = di.inject(showErrorPopupInjectable); diff --git a/packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts b/packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts index af71806a73..8cedee1627 100644 --- a/packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import forceAppExitInjectable from "../../electron-app/features/force-app-exit.injectable"; import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; @@ -23,7 +23,7 @@ const setupLensProxyInjectable = getInjectable({ run: async () => { const lensProxy = di.inject(lensProxyInjectable); const forceAppExit = di.inject(forceAppExitInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const lensProxyPort = di.inject(lensProxyPortInjectable); const isWindows = di.inject(isWindowsInjectable); const showErrorPopup = di.inject(showErrorPopupInjectable); diff --git a/packages/core/src/main/tray/electron-tray/electron-tray.injectable.ts b/packages/core/src/main/tray/electron-tray/electron-tray.injectable.ts index 901b7df9df..b13077509a 100644 --- a/packages/core/src/main/tray/electron-tray/electron-tray.injectable.ts +++ b/packages/core/src/main/tray/electron-tray/electron-tray.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { Menu, Tray } from "electron"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters"; import trayIconInjectable from "../menu-icon/tray-icon.injectable"; import applicationDescriptionInjectable from "../../../common/vars/application-description.injectable"; @@ -37,7 +37,7 @@ const electronTrayInjectable = getInjectable({ const applicationDescription = di.inject(applicationDescriptionInjectable); const showApplicationWindow = di.inject(showApplicationWindowInjectable); const isWindows = di.inject(isWindowsInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const trayIcon = di.inject(trayIconInjectable); let tray: Tray; diff --git a/packages/core/src/main/utils/get-port-from-stream.injectable.ts b/packages/core/src/main/utils/get-port-from-stream.injectable.ts index 2f93b5670d..bbd67a8d1d 100644 --- a/packages/core/src/main/utils/get-port-from-stream.injectable.ts +++ b/packages/core/src/main/utils/get-port-from-stream.injectable.ts @@ -6,7 +6,7 @@ import type { Readable } from "stream"; import URLParse from "url-parse"; import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface GetPortFromStreamArgs { /** @@ -39,7 +39,7 @@ export type GetPortFromStream = (stream: Readable, args: GetPortFromStreamArgs) const getPortFromStreamInjectable = getInjectable({ id: "get-port-from-stream", instantiate: (di): GetPortFromStream => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (stream, args) => { const logLines: string[] = []; diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts index c9c8d80da1..d3eb3d3df6 100644 --- a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts +++ b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts @@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getPromiseStatus } from "@k8slens/test-utils"; -import { logErrorInjectable } from "@k8slens/logging"; +import { logErrorInjectionToken } from "@k8slens/logging"; import type { DiContainer } from "@ogre-tools/injectable"; import type { BrowserWindow, Session, WebContents } from "electron"; @@ -23,7 +23,7 @@ describe("technical: resolve-system-proxy-from-electron", () => { di = getDiForUnitTesting(); logErrorMock = jest.fn(); - di.override(logErrorInjectable, () => logErrorMock); + di.override(logErrorInjectionToken, () => logErrorMock); }); describe("given there are no unexpected issues, when called with URL", () => { diff --git a/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts b/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts index 68741d7dff..ac7a5eb2fc 100644 --- a/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts +++ b/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts @@ -6,14 +6,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import catalogCategoryRegistryInjectable from "../../../../common/catalog/category-registry.injectable"; import navigateInjectable from "../../../navigation/navigate.injectable"; import { CatalogEntityRegistry } from "./registry"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const catalogEntityRegistryInjectable = getInjectable({ id: "catalog-entity-registry", instantiate: (di) => new CatalogEntityRegistry({ categoryRegistry: di.inject(catalogCategoryRegistryInjectable), navigate: di.inject(navigateInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/api/create-terminal-api.injectable.ts b/packages/core/src/renderer/api/create-terminal-api.injectable.ts index b7516c574f..68d643d28f 100644 --- a/packages/core/src/renderer/api/create-terminal-api.injectable.ts +++ b/packages/core/src/renderer/api/create-terminal-api.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable"; import defaultWebsocketApiParamsInjectable from "./default-websocket-api-params.injectable"; import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api"; @@ -17,7 +17,7 @@ const createTerminalApiInjectable = getInjectable({ instantiate: (di): CreateTerminalApi => { const hostedClusterId = di.inject(hostedClusterIdInjectable); const deps: Omit = { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), defaultParams: di.inject(defaultWebsocketApiParamsInjectable), }; diff --git a/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts index b3d540e579..b067cff757 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts @@ -6,7 +6,7 @@ import { unmountComponentAtNode } from "react-dom"; import { getInjectable } from "@ogre-tools/injectable"; import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable"; import { beforeFrameStartsSecondInjectionToken } from "../tokens"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import frameRoutingIdInjectable from "../../frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable"; import closeRendererLogFileInjectable from "../../../features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable"; @@ -17,7 +17,7 @@ const listenUnloadInjectable = getInjectable({ run: () => { const closeRendererLogFile = di.inject(closeRendererLogFileInjectable); const isClusterFrame = di.inject(currentlyInClusterFrameInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); window.addEventListener("beforeunload", () => { if (isClusterFrame) { diff --git a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts index 27d054393c..302580c043 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts @@ -9,7 +9,7 @@ import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints import { KubeApi } from "../../../common/k8s-api/kube-api"; import { KubeObject } from "../../../common/k8s-api/kube-object"; import maybeKubeApiInjectable from "../../../common/k8s-api/maybe-kube-api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { injectableDifferencingRegistratorWith } from "../../../common/utils/registrator-helper"; import customResourceDefinitionStoreInjectable from "../../components/+custom-resources/definition.store.injectable"; import { beforeClusterFrameStartsSecondInjectionToken } from "../tokens"; @@ -45,7 +45,7 @@ const toCrdApiInjectable = (crd: CustomResourceDefinition) => getInjectable({ }; return new KubeApi({ - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }, { objectConstructor }); }, diff --git a/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts index 869d9a9510..4e56474d8f 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import catalogCategoryRegistryInjectable from "../../../common/catalog/category-registry.injectable"; import loadKubeconfigInjectable from "../../../common/cluster/load-kubeconfig.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import openDeleteClusterDialogInjectable from "../../components/delete-cluster-dialog/open.injectable"; import { beforeFrameStartsSecondInjectionToken } from "../tokens"; @@ -17,7 +17,7 @@ const setupKubernetesClusterContextMenuOpenInjectable = getInjectable({ const catalogCategoryRegistry = di.inject(catalogCategoryRegistryInjectable); const openDeleteClusterDialog = di.inject(openDeleteClusterDialogInjectable); const getClusterById = di.inject(getClusterByIdInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); catalogCategoryRegistry .getForGroupKind("entity.k8slens.dev", "KubernetesCluster") diff --git a/packages/core/src/renderer/components/+catalog/catalog.tsx b/packages/core/src/renderer/components/+catalog/catalog.tsx index dff59cb5c8..95503bde2b 100644 --- a/packages/core/src/renderer/components/+catalog/catalog.tsx +++ b/packages/core/src/renderer/components/+catalog/catalog.tsx @@ -29,7 +29,7 @@ import visitEntityContextMenuInjectable from "../../../common/catalog/visit-enti 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 { Logger } from "@k8slens/logging"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable"; import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable"; import type { Navigate } from "../../navigation/navigate.injectable"; @@ -331,7 +331,7 @@ export const Catalog = withInjectables(NonInjectedCatalog, { visitEntityContextMenu: di.inject(visitEntityContextMenuInjectable), navigate: di.inject(navigateInjectable), normalizeMenuItem: di.inject(normalizeCatalogEntityContextMenuInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), showErrorNotification: di.inject(showErrorNotificationInjectable), showEntityDetails: di.inject(showEntityDetailsInjectable), onCatalogEntityListClick: di.inject(onCatalogEntityListClickInjectable), diff --git a/packages/core/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts b/packages/core/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts index 75d5529bee..dbbb0e6e62 100644 --- a/packages/core/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts +++ b/packages/core/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts @@ -14,7 +14,7 @@ import assert from "assert"; import nodeStoreInjectable from "../../+nodes/store.injectable"; import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const clusterOverviewStoreInjectable = getInjectable({ id: "cluster-overview-store", @@ -35,7 +35,7 @@ const clusterOverviewStoreInjectable = getInjectable({ nodeStore: di.inject(nodeStoreInjectable), requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable), context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, clusterApi); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/details.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/details.tsx index cc71ef4431..55bbbf55d7 100644 --- a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/details.tsx +++ b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/details.tsx @@ -21,7 +21,7 @@ import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.inject import { withInjectables } from "@ogre-tools/injectable-react"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import getHorizontalPodAutoscalerMetrics from "./get-metrics.injectable"; import { getMetricName } from "./get-metric-name"; @@ -182,7 +182,7 @@ export const HorizontalPodAutoscalerDetails = withInjectables { } @@ -107,6 +107,6 @@ class NonInjectedLimitRangeDetails extends React.Component(NonInjectedLimitRangeDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+config-limit-ranges/store.injectable.ts b/packages/core/src/renderer/components/+config-limit-ranges/store.injectable.ts index ec27cefd2d..2c0b16cf0e 100644 --- a/packages/core/src/renderer/components/+config-limit-ranges/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-limit-ranges/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import limitRangeApiInjectable from "../../../common/k8s-api/endpoints/limit-range.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { LimitRangeStore } from "./store"; @@ -20,7 +20,7 @@ const limitRangeStoreInjectable = getInjectable({ return new LimitRangeStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-maps/config-map-details.tsx b/packages/core/src/renderer/components/+config-maps/config-map-details.tsx index 3d52375cc5..fb26562881 100644 --- a/packages/core/src/renderer/components/+config-maps/config-map-details.tsx +++ b/packages/core/src/renderer/components/+config-maps/config-map-details.tsx @@ -19,7 +19,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import configMapStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { MonacoEditor } from "../monaco-editor"; export interface ConfigMapDetailsProps extends KubeObjectDetailsProps { @@ -143,6 +143,6 @@ export const ConfigMapDetails = withInjectables { } @@ -135,6 +135,6 @@ class NonInjectedResourceQuotaDetails extends React.Component(NonInjectedResourceQuotaDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+config-resource-quotas/store.injectable.ts b/packages/core/src/renderer/components/+config-resource-quotas/store.injectable.ts index 6d38a706ba..5db8924878 100644 --- a/packages/core/src/renderer/components/+config-resource-quotas/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-resource-quotas/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import resourceQuotaApiInjectable from "../../../common/k8s-api/endpoints/resource-quota.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { ResourceQuotaStore } from "./store"; @@ -20,7 +20,7 @@ const resourceQuotaStoreInjectable = getInjectable({ return new ResourceQuotaStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-runtime-classes/store.injectable.ts b/packages/core/src/renderer/components/+config-runtime-classes/store.injectable.ts index 0d89484a29..1a869e4d44 100644 --- a/packages/core/src/renderer/components/+config-runtime-classes/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-runtime-classes/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { RuntimeClassStore } from "./store"; @@ -20,7 +20,7 @@ const runtimeClassStoreInjectable = getInjectable({ return new RuntimeClassStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-secrets/secret-details.tsx b/packages/core/src/renderer/components/+config-secrets/secret-details.tsx index 74fdddb748..e8573345f1 100644 --- a/packages/core/src/renderer/components/+config-secrets/secret-details.tsx +++ b/packages/core/src/renderer/components/+config-secrets/secret-details.tsx @@ -19,7 +19,7 @@ import { Secret } from "../../../common/k8s-api/endpoints"; import type { Logger } from "@k8slens/logging"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import secretStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import type { ShowCheckedErrorNotification } from "../notifications/show-checked-error.injectable"; @@ -172,7 +172,7 @@ class NonInjectedSecretDetails extends React.Component(NonInjectedSecretDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), secretStore: di.inject(secretStoreInjectable), showCheckedErrorNotification: di.inject(showCheckedErrorNotificationInjectable), showSuccessNotification: di.inject(showSuccessNotificationInjectable), diff --git a/packages/core/src/renderer/components/+config-secrets/store.injectable.ts b/packages/core/src/renderer/components/+config-secrets/store.injectable.ts index 341570788f..babfbda039 100644 --- a/packages/core/src/renderer/components/+config-secrets/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-secrets/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import secretApiInjectable from "../../../common/k8s-api/endpoints/secret.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { SecretStore } from "./store"; @@ -20,7 +20,7 @@ const secretStoreInjectable = getInjectable({ return new SecretStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-validating-webhook-configurations/validating-webhook-configuration-store.injectable.ts b/packages/core/src/renderer/components/+config-validating-webhook-configurations/validating-webhook-configuration-store.injectable.ts index 6b2dad24f8..db279b02e6 100644 --- a/packages/core/src/renderer/components/+config-validating-webhook-configurations/validating-webhook-configuration-store.injectable.ts +++ b/packages/core/src/renderer/components/+config-validating-webhook-configurations/validating-webhook-configuration-store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import { ValidatingWebhookConfigurationStore } from "./validating-webhook-configuration-store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import validatingWebhookConfigurationApiInjectable from "../../../common/k8s-api/endpoints/validating-webhook-configuration-api.injectable"; @@ -17,7 +17,7 @@ const validatingWebhookConfigurationStoreInjectable = getInjectable({ return new ValidatingWebhookConfigurationStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts index 6e07d05855..2351dd9476 100644 --- a/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import verticalPodAutoscalerApiInjectable from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; @@ -20,7 +20,7 @@ const verticalPodAutoscalerStoreInjectable = getInjectable({ return new VerticalPodAutoscalerStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx index 2c691a8f54..168b107805 100644 --- a/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx +++ b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx @@ -16,7 +16,7 @@ import { cssNames } from "@k8slens/utilities"; import { ContainerScalingMode, ControlledValues, ResourceName, UpdateMode, VerticalPodAutoscaler } from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api"; import type { PodUpdatePolicy, PodResourcePolicy, VerticalPodAutoscalerStatus } from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -215,6 +215,6 @@ export const VpaDetails = withInjectables(NonInje ...props, apiManager: di.inject(apiManagerInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+custom-resources/crd-details.tsx b/packages/core/src/renderer/components/+custom-resources/crd-details.tsx index 59fd3ff202..c8d1e31216 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-details.tsx +++ b/packages/core/src/renderer/components/+custom-resources/crd-details.tsx @@ -17,7 +17,7 @@ import { Input } from "../input"; import { MonacoEditor } from "../monaco-editor"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface CRDDetailsProps extends KubeObjectDetailsProps { } @@ -162,6 +162,6 @@ class NonInjectedCRDDetails extends React.Component(NonInjectedCRDDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+custom-resources/crd-resource-details.tsx b/packages/core/src/renderer/components/+custom-resources/crd-resource-details.tsx index eddba13d77..7cef9e8c61 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-resource-details.tsx +++ b/packages/core/src/renderer/components/+custom-resources/crd-resource-details.tsx @@ -18,7 +18,7 @@ import type { KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-a import { KubeObject } from "../../../common/k8s-api/kube-object"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface CustomResourceDetailsProps extends KubeObjectDetailsProps { crd?: CustomResourceDefinition; @@ -143,6 +143,6 @@ class NonInjectedCustomResourceDetails extends React.Component(NonInjectedCustomResourceDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+custom-resources/definition.store.injectable.ts b/packages/core/src/renderer/components/+custom-resources/definition.store.injectable.ts index 527fa77845..39cb437a8f 100644 --- a/packages/core/src/renderer/components/+custom-resources/definition.store.injectable.ts +++ b/packages/core/src/renderer/components/+custom-resources/definition.store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import customResourceDefinitionApiInjectable from "../../../common/k8s-api/endpoints/custom-resource-definition.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { CustomResourceDefinitionStore } from "./definition.store"; @@ -20,7 +20,7 @@ const customResourceDefinitionStoreInjectable = getInjectable({ return new CustomResourceDefinitionStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+events/event-details.tsx b/packages/core/src/renderer/components/+events/event-details.tsx index 7bbe18edb0..2e8eb1c9c5 100644 --- a/packages/core/src/renderer/components/+events/event-details.tsx +++ b/packages/core/src/renderer/components/+events/event-details.tsx @@ -21,7 +21,7 @@ import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.inject import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import { cssNames } from "@k8slens/utilities"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface EventDetailsProps extends KubeObjectDetailsProps { } @@ -104,6 +104,6 @@ export const EventDetails = withInjectables(Non ...props, apiManager: di.inject(apiManagerInjectable), getDetailsUrl: di.inject(getDetailsUrlInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+events/kube-event-details.tsx b/packages/core/src/renderer/components/+events/kube-event-details.tsx index a08588800f..688afae73f 100644 --- a/packages/core/src/renderer/components/+events/kube-event-details.tsx +++ b/packages/core/src/renderer/components/+events/kube-event-details.tsx @@ -18,7 +18,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import eventStoreInjectable from "./store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface KubeEventDetailsProps { object: KubeObject; @@ -100,7 +100,7 @@ export const KubeEventDetails = withInjectables { const { name, version: versionOrTagName, requireConfirmation = false } = info; diff --git a/packages/core/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx b/packages/core/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx index f13ad0f445..e1cbbecb1b 100644 --- a/packages/core/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx @@ -8,7 +8,7 @@ import { validatePackage } from "./validate-package"; import { getMessageFromError } from "../get-message-from-error/get-message-from-error"; import React from "react"; import type { InstallRequest } from "./attempt-install.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; 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"; @@ -29,7 +29,7 @@ const createTempFilesAndValidateInjectable = getInjectable({ id: "create-temp-files-and-validate", instantiate: (di): CreateTempFilesAndValidate => { const extensionDiscovery = di.inject(extensionDiscoveryInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const writeFile = di.inject(writeFileInjectable); const joinPaths = di.inject(joinPathsInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); diff --git a/packages/core/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx b/packages/core/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx index 7d25eeec70..ca615eb5ed 100644 --- a/packages/core/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx @@ -16,7 +16,7 @@ import { when } from "mobx"; import React from "react"; import type { InstallRequestValidated } from "./create-temp-files-and-validate.injectable"; import extractTarInjectable from "../../../../common/fs/extract-tar.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showInfoNotificationInjectable from "../../notifications/show-info-notification.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; @@ -29,7 +29,7 @@ const unpackExtensionInjectable = getInjectable({ const getExtensionDestFolder = di.inject(getExtensionDestFolderInjectable); const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable); const extractTar = di.inject(extractTarInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const showInfoNotification = di.inject(showInfoNotificationInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); diff --git a/packages/core/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.tsx b/packages/core/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.tsx index adc26993a8..3007f1a6cf 100644 --- a/packages/core/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.tsx @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import React from "react"; import execFileInjectable from "../../../../common/fs/exec-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { defaultExtensionRegistryUrl } from "../../../../features/user-preferences/common/preferences-helpers"; import userPreferencesStateInjectable from "../../../../features/user-preferences/common/state.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; @@ -17,7 +17,7 @@ const getBaseRegistryUrlInjectable = getInjectable({ instantiate: (di) => { const { extensionRegistryUrl } = di.inject(userPreferencesStateInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const execFile = di.inject(execFileInjectable); return async () => { diff --git a/packages/core/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx b/packages/core/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx index 6f32caaa90..eaabf151ac 100644 --- a/packages/core/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx @@ -13,7 +13,7 @@ import extensionInstallationStateStoreInjectable from "../../../extensions/exten import readFileNotifyInjectable from "./read-file-notify/read-file-notify.injectable"; import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable"; import { withTimeout } from "../../../common/fetch/timeout-controller"; @@ -29,7 +29,7 @@ const installExtensionFromInputInjectable = getInjectable({ const readFileNotify = di.inject(readFileNotifyInjectable); const getBasenameOfPath = di.inject(getBasenameOfPathInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const downloadBinary = di.inject(downloadBinaryInjectable); return async (input) => { diff --git a/packages/core/src/renderer/components/+extensions/install-on-drop.injectable.ts b/packages/core/src/renderer/components/+extensions/install-on-drop.injectable.ts index a443435752..17a929a2a0 100644 --- a/packages/core/src/renderer/components/+extensions/install-on-drop.injectable.ts +++ b/packages/core/src/renderer/components/+extensions/install-on-drop.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import attemptInstallsInjectable from "./attempt-installs.injectable"; export type InstallOnDrop = (files: File[]) => Promise; @@ -13,7 +13,7 @@ const installOnDropInjectable = getInjectable({ instantiate: (di): InstallOnDrop => { const attemptInstalls = di.inject(attemptInstallsInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (files) => { logger.info("Install from D&D"); diff --git a/packages/core/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts b/packages/core/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts index cbb0c58e97..8c36a28545 100644 --- a/packages/core/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts +++ b/packages/core/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts @@ -5,7 +5,7 @@ import { getMessageFromError } from "../get-message-from-error/get-message-from-error"; import { getInjectable } from "@ogre-tools/injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import readFileBufferInjectable from "../../../../common/fs/read-file-buffer.injectable"; export type ReadFileNotify = (filePath: string, showError?: boolean) => Promise; @@ -14,7 +14,7 @@ const readFileNotifyInjectable = getInjectable({ id: "read-file-notify", instantiate: (di): ReadFileNotify => { const showErrorNotification = di.inject(showErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const readFileBuffer = di.inject(readFileBufferInjectable); return async (filePath, showError = true) => { diff --git a/packages/core/src/renderer/components/+extensions/uninstall-extension.injectable.tsx b/packages/core/src/renderer/components/+extensions/uninstall-extension.injectable.tsx index b56855612c..d33610d058 100644 --- a/packages/core/src/renderer/components/+extensions/uninstall-extension.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/uninstall-extension.injectable.tsx @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable"; import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { LensExtensionId } from "@k8slens/legacy-extensions"; import { extensionDisplayName } from "../../../extensions/lens-extension"; import React from "react"; @@ -22,7 +22,7 @@ const uninstallExtensionInjectable = getInjectable({ const extensionLoader = di.inject(extensionLoaderInjectable); const extensionDiscovery = di.inject(extensionDiscoveryInjectable); const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const showSuccessNotification = di.inject(showSuccessNotificationInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-details.tsx b/packages/core/src/renderer/components/+namespaces/namespace-details.tsx index ab113bff19..fa5a9965b3 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-details.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-details.tsx @@ -25,7 +25,7 @@ import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injec import limitRangeStoreInjectable from "../+config-limit-ranges/store.injectable"; import resourceQuotaStoreInjectable from "../+config-resource-quotas/store.injectable"; import type { Logger } from "@k8slens/logging"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { NamespaceTreeView } from "./namespace-tree-view"; import namespaceStoreInjectable from "./store.injectable"; import type { NamespaceStore } from "./store"; @@ -124,7 +124,7 @@ export const NamespaceDetails = withInjectables { } @@ -57,6 +57,6 @@ class NonInjectedEndpointsDetails extends React.Component(NonInjectedEndpointsDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+network-endpoints/store.injectable.ts b/packages/core/src/renderer/components/+network-endpoints/store.injectable.ts index bca709ffd5..ab05505a61 100644 --- a/packages/core/src/renderer/components/+network-endpoints/store.injectable.ts +++ b/packages/core/src/renderer/components/+network-endpoints/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import endpointsApiInjectable from "../../../common/k8s-api/endpoints/endpoint.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { EndpointsStore } from "./store"; @@ -20,7 +20,7 @@ const endpointsStoreInjectable = getInjectable({ return new EndpointsStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+network-ingresses/ingress-class-store.injectable.ts b/packages/core/src/renderer/components/+network-ingresses/ingress-class-store.injectable.ts index 3fa142372c..eb1a2e2415 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingress-class-store.injectable.ts +++ b/packages/core/src/renderer/components/+network-ingresses/ingress-class-store.injectable.ts @@ -9,7 +9,7 @@ import ingressClassApiInjectable from "../../../common/k8s-api/endpoints/ingress import { IngressClassStore } from "./ingress-class-store"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const ingressClassStoreInjectable = getInjectable({ id: "ingress-class-store", @@ -21,7 +21,7 @@ const ingressClassStoreInjectable = getInjectable({ return new IngressClassStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, diff --git a/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx b/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx index 2bab04684f..1aff18ed97 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -15,7 +15,7 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { computeRuleDeclarations } from "../../../common/k8s-api/endpoints/ingress.api"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface IngressDetailsProps extends KubeObjectDetailsProps { } @@ -138,6 +138,6 @@ class NonInjectedIngressDetails extends React.Component(NonInjectedIngressDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+network-ingresses/ingress-store.injectable.ts b/packages/core/src/renderer/components/+network-ingresses/ingress-store.injectable.ts index cde6399865..6327107386 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingress-store.injectable.ts +++ b/packages/core/src/renderer/components/+network-ingresses/ingress-store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import ingressApiInjectable from "../../../common/k8s-api/endpoints/ingress.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { IngressStore } from "./ingress-store"; @@ -20,7 +20,7 @@ const ingressStoreInjectable = getInjectable({ return new IngressStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+network-policies/network-policy-details.tsx b/packages/core/src/renderer/components/+network-policies/network-policy-details.tsx index faeb1d5091..a9a57b6d53 100644 --- a/packages/core/src/renderer/components/+network-policies/network-policy-details.tsx +++ b/packages/core/src/renderer/components/+network-policies/network-policy-details.tsx @@ -17,7 +17,7 @@ import type { Logger } from "@k8slens/logging"; import type { LabelMatchExpression, LabelSelector } from "../../../common/k8s-api/kube-object"; import { isEmpty } from "lodash"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface NetworkPolicyDetailsProps extends KubeObjectDetailsProps { } @@ -214,6 +214,6 @@ class NonInjectedNetworkPolicyDetails extends React.Component(NonInjectedNetworkPolicyDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+network-policies/store.injectable.ts b/packages/core/src/renderer/components/+network-policies/store.injectable.ts index b47963e1b4..2873d91191 100644 --- a/packages/core/src/renderer/components/+network-policies/store.injectable.ts +++ b/packages/core/src/renderer/components/+network-policies/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import networkPolicyApiInjectable from "../../../common/k8s-api/endpoints/network-policy.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { NetworkPolicyStore } from "./store"; @@ -20,7 +20,7 @@ const networkPolicyStoreInjectable = getInjectable({ return new NetworkPolicyStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx b/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx index e15ba3f165..3ac66ac35b 100644 --- a/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx +++ b/packages/core/src/renderer/components/+network-services/service-details-endpoint.tsx @@ -11,7 +11,7 @@ import type { Logger } from "@k8slens/logging"; import { Endpoints } from "../../../common/k8s-api/endpoints"; import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showDetailsInjectable from "../kube-detail-params/show-details.injectable"; export interface ServiceDetailsEndpointProps { @@ -67,7 +67,7 @@ class NonInjectedServiceDetailsEndpoint extends React.Component(NonInjectedServiceDetailsEndpoint, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), showDetails: di.inject(showDetailsInjectable), }), }); diff --git a/packages/core/src/renderer/components/+network-services/service-details.tsx b/packages/core/src/renderer/components/+network-services/service-details.tsx index 1227ccd035..398083735d 100644 --- a/packages/core/src/renderer/components/+network-services/service-details.tsx +++ b/packages/core/src/renderer/components/+network-services/service-details.tsx @@ -21,7 +21,7 @@ import portForwardStoreInjectable from "../../port-forward/port-forward-store/po import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import endpointsStoreInjectable from "../+network-endpoints/store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface ServiceDetailsProps extends KubeObjectDetailsProps { } @@ -157,6 +157,6 @@ export const ServiceDetails = withInjectables subscribeStores: di.inject(subscribeStoresInjectable), portForwardStore: di.inject(portForwardStoreInjectable), endpointsStore: di.inject(endpointsStoreInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+network-services/service-port-component.tsx b/packages/core/src/renderer/components/+network-services/service-port-component.tsx index 3d4bcd383d..8e164ca1dc 100644 --- a/packages/core/src/renderer/components/+network-services/service-port-component.tsx +++ b/packages/core/src/renderer/components/+network-services/service-port-component.tsx @@ -23,7 +23,7 @@ import aboutPortForwardingInjectable from "../../port-forward/about-port-forward import notifyErrorPortForwardingInjectable from "../../port-forward/notify-error-port-forwarding.injectable"; import type { OpenPortForward } from "../../port-forward/open-port-forward.injectable"; import openPortForwardInjectable from "../../port-forward/open-port-forward.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; export interface ServicePortComponentProps { @@ -208,7 +208,7 @@ export const ServicePortComponent = withInjectables(NonIn ...props, subscribeStores: di.inject(subscribeStoresInjectable), podStore: di.inject(podStoreInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), loadPodsFromAllNamespaces: di.inject(loadPodsFromAllNamespacesInjectable), }), }); diff --git a/packages/core/src/renderer/components/+nodes/store.injectable.ts b/packages/core/src/renderer/components/+nodes/store.injectable.ts index 3d38f0e376..87d3dd9163 100644 --- a/packages/core/src/renderer/components/+nodes/store.injectable.ts +++ b/packages/core/src/renderer/components/+nodes/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { NodeStore } from "./store"; @@ -20,7 +20,7 @@ const nodeStoreInjectable = getInjectable({ return new NodeStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx b/packages/core/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx index c1da3ca1e0..b82af179f5 100644 --- a/packages/core/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx +++ b/packages/core/src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx @@ -14,7 +14,7 @@ import { Badge } from "../badge"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface PodSecurityPolicyDetailsProps extends KubeObjectDetailsProps { } @@ -235,6 +235,6 @@ class NonInjectedPodSecurityPolicyDetails extends React.Component(NonInjectedPodSecurityPolicyDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+pod-security-policies/store.injectable.ts b/packages/core/src/renderer/components/+pod-security-policies/store.injectable.ts index 8ebd5cd35f..6bf015ed16 100644 --- a/packages/core/src/renderer/components/+pod-security-policies/store.injectable.ts +++ b/packages/core/src/renderer/components/+pod-security-policies/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import podSecurityPolicyApiInjectable from "../../../common/k8s-api/endpoints/pod-security-policy.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PodSecurityPolicyStore } from "./store"; @@ -20,7 +20,7 @@ const podSecurityPolicyStoreInjectable = getInjectable({ return new PodSecurityPolicyStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+storage-classes/storage-class-details.tsx b/packages/core/src/renderer/components/+storage-classes/storage-class-details.tsx index 1e1c01ca96..185be1e8c4 100644 --- a/packages/core/src/renderer/components/+storage-classes/storage-class-details.tsx +++ b/packages/core/src/renderer/components/+storage-classes/storage-class-details.tsx @@ -21,7 +21,7 @@ import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import storageClassStoreInjectable from "./store.injectable"; import persistentVolumeStoreInjectable from "../+storage-volumes/store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface StorageClassDetailsProps extends KubeObjectDetailsProps { } @@ -102,7 +102,7 @@ export const StorageClassDetails = withInjectables { } @@ -109,6 +109,6 @@ export const PersistentVolumeClaimDetails = withInjectables(NonInjectedPersistentVolumeDetails, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), getDetailsUrl: di.inject(getDetailsUrlInjectable), persistentVolumeClaimApi: di.inject(persistentVolumeClaimApiInjectable), storageClassApi: di.inject(storageClassApiInjectable), diff --git a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/store.injectable.ts b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/store.injectable.ts index 8a1bbad2c5..ac9d0c54f7 100644 --- a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/store.injectable.ts +++ b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/store.injectable.ts @@ -9,7 +9,7 @@ import clusterRoleBindingApiInjectable from "../../../../common/k8s-api/endpoint import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/kube-object-store-token"; import { ClusterRoleBindingStore } from "./store"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../../cluster-frame-context/for-cluster-scoped-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const clusterRoleBindingStoreInjectable = getInjectable({ id: "cluster-role-binding-store", @@ -20,7 +20,7 @@ const clusterRoleBindingStoreInjectable = getInjectable({ return new ClusterRoleBindingStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+user-management/+cluster-roles/store.injectable.ts b/packages/core/src/renderer/components/+user-management/+cluster-roles/store.injectable.ts index 2d2f01cbae..31d57e14e7 100644 --- a/packages/core/src/renderer/components/+user-management/+cluster-roles/store.injectable.ts +++ b/packages/core/src/renderer/components/+user-management/+cluster-roles/store.injectable.ts @@ -9,7 +9,7 @@ import clusterRoleApiInjectable from "../../../../common/k8s-api/endpoints/clust import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/kube-object-store-token"; import { ClusterRoleStore } from "./store"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../../cluster-frame-context/for-cluster-scoped-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const clusterRoleStoreInjectable = getInjectable({ id: "cluster-role-store", @@ -20,7 +20,7 @@ const clusterRoleStoreInjectable = getInjectable({ return new ClusterRoleStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/store.injectable.ts b/packages/core/src/renderer/components/+user-management/+role-bindings/store.injectable.ts index 02ad536549..1c37782c8c 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/store.injectable.ts +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/store.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/kube-object-store-token"; import roleBindingApiInjectable from "../../../../common/k8s-api/endpoints/role-binding.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable"; import { RoleBindingStore } from "./store"; @@ -20,7 +20,7 @@ const roleBindingStoreInjectable = getInjectable({ return new RoleBindingStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+user-management/+roles/store.injectable.ts b/packages/core/src/renderer/components/+user-management/+roles/store.injectable.ts index e25a82e831..d658d21daa 100644 --- a/packages/core/src/renderer/components/+user-management/+roles/store.injectable.ts +++ b/packages/core/src/renderer/components/+user-management/+roles/store.injectable.ts @@ -9,7 +9,7 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/kube-object-store-token"; import { RoleStore } from "./store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const roleStoreInjectable = getInjectable({ id: "role-store", @@ -20,7 +20,7 @@ const roleStoreInjectable = getInjectable({ return new RoleStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+user-management/+service-accounts/store.injectable.ts b/packages/core/src/renderer/components/+user-management/+service-accounts/store.injectable.ts index 4d094cefa0..890c846aa0 100644 --- a/packages/core/src/renderer/components/+user-management/+service-accounts/store.injectable.ts +++ b/packages/core/src/renderer/components/+user-management/+service-accounts/store.injectable.ts @@ -9,7 +9,7 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/kube-object-store-token"; import { ServiceAccountStore } from "./store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const serviceAccountStoreInjectable = getInjectable({ id: "service-account-store", @@ -20,7 +20,7 @@ const serviceAccountStoreInjectable = getInjectable({ return new ServiceAccountStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx b/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx index 0e8936fb5c..4b60dceff5 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx +++ b/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx @@ -22,7 +22,7 @@ import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import cronJobStoreInjectable from "./store.injectable"; import jobStoreInjectable from "../+workloads-jobs/store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; @@ -127,7 +127,7 @@ export const CronJobDetails = withInjectables subscribeStores: di.inject(subscribeStoresInjectable), cronJobStore: di.inject(cronJobStoreInjectable), jobStore: di.inject(jobStoreInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), getDetailsUrl: di.inject(getDetailsUrlInjectable), }), }); diff --git a/packages/core/src/renderer/components/+workloads-cronjobs/store.injectable.ts b/packages/core/src/renderer/components/+workloads-cronjobs/store.injectable.ts index e3b6a6407b..3ea70a7154 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-cronjobs/store.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import getJobsByOwnerInjectable from "../+workloads-jobs/get-jobs-by-owner.injectable"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import cronJobApiInjectable from "../../../common/k8s-api/endpoints/cron-job.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { CronJobStore } from "./store"; @@ -22,7 +22,7 @@ const cronJobStoreInjectable = getInjectable({ return new CronJobStore({ getJobsByOwner: di.inject(getJobsByOwnerInjectable), context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx b/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx index 1086411125..95db86f95e 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx +++ b/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx @@ -23,7 +23,7 @@ import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import daemonSetStoreInjectable from "./store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface DaemonSetDetailsProps extends KubeObjectDetailsProps { } @@ -107,6 +107,6 @@ export const DaemonSetDetails = withInjectables { } @@ -130,7 +130,7 @@ export const DeploymentDetails = withInjectables { } @@ -124,7 +124,7 @@ export const JobDetails = withInjectables(NonInje subscribeStores: di.inject(subscribeStoresInjectable), podStore: di.inject(podStoreInjectable), jobStore: di.inject(jobStoreInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+workloads-jobs/store.injectable.ts b/packages/core/src/renderer/components/+workloads-jobs/store.injectable.ts index f0da8283d6..8082c192d1 100644 --- a/packages/core/src/renderer/components/+workloads-jobs/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-jobs/store.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import getPodsByOwnerIdInjectable from "../+workloads-pods/get-pods-by-owner-id.injectable"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import jobApiInjectable from "../../../common/k8s-api/endpoints/job.api.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { JobStore } from "./store"; @@ -22,7 +22,7 @@ const jobStoreInjectable = getInjectable({ return new JobStore({ getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable), context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+workloads-pods/pod-container-port.tsx b/packages/core/src/renderer/components/+workloads-pods/pod-container-port.tsx index 2ca596ac0c..3b546599fb 100644 --- a/packages/core/src/renderer/components/+workloads-pods/pod-container-port.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/pod-container-port.tsx @@ -23,7 +23,7 @@ import aboutPortForwardingInjectable from "../../port-forward/about-port-forward import notifyErrorPortForwardingInjectable from "../../port-forward/notify-error-port-forwarding.injectable"; import type { OpenPortForward } from "../../port-forward/open-port-forward.injectable"; import openPortForwardInjectable from "../../port-forward/open-port-forward.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; export interface PodContainerPortProps { @@ -206,7 +206,7 @@ export const PodContainerPort = withInjectables(NonInje priorityClassApi: di.inject(priorityClassApiInjectable), runtimeClassApi: di.inject(runtimeClassApiInjectable), serviceAccountApi: di.inject(serviceAccountApiInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/+workloads-pods/store.injectable.ts b/packages/core/src/renderer/components/+workloads-pods/store.injectable.ts index 3da97e08a8..963adce697 100644 --- a/packages/core/src/renderer/components/+workloads-pods/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-pods/store.injectable.ts @@ -10,7 +10,7 @@ import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manag import { PodStore } from "./store"; import podMetricsApiInjectable from "../../../common/k8s-api/endpoints/pod-metrics.api.injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const podStoreInjectable = getInjectable({ id: "pod-store", @@ -22,7 +22,7 @@ const podStoreInjectable = getInjectable({ return new PodStore({ podMetricsApi: di.inject(podMetricsApiInjectable), context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx b/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx index 4d4d6b3521..1b0593ea8e 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx +++ b/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx @@ -22,7 +22,7 @@ import type { PodStore } from "../+workloads-pods/store"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import type { ReplicaSetStore } from "./store"; import replicaSetStoreInjectable from "./store.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface ReplicaSetDetailsProps extends KubeObjectDetailsProps { } @@ -105,6 +105,6 @@ export const ReplicaSetDetails = withInjectables { } @@ -105,7 +105,7 @@ export const StatefulSetDetails = withInjectables new ClusterFrameHandler({ emitClusterVisibility: di.inject(emitClusterVisibilityInjectable), getClusterById: di.inject(getClusterByIdInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts index 675d4a230d..0f09a82e3c 100644 --- a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts +++ b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts @@ -15,7 +15,7 @@ import homeDirectoryPathInjectable from "../../../../common/os/home-directory-pa import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable"; import parsePathInjectable from "../../../../common/path/parse.injectable"; import { waitForPath } from "../../../../common/utils/wait-for-path"; -import { prefixedLoggerInjectable } from "@k8slens/logging"; +import { prefixedLoggerInjectionToken } from "@k8slens/logging"; const userCreateResourceTemplatesInjectable = getInjectable({ id: "user-create-resource-templates", @@ -25,7 +25,7 @@ const userCreateResourceTemplatesInjectable = getInjectable({ const getRelativePath = di.inject(getRelativePathInjectable); const homeDirectoryPath = di.inject(homeDirectoryPathInjectable); const getDirnameOfPath = di.inject(getDirnameOfPathInjectable); - const logger = di.inject(prefixedLoggerInjectable, "USER-CREATE-RESOURCE-TEMPLATES"); + const logger = di.inject(prefixedLoggerInjectionToken, "USER-CREATE-RESOURCE-TEMPLATES"); const parsePath = di.inject(parsePathInjectable); const userTemplatesFolder = joinPaths(homeDirectoryPath, ".k8slens", "templates"); diff --git a/packages/core/src/renderer/components/dock/create-resource/view.tsx b/packages/core/src/renderer/components/dock/create-resource/view.tsx index 56a7abae0b..beba5cea48 100644 --- a/packages/core/src/renderer/components/dock/create-resource/view.tsx +++ b/packages/core/src/renderer/components/dock/create-resource/view.tsx @@ -29,7 +29,7 @@ import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.in import navigateInjectable from "../../../navigation/navigate.injectable"; import type { RequestKubeObjectCreation } from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable"; import requestKubeObjectCreationInjectable from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { ShowCheckedErrorNotification } from "../../notifications/show-checked-error.injectable"; import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable"; import showCheckedErrorNotificationInjectable from "../../notifications/show-checked-error.injectable"; @@ -184,7 +184,7 @@ export const CreateResource = withInjectables createResourceTabStore: di.inject(createResourceTabStoreInjectable), createResourceTemplates: await di.inject(createResourceTemplatesInjectable), apiManager: di.inject(apiManagerInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), getDetailsUrl: di.inject(getDetailsUrlInjectable), navigate: di.inject(navigateInjectable), requestKubeObjectCreation: di.inject(requestKubeObjectCreationInjectable), diff --git a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts index 3394037407..b846ffc009 100644 --- a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts +++ b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { PodLogsQuery } from "../../../../common/k8s-api/endpoints"; import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; import callForLogsInjectable from "./call-for-logs.injectable"; @@ -16,7 +16,7 @@ const downloadAllLogsInjectable = getInjectable({ instantiate: (di) => { const callForLogs = di.inject(callForLogsInjectable); const openSaveFileDialog = di.inject(openSaveFileDialogInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const showErrorNotification = di.inject(showErrorNotificationInjectable); return async (params: ResourceDescriptor, query: PodLogsQuery) => { diff --git a/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts b/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts index 559407f18e..8329d5eb4b 100644 --- a/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts +++ b/packages/core/src/renderer/components/dock/terminal/create-terminal.injectable.ts @@ -11,7 +11,7 @@ import terminalSpawningPoolInjectable from "./terminal-spawning-pool.injectable" import isMacInjectable from "../../../../common/vars/is-mac.injectable"; import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable"; import xtermColorThemeInjectable from "../../../themes/terminal-colors.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import terminalConfigInjectable from "../../../../features/user-preferences/common/terminal-config.injectable"; import terminalCopyOnSelectInjectable from "../../../../features/user-preferences/common/terminal-copy-on-select.injectable"; @@ -27,7 +27,7 @@ const createTerminalInjectable = getInjectable({ isMac: di.inject(isMacInjectable), openLinkInBrowser: di.inject(openLinkInBrowserInjectable), xtermColorTheme: di.inject(xtermColorThemeInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; return (tabId, api) => new Terminal(dependencies, { tabId, api }); diff --git a/packages/core/src/renderer/components/dock/terminal/send-command.injectable.ts b/packages/core/src/renderer/components/dock/terminal/send-command.injectable.ts index 0ce07bd4cf..416018bc7c 100644 --- a/packages/core/src/renderer/components/dock/terminal/send-command.injectable.ts +++ b/packages/core/src/renderer/components/dock/terminal/send-command.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { when } from "mobx"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { TerminalChannels } from "../../../../common/terminal/channels"; import { waitUntilDefined, noop } from "@k8slens/utilities"; import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable"; @@ -40,7 +40,7 @@ const sendCommandInjectable = getInjectable({ const selectTab = di.inject(selectDockTabInjectable); const getTerminalApi = di.inject(getTerminalApiInjectable); const showSuccessNotification = di.inject(showSuccessNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async (command: string, options: SendCommandOptions = {}): Promise => { let tabId: string | undefined = options.tabId; diff --git a/packages/core/src/renderer/components/icon/icon.test.tsx b/packages/core/src/renderer/components/icon/icon.test.tsx index f486d0cbd2..313b6ff610 100644 --- a/packages/core/src/renderer/components/icon/icon.test.tsx +++ b/packages/core/src/renderer/components/icon/icon.test.tsx @@ -5,7 +5,7 @@ import React from "react"; import type { Logger } from "@k8slens/logging"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiRender } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor"; @@ -26,7 +26,7 @@ describe(" href technical tests", () => { warn: jest.fn(), }; - di.override(loggerInjectable, () => logger); + di.override(loggerInjectionToken, () => logger); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/icon/icon.tsx b/packages/core/src/renderer/components/icon/icon.tsx index 867d7bd802..15be33d46d 100644 --- a/packages/core/src/renderer/components/icon/icon.tsx +++ b/packages/core/src/renderer/components/icon/icon.tsx @@ -36,7 +36,7 @@ import Wheel from "./wheel.svg"; import Workloads from "./workloads.svg"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; const hrefValidation = /https?:\/\//; @@ -279,7 +279,7 @@ const RawIcon = (props: IconProps & Dependencies) => { const InjectedIcon = withInjectables(RawIcon, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/input/drop-file-input.tsx b/packages/core/src/renderer/components/input/drop-file-input.tsx index 400ecaa4f6..e6d3581571 100644 --- a/packages/core/src/renderer/components/input/drop-file-input.tsx +++ b/packages/core/src/renderer/components/input/drop-file-input.tsx @@ -11,7 +11,7 @@ import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import autoBindReact from "auto-bind/react"; export interface DropFileInputProps extends React.DOMAttributes { @@ -109,7 +109,7 @@ class NonInjectedDropFileInput extends React.Component>(NonInjectedDropFileInput, { getProps: (di, props) => ({ ...props, - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx index c4aa1a3d1c..22460c5606 100644 --- a/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx +++ b/packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx @@ -18,7 +18,7 @@ import { observer } from "mobx-react"; import { withInjectables } from "@ogre-tools/injectable-react"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { NamespaceApi } from "../../../common/k8s-api/endpoints"; import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable"; @@ -131,7 +131,7 @@ export const KubeObjectMeta = withInjectables ...props, getDetailsUrl: di.inject(getDetailsUrlInjectable), apiManager: di.inject(apiManagerInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), namespaceApi: di.inject(namespaceApiInjectable), }), }); diff --git a/packages/core/src/renderer/components/kubeconfig-dialog/open.injectable.ts b/packages/core/src/renderer/components/kubeconfig-dialog/open.injectable.ts index f5dee64cbb..d1425299b2 100644 --- a/packages/core/src/renderer/components/kubeconfig-dialog/open.injectable.ts +++ b/packages/core/src/renderer/components/kubeconfig-dialog/open.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type React from "react"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showCheckedErrorNotificationInjectable from "../notifications/show-checked-error.injectable"; import kubeconfigDialogStateInjectable from "./state.injectable"; @@ -20,7 +20,7 @@ const openKubeconfigDialogInjectable = getInjectable({ instantiate: (di): OpenKubeconfigDialog => { const state = di.inject(kubeconfigDialogStateInjectable); const showCheckedErrorNotification = di.inject(showCheckedErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return ({ title, loader }) => { (async () => { diff --git a/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx b/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx index c4f021ebb0..2c55e9ffd8 100644 --- a/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx +++ b/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx @@ -18,7 +18,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import activeThemeInjectable from "../../themes/active.injectable"; import getEditorHeightFromLinesCountInjectable from "./get-editor-height-from-lines-number.injectable"; import type { Logger } from "@k8slens/logging"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import autoBindReact from "auto-bind/react"; import type { UserPreferencesState } from "../../../features/user-preferences/common/state.injectable"; import userPreferencesStateInjectable from "../../../features/user-preferences/common/state.injectable"; @@ -333,6 +333,6 @@ export const MonacoEditor = withInjectables { const showErrorNotification = di.inject(showErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (message, fallback, opts) => { if (typeof message === "string" || message instanceof Error || message instanceof JsonApiErrorParsed) { diff --git a/packages/core/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx b/packages/core/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx index 4d77859305..570ef65ed1 100644 --- a/packages/core/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx +++ b/packages/core/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx @@ -12,7 +12,7 @@ import { statusBarItemInjectionToken } from "./status-bar-item-injection-token"; import type { StatusBarRegistration } from "./status-bar-registration"; import React from "react"; import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { Logger } from "@k8slens/logging"; const statusBarItemRegistratorInjectable = getInjectable({ @@ -21,7 +21,7 @@ const statusBarItemRegistratorInjectable = getInjectable({ instantiate: (di) => (extension) => { const rendererExtension = extension as LensRendererExtension; const getRandomId = di.inject(getRandomIdInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return rendererExtension.statusBarItems.flatMap( toItemInjectableFor(rendererExtension, getRandomId, logger), diff --git a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts index 907a1fa621..8dff3152f2 100644 --- a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts +++ b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts @@ -10,7 +10,7 @@ import hostedClusterInjectable from "../../../cluster-frame-context/hosted-clust import assert from "assert"; import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable"; import loadExtensionsInjectable from "../../load-extensions.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showErrorNotificationInjectable from "../../../components/notifications/show-error-notification.injectable"; const initClusterFrameInjectable = getInjectable({ @@ -27,7 +27,7 @@ const initClusterFrameInjectable = getInjectable({ catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable), frameRoutingId: di.inject(frameRoutingIdInjectable), emitAppEvent: di.inject(emitAppEventInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), showErrorNotification: di.inject(showErrorNotificationInjectable), }); }, diff --git a/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts b/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts index 2b285ffa32..61eafb2472 100644 --- a/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts +++ b/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../cluster-frame-context/for-namespaced-resources.injectable"; import { KubeWatchApi } from "./kube-watch-api"; @@ -12,7 +12,7 @@ const kubeWatchApiInjectable = getInjectable({ instantiate: (di) => new KubeWatchApi({ clusterContext: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }), }); diff --git a/packages/core/src/renderer/navigation/setup-logging-for-navigation.injectable.ts b/packages/core/src/renderer/navigation/setup-logging-for-navigation.injectable.ts index 2e8715fb2b..f03d96445c 100644 --- a/packages/core/src/renderer/navigation/setup-logging-for-navigation.injectable.ts +++ b/packages/core/src/renderer/navigation/setup-logging-for-navigation.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens"; import observableHistoryInjectable from "./observable-history.injectable"; @@ -11,7 +11,7 @@ const setupLoggingForNavigationInjectable = getInjectable({ id: "setup-logging-for-navigation", instantiate: (di) => ({ run: () => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const observableHistory = di.inject(observableHistoryInjectable); observableHistory.listen((location, action) => { diff --git a/packages/core/src/renderer/port-forward/open-port-forward.injectable.ts b/packages/core/src/renderer/port-forward/open-port-forward.injectable.ts index 26badd07e6..5472d357b2 100644 --- a/packages/core/src/renderer/port-forward/open-port-forward.injectable.ts +++ b/packages/core/src/renderer/port-forward/open-port-forward.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable"; import showErrorNotificationInjectable from "../components/notifications/show-error-notification.injectable"; import type { ForwardedPort } from "./port-forward-item"; @@ -16,7 +16,7 @@ const openPortForwardInjectable = getInjectable({ instantiate: (di): OpenPortForward => { const openLinkInBrowser = di.inject(openLinkInBrowserInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return (portForward) => { const browseTo = portForwardAddress(portForward); diff --git a/packages/core/src/renderer/port-forward/port-forward-dialog.tsx b/packages/core/src/renderer/port-forward/port-forward-dialog.tsx index 30399fe582..03eab0795e 100644 --- a/packages/core/src/renderer/port-forward/port-forward-dialog.tsx +++ b/packages/core/src/renderer/port-forward/port-forward-dialog.tsx @@ -24,7 +24,7 @@ import aboutPortForwardingInjectable from "./about-port-forwarding.injectable"; import notifyErrorPortForwardingInjectable from "./notify-error-port-forwarding.injectable"; import type { OpenPortForward } from "./open-port-forward.injectable"; import openPortForwardInjectable from "./open-port-forward.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; export interface PortForwardDialogProps extends Partial {} @@ -180,6 +180,6 @@ export const PortForwardDialog = withInjectables { const apiBase = di.inject(apiBaseInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return async ({ port, forwardPort, namespace, kind, name, ...rest }) => { try { diff --git a/packages/core/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts b/packages/core/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts index 3d2c9499d6..79b7facf5f 100644 --- a/packages/core/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts +++ b/packages/core/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import { LensProtocolRouterRenderer } from "./lens-protocol-router-renderer"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import showErrorNotificationInjectable from "../../components/notifications/show-error-notification.injectable"; import showShortInfoNotificationInjectable from "../../components/notifications/show-short-info.injectable"; import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable"; @@ -16,7 +16,7 @@ const lensProtocolRouterRendererInjectable = getInjectable({ instantiate: (di) => new LensProtocolRouterRenderer({ extensionLoader: di.inject(extensionLoaderInjectable), isExtensionEnabled: di.inject(isExtensionEnabledInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), showErrorNotification: di.inject(showErrorNotificationInjectable), showShortInfoNotification: di.inject(showShortInfoNotificationInjectable), }), diff --git a/packages/core/src/renderer/themes/apply-lens-theme.injectable.ts b/packages/core/src/renderer/themes/apply-lens-theme.injectable.ts index be00de0861..cf0dc2cb08 100644 --- a/packages/core/src/renderer/themes/apply-lens-theme.injectable.ts +++ b/packages/core/src/renderer/themes/apply-lens-theme.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import { object } from "@k8slens/utilities"; import type { LensTheme } from "./lens-theme"; import resetThemeInjectable from "../../features/user-preferences/common/reset-theme.injectable"; @@ -13,7 +13,7 @@ export type ApplyLensTheme = (theme: LensTheme) => void; const applyLensThemeInjectable = getInjectable({ id: "apply-lens-theme", instantiate: (di): ApplyLensTheme => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const resetTheme = di.inject(resetThemeInjectable); return (theme) => { diff --git a/packages/core/src/renderer/utils/create-storage-helper.injectable.ts b/packages/core/src/renderer/utils/create-storage-helper.injectable.ts index 8443afaea6..30ff7ec941 100644 --- a/packages/core/src/renderer/utils/create-storage-helper.injectable.ts +++ b/packages/core/src/renderer/utils/create-storage-helper.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import type { StorageHelperDependencies, StorageHelperOptions } from "./storage-helper"; import { StorageHelper } from "./storage-helper"; @@ -13,7 +13,7 @@ const createStorageHelperInjectable = getInjectable({ id: "create-storage-helper", instantiate: (di): CreateStorageHelper => { const deps: StorageHelperDependencies = { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }; return (key, options) => new StorageHelper(deps, key, options); diff --git a/packages/core/src/renderer/utils/create-storage/initialize-state.injectable.ts b/packages/core/src/renderer/utils/create-storage/initialize-state.injectable.ts index e14ef274d4..fbf80a51fa 100644 --- a/packages/core/src/renderer/utils/create-storage/initialize-state.injectable.ts +++ b/packages/core/src/renderer/utils/create-storage/initialize-state.injectable.ts @@ -8,7 +8,7 @@ import { comparer, reaction, runInAction, toJS } from "mobx"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable"; -import { loggerInjectable } from "@k8slens/logging"; +import { loggerInjectionToken } from "@k8slens/logging"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import setupAppPathsInjectable from "../../app-paths/setup-app-paths.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application"; @@ -27,7 +27,7 @@ const initializeStateInjectable = getInjectable({ const lensLocalStorageState = di.inject(lensLocalStorageStateInjectable); const readJsonFile = di.inject(readJsonFileInjectable); const writeJsonFile = di.inject(writeJsonFileInjectable); - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); const storageSaveDelay = di.inject(storageSaveDelayInjectable); const lock = new AwaitLock(); diff --git a/packages/logging/index.ts b/packages/logging/index.ts index 639bac58e7..2da1b95691 100644 --- a/packages/logging/index.ts +++ b/packages/logging/index.ts @@ -1,7 +1,9 @@ -export { logErrorInjectable } from "./src/log-error.injectable"; -export { loggerInjectable } from "./src/logger.injectable"; -export type { Logger } from "./src/logger"; -export { winstonLoggerInjectable } from "./src/winston-logger.injectable"; -export { prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; -export { loggerTransportInjectionToken } from "./src/transports"; export { loggingFeature } from "./src/feature"; + +export type { Logger } from "./src/logger"; + +export { logErrorInjectionToken } from "./src/log-error.injectable"; +export { loggerInjectionToken } from "./src/logger.injectable"; +export { winstonLoggerInjectionToken } from "./src/winston-logger.injectable"; +export { prefixedLoggerInjectionToken } from "./src/prefixed-logger.injectable"; +export { loggerTransportInjectionToken } from "./src/transports"; diff --git a/packages/logging/src/log-error.injectable.ts b/packages/logging/src/log-error.injectable.ts index d13065b7a8..73d27a9358 100644 --- a/packages/logging/src/log-error.injectable.ts +++ b/packages/logging/src/log-error.injectable.ts @@ -2,11 +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 { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; import { loggerInjectable } from "./logger.injectable"; +type LogError = (message: string, ...args: any) => void; + +export const logErrorInjectionToken = getInjectionToken({ + id: "logger", +}); + export const logErrorInjectable = getInjectable({ id: "log-error", instantiate: (di) => di.inject(loggerInjectable).error, + injectionToken: logErrorInjectionToken, decorable: false, }); diff --git a/packages/logging/src/logger.injectable.ts b/packages/logging/src/logger.injectable.ts index 39828861f7..faaba8e911 100644 --- a/packages/logging/src/logger.injectable.ts +++ b/packages/logging/src/logger.injectable.ts @@ -2,10 +2,14 @@ * 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 { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; import { winstonLoggerInjectable } from "./winston-logger.injectable"; +export const loggerInjectionToken = getInjectionToken({ + id: "logger", +}); + export const loggerInjectable = getInjectable({ id: "logger", instantiate: (di): Logger => { @@ -19,6 +23,6 @@ export const loggerInjectable = getInjectable({ silly: (message, ...data) => baseLogger.silly(message, ...data), }; }, - + injectionToken: loggerInjectionToken, decorable: false, }); diff --git a/packages/logging/src/prefixed-logger.injectable.ts b/packages/logging/src/prefixed-logger.injectable.ts index d0fe2e090b..0ab83a6d59 100644 --- a/packages/logging/src/prefixed-logger.injectable.ts +++ b/packages/logging/src/prefixed-logger.injectable.ts @@ -2,10 +2,14 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable, getInjectionToken, lifecycleEnum } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; import { loggerInjectable } from "./logger.injectable"; +export const prefixedLoggerInjectionToken = getInjectionToken({ + id: "prefixed-logger", +}); + export const prefixedLoggerInjectable = getInjectable({ id: "prefixed-logger", instantiate: (di, prefix): Logger => { @@ -32,4 +36,5 @@ export const prefixedLoggerInjectable = getInjectable({ lifecycle: lifecycleEnum.keyedSingleton({ getInstanceKey: (di, prefix: string) => prefix, }), + injectionToken: prefixedLoggerInjectionToken, }); diff --git a/packages/logging/src/winston-logger.injectable.ts b/packages/logging/src/winston-logger.injectable.ts index e7fbb764c3..75d4d179e3 100644 --- a/packages/logging/src/winston-logger.injectable.ts +++ b/packages/logging/src/winston-logger.injectable.ts @@ -2,10 +2,15 @@ * 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 { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; import { createLogger, format } from "winston"; +import type { Logger as WinstonLogger } from "winston"; import { loggerTransportInjectionToken } from "./transports"; +export const winstonLoggerInjectionToken = getInjectionToken({ + id: "winston-logger", +}); + export const winstonLoggerInjectable = getInjectable({ id: "winston-logger", instantiate: (di) =>