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 2a391af131..3613f4da84 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; /** * 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 0236c36a28..0e2678cda7 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4624026e1a..10a5fb33fc 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 "@k8slens/legacy-global-di"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2458bceeb7..2b14e04bea 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 dcc1a50ba4..3c5e91f2eb 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 @@ -21,7 +21,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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { Cluster } from "../../cluster/cluster"; @@ -710,7 +710,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 5ac2d2e88f..747c966e10 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { KubeApi } from "../kube-api"; import type { KubeObject } from "@k8slens/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 f06bdc1b11..87215d13c8 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 54655d8ef6..98e2250e71 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 eec85df078..f76530b4eb 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 53d5b22466..0818a8902a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4d0b0f34a7..df0659634a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ff1a6241bd..a5034e9e4b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 995071c385..5e5dd516d4 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 0dccc01f70..5747e4cf92 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 e8912604f0..b5ea9fb82d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 df13055610..4f719aaac1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2c8f4dd289..50784c77e2 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 010a4c6113..a2af7a9e53 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 a21922dd87..682ba6f7d5 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 environments"); 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 f9760daf10..6458c376ab 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 750ac526c8..a03dc401b9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 906b2f9127..dc34d7075e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 065f84b81a..3b7757781a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d444312f0b..323becdf56 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 3d89f47b58..732d88476d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 bffa467b70..d27d55cb3a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 407fd18438..c37834b3f7 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1386b9a3a9..677f368cac 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 3d55a9a626..55f48e1d75 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5b5cabef2f..2238f9c4be 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 036a6b7c0b..ac248358e3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 01f4751a9d..03d5f1e46f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ba2c6940a9..759be7e09b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 382092a346..a974964e5f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 9041c82ba0..1298fde1a2 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 15d696bcab..b35512883e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 22ddce82e0..40914af147 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 934dd1d517..f79db5e31c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fd56c5a8f2..d1e0fd0a32 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 01421514c5..f70c2ddce4 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 68fef648d8..aa01f6e39b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4f9110f69a..6dd8aefa6d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 cde7f34e45..5ecb1bf0e3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 9e1b197cbb..8c5f16ed5d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 44709339e6..5281ba8687 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 70197db2f9..a88aa9cf42 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 77a41f9a84..920579cd5d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 080d799fe2..936a685e29 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 cd03f98f86..a4901e6727 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5405e7f3d0..a31f46e07e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 f1b6919c55..3cc3ae376e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 7c2a025d51..d9d3ecf457 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 416e1f1714..09e6326469 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 868d195cf2..c1b042c902 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/log-error.injectable.ts b/packages/core/src/common/log-error.injectable.ts index 2a225fb993..93b9faa29f 100644 --- a/packages/core/src/common/log-error.injectable.ts +++ b/packages/core/src/common/log-error.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 { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; const logErrorInjectable = getInjectable({ id: "log-error", - instantiate: (di) => di.inject(loggerInjectable).error, + instantiate: (di) => di.inject(loggerInjectionToken).error, decorable: false, }); diff --git a/packages/core/src/common/logger.global-override-for-injectable.ts b/packages/core/src/common/logger.global-override-for-injectable.ts index 2dab067e69..369a95d80e 100644 --- a/packages/core/src/common/logger.global-override-for-injectable.ts +++ b/packages/core/src/common/logger.global-override-for-injectable.ts @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import { getGlobalOverride } from "@k8slens/test-utils"; -export default getGlobalOverride(loggerInjectable, () => ({ +export default getGlobalOverride(loggerInjectionToken, () => ({ warn: () => {}, debug: () => {}, error: () => {}, diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/common/persistent-storage/create.injectable.ts index 6522679a7e..1f3d158e90 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 c160c3eacb..ed3f400665 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/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 new file mode 100644 index 0000000000..3a11a7b174 --- /dev/null +++ b/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts @@ -0,0 +1,42 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +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/logger"; + +export interface LegacySingleton { + createInstance(): T; + getInstance(): T; + resetInstance(): void; +} + +export function asLegacyGlobalSingletonForExtensionApi(injectable: Injectable): LegacySingleton; +export function asLegacyGlobalSingletonForExtensionApi(injectable: Injectable, param: InstantiationParameter): LegacySingleton; + +export function asLegacyGlobalSingletonForExtensionApi( + injectable: Injectable, + instantiationParameter?: InstantiationParameter, +): LegacySingleton { + const instance = asLegacyGlobalForExtensionApi( + injectable as never, + instantiationParameter, + ) as Instance; + + return { + createInstance: () => instance, + + getInstance: () => instance, + + resetInstance: () => { + const di = getLegacyGlobalDiForExtensionApi(); + const logger = di.inject(loggerInjectable); + + 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 9efb4e33a7..3cf44488a9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import { asLegacyGlobalForExtensionApi } from "@k8slens/legacy-global-di"; // 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 a8c5a59d99..6c34703b54 100644 --- a/packages/core/src/extensions/common-api/k8s-api.ts +++ b/packages/core/src/extensions/common-api/k8s-api.ts @@ -21,7 +21,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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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"; import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token"; @@ -42,7 +42,7 @@ const getKubeApiDeps = (): KubeApiDependencies => { const di = getLegacyGlobalDiForExtensionApi(); return { - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), maybeKubeApi: di.inject(maybeKubeApiInjectable), }; }; @@ -190,7 +190,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 ae13403194..856b665ba6 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 080be26c8d..8e0a1ff36b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 51dbf01162..087e604476 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/ipc/ipc-main.ts b/packages/core/src/extensions/ipc/ipc-main.ts index 4a710eec70..42282af464 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 "@k8slens/logger"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 adbafd50f3..2eab08895b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 e941377347..76a35eae05 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 "@k8slens/legacy-global-di"; import catalogCategoryRegistryInjectable from "../common/catalog/category-registry.injectable"; import catalogEntityRegistryInjectable from "../renderer/api/catalog/entity/registry.injectable"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/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 734adf6d47..983804b591 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 6dea59e6d6..4c10f92cd5 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 6b68a1ac02..4ffad2466d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 046c29dcf5..99024ae62a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 0946a26a37..95466c3973 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { ProgressInfo } from "electron-updater"; import type { ProgressOfDownload } from "../../../common/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 94efea077b..0658ed9269 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 57dd022b3e..0fc75bd949 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 aaeca73c16..e8fde56fd9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 10b99cf9ed..0066621e3b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ae38d5717c..b6e29ccfa3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fffd16f191..c554be5390 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; 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/main/5.0.0-beta.10.injectable.ts b/packages/core/src/features/hotbar/storage/main/5.0.0-beta.10.injectable.ts index bbda5d8e90..c192ec3382 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 055198a0e7..59119147bc 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; 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/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 ca6ace0c6e..3222ccd555 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2d81afb508..3e75bea517 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; 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/shell-sync/main/compute-unix-shell-environment.injectable.ts b/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts index 473b814465..9f42c45937 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 0d1b02471e..a212951635 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/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 834535e8fe..edec9bf8b1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ad193add79..b1e700cc8e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; 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 df98176906..fc380d6239 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/cluster/broadcast-connection-update.injectable.ts b/packages/core/src/main/cluster/broadcast-connection-update.injectable.ts index fd64c72575..0079d2700d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 8b2046a4b1..f8e58ed4c1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 e8e8c34e83..e7089eb06a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 b1471a2f57..bdc8ecf9d5 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2dfa8c79d6..3d8180b7a6 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4cf1cbb303..06a3d48f9b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 292af777f9..c977d6211a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2352a6c2f9..ecb576df3a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 afa6eb459b..cef9ffac26 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 8851417385..0fb7a18e17 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 79f9c4eedb..aace79f4db 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 94a7ae58a7..8090bab6f7 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 a5eca4d0f7..5f6cec3163 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fd5b56674b..7cd9a4c3a9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1b2d173b3c..a684ad8ec0 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 69cc3c259c..94e0887d7c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 67786fd9d8..da7a42d993 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2dd774390c..30239046b3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 73ea50885f..c1bd7295b6 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ef300b4947..03aae06763 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5163ee8b2f..5c77e01a89 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d830a3609a..5367570d99 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1b6eae131c..8fb852f917 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ad8f0b5e75..261fc1b8a2 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 0876e1a356..dcb9dcf6f1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 a432941438..af41f33471 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 dbb250c077..ab19cb1f77 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 015035e505..799db10382 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 f6d73a61b7..f30c3f2717 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 b6f982f3b3..2b7c95ac10 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5339df2448..ec85158de1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 50d2c71641..2fc5e26f63 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d2f2576b36..d01558cfe5 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 9b45529b52..1b9376215a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 0c9780cf7d..bc0071431b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 11b9f11050..daeff5395f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d576100172..ad924cbe72 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1e79912cfd..372dc34aac 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 20a868f223..21bcab2f16 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2980760efa..f1cb530642 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 cb09c1e101..59c6c857b2 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/initialize-extensions.injectable.ts b/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts index 9240193153..93fa9fccec 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 22ea5b8262..25f44c14a8 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 44a9e18dab..d9947a2959 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 c938d66e7a..854230eb73 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/renderer/api/catalog/entity/registry.injectable.ts b/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts index df6d487206..7d4a065b70 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ec103375d7..87f01fb92b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4e0f4bf942..b24cfb6ebf 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 088c01c725..f3e7e4a50b 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 "@k8slens/kube-object"; import { KubeApi } from "../../../common/k8s-api/kube-api"; import { KubeObject } from "@k8slens/kube-object"; import maybeKubeApiInjectable from "../../../common/k8s-api/maybe-kube-api.injectable"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 176e861cd3..5261e39bb9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 769a387274..6739d3541a 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/logger"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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-manager/cluster-frame-handler.injectable.ts b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts index 3a0bd15e20..351d1c2822 100644 --- a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts +++ b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import { ClusterFrameHandler } from "./cluster-frame-handler"; import emitClusterVisibilityInjectable from "./emit-cluster-visibility.injectable"; @@ -13,7 +13,7 @@ const clusterFrameHandlerInjectable = getInjectable({ instantiate: (di) => 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/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 a01a990775..929b24792b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 79c9f724f4..372dce684a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 47e6b2ebf7..ea7ec9ef4e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1341c91340..e0fc7da1e5 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import { MonacoEditor } from "../monaco-editor"; export interface ConfigMapDetailsProps extends KubeObjectDetailsProps { @@ -145,6 +145,6 @@ export const ConfigMapDetails = withInjectables", () => { di.override(selectedNamespacesStorageInjectable, () => ({ get: () => ({}), }) as any); - di.override(loggerInjectable, () => null); + di.override(loggerInjectionToken, () => null); di.override(maybeKubeApiInjectable, () => (() => null) as any); di.override(siblingTabsInjectable, () => ({ get: () => [] } as any)); di.override(userPreferencesStateInjectable, () => ({ diff --git a/packages/core/src/renderer/components/config-pod-disruption-budgets/store.injectable.ts b/packages/core/src/renderer/components/config-pod-disruption-budgets/store.injectable.ts index 7f1e4f9371..860a44a9ba 100644 --- a/packages/core/src/renderer/components/config-pod-disruption-budgets/store.injectable.ts +++ b/packages/core/src/renderer/components/config-pod-disruption-budgets/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 podDisruptionBudgetApiInjectable from "../../../common/k8s-api/endpoints/pod-disruption-budget.api.injectable"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PodDisruptionBudgetStore } from "./store"; @@ -20,7 +20,7 @@ const podDisruptionBudgetStoreInjectable = getInjectable({ return new PodDisruptionBudgetStore({ context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/config-priority-classes/store.injectable.ts b/packages/core/src/renderer/components/config-priority-classes/store.injectable.ts index 7b141d8f7f..c7f06f0d4f 100644 --- a/packages/core/src/renderer/components/config-priority-classes/store.injectable.ts +++ b/packages/core/src/renderer/components/config-priority-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 priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PriorityClassStore } from "./store"; @@ -20,7 +20,7 @@ const priorityClassStoreInjectable = getInjectable({ return new PriorityClassStore({ context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable), - logger: di.inject(loggerInjectable), + logger: di.inject(loggerInjectionToken), }, api); }, injectionToken: kubeObjectStoreInjectionToken, diff --git a/packages/core/src/renderer/components/config-resource-quotas/resource-quota-details.tsx b/packages/core/src/renderer/components/config-resource-quotas/resource-quota-details.tsx index 902eaecdf0..c4b4ecd2f7 100644 --- a/packages/core/src/renderer/components/config-resource-quotas/resource-quota-details.tsx +++ b/packages/core/src/renderer/components/config-resource-quotas/resource-quota-details.tsx @@ -15,7 +15,7 @@ import { LineProgress } from "../line-progress"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; export interface ResourceQuotaDetailsProps extends KubeObjectDetailsProps { } @@ -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 c20e847215..7cee0bf257 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 e11066b7b8..afe686eccb 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 be027ac6b0..f355f5be0b 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 "@k8slens/kube-object"; import type { Logger } from "@k8slens/logger"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import secretStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import type { ShowCheckedErrorNotification } from "../notifications/show-checked-error.injectable"; @@ -174,7 +174,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 8f83f3b068..5fbbda1c95 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5dc6b1640d..bcb89907e6 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5bffd1784c..03962b9bc9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 606fc052d9..5be321960a 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 "@k8slens/kube-object"; import type { PodUpdatePolicy, PodResourcePolicy, VerticalPodAutoscalerStatus } from "@k8slens/kube-object"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -213,6 +213,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 f2c14d2ecd..df12532dfa 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 593838abaf..7d710c9317 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 @@ -16,7 +16,7 @@ import type { AdditionalPrinterColumnsV1, KubeObjectMetadata, KubeObjectStatus } import { CustomResourceDefinition, KubeObject } from "@k8slens/kube-object"; import type { Logger } from "../../../common/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; export interface CustomResourceDetailsProps extends KubeObjectDetailsProps { crd?: CustomResourceDefinition; @@ -141,6 +141,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 24d0d63dd2..c3b0353824 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/dock/create-resource/view.tsx b/packages/core/src/renderer/components/dock/create-resource/view.tsx index d9fcb03c2a..56f05621fb 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 919c54fe3d..5c64a40c59 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 "@k8slens/kube-object"; import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 954c94ee24..4619a6610e 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 881836bdf1..835a917638 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/events/event-details.tsx b/packages/core/src/renderer/components/events/event-details.tsx index fdb21e9418..75a3575dce 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 e07f8ef7fa..73fbb67e4c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1d54d852a8..a726f435eb 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 42a0ef8fda..89305f776f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 de9d56b132..e9d5b1cf1a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 825767d534..c0cc10bb94 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 dc961dd474..93843be5cd 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 28f921bbf3..ad04713106 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 3d2f3e96a1..132e13d46c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/icon/icon.test.tsx b/packages/core/src/renderer/components/icon/icon.test.tsx index a0ac405ced..6ec7db72ed 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/logger"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fecac2bd12..19768ed58e 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2dada4c947..0dd3385be6 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 ce8a17542e..16d6a91c0a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { NamespaceApi } from "../../../common/k8s-api/endpoints"; import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable"; @@ -128,7 +128,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 fa66389f67..0d7321369b 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 1dc4d647e2..60e01ef314 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/logger"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 { } @@ -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 a4b1aa2018..f10d69a015 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 76d4a65711..e9098169cc 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 3b670acfc6..8f480a496a 100644 --- a/packages/core/src/renderer/components/network-ingresses/ingress-details.tsx +++ b/packages/core/src/renderer/components/network-ingresses/ingress-details.tsx @@ -14,7 +14,7 @@ import { Table, TableCell, TableHead, TableRow } from "../table"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; export interface IngressDetailsProps extends KubeObjectDetailsProps { } @@ -137,6 +137,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 b88a5873ac..3e3090b16c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fc515b3dfb..d389dffde9 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 @@ -16,7 +16,7 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { Logger } from "@k8slens/logger"; import { isEmpty } from "lodash"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; export interface NetworkPolicyDetailsProps extends KubeObjectDetailsProps { } @@ -213,6 +213,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 b421fa9bfd..3fcc6c639a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 b1238ecba9..e18f8368f4 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/logger"; import { Endpoints } from "@k8slens/kube-object"; import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 88564c841f..9b1bd67a40 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 a18a6e38a1..df00267eaa 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 76ada5eeca..ec925922c3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/notifications/show-checked-error.injectable.ts b/packages/core/src/renderer/components/notifications/show-checked-error.injectable.ts index 116a647994..4f8f613c5c 100644 --- a/packages/core/src/renderer/components/notifications/show-checked-error.injectable.ts +++ b/packages/core/src/renderer/components/notifications/show-checked-error.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Disposer } from "@k8slens/utilities"; import type { CreateNotificationOptions } from "./notifications.store"; import showErrorNotificationInjectable from "./show-error-notification.injectable"; @@ -15,7 +15,7 @@ const showCheckedErrorNotificationInjectable = getInjectable({ id: "show-checked-error-notififcation", instantiate: (di): ShowCheckedErrorNotification => { 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/pod-security-policies/pod-security-policy-details.tsx b/packages/core/src/renderer/components/pod-security-policies/pod-security-policy-details.tsx index 314b04d5c6..20ca217f50 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 c577c1e773..2afac2f0fc 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/status-bar/status-bar-item-registrator.injectable.tsx b/packages/core/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx index 378240cfc8..48ab713b00 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; 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/components/storage-classes/storage-class-details.tsx b/packages/core/src/renderer/components/storage-classes/storage-class-details.tsx index 6a24dd9835..c6c1450d64 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 907f5c2e35..dc6cc18ba9 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 43eca5cef7..4426bb4246 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 71653016fc..a334e47af1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 b4af40d459..12dcf2f0d1 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 5defdd85d7..45fb55025f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d562dc08ed..3e9db8b9a6 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 "../../../common/logger.injectable"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 fbe1d7a004..94f6ace99d 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 6eca2c8f40..bdf848991c 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 2a2d384f55..7338e577c0 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 accd14674e..1e82342633 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 c9aa214234..b77c4c080f 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 db6e71cf9f..42231ebb56 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; export interface ReplicaSetDetailsProps extends KubeObjectDetailsProps { } @@ -105,6 +105,6 @@ export const ReplicaSetDetails = withInjectables { } @@ -105,7 +105,7 @@ export const StatefulSetDetails = withInjectables 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 ebc5d011f2..51c6252eb3 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens"; import { observableHistoryInjectionToken } from "@k8slens/routing"; @@ -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(observableHistoryInjectionToken); 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 17ff2e0932..812eb091ed 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 938eeead58..4f8edf0d89 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 d07dd889e2..a21e68328a 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 55910cd3c4..9ab1eaa7f0 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 b036462190..af7c393787 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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 4aa4016d63..05730a3a69 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/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; 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/logger/README.md b/packages/logger/README.md index 67925153a4..9dabc5eab7 100644 --- a/packages/logger/README.md +++ b/packages/logger/README.md @@ -11,7 +11,7 @@ $ npm install @k8slens/logger ```typescript import { loggerFeature } from "@k8slens/logger"; import type { Logger } from "@k8slens/logger"; -import { loggerInjectable } from "@k8slens/logger"; +import { loggerInjectionToken } from "@k8slens/logger"; import { winstonLoggerInjectable } from "@k8slens/logger"; import { prefixedLoggerInjectable } from "@k8slens/logger"; ``` diff --git a/packages/logger/index.ts b/packages/logger/index.ts index 952e6ee6dc..cd0718e71e 100644 --- a/packages/logger/index.ts +++ b/packages/logger/index.ts @@ -4,7 +4,7 @@ */ export type { Logger } from "./src/logger"; -export { loggerInjectable } from "./src/logger.injectable"; +export { loggerInjectionToken } from "./src/logger.injectable"; export { prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; export { loggerTransportInjectionToken } from "./src/transports"; export { winstonLoggerInjectable } from "./src/winston-logger.injectable"; diff --git a/packages/logger/src/logger.injectable.ts b/packages/logger/src/logger.injectable.ts index 39828861f7..2406abc518 100644 --- a/packages/logger/src/logger.injectable.ts +++ b/packages/logger/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-injection-token", +}); + export const loggerInjectable = getInjectable({ id: "logger", instantiate: (di): Logger => { diff --git a/packages/logger/src/prefixed-logger.injectable.ts b/packages/logger/src/prefixed-logger.injectable.ts index d0fe2e090b..de43ca2b1e 100644 --- a/packages/logger/src/prefixed-logger.injectable.ts +++ b/packages/logger/src/prefixed-logger.injectable.ts @@ -4,12 +4,12 @@ */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; -import { loggerInjectable } from "./logger.injectable"; +import { loggerInjectionToken } from "./logger.injectable"; export const prefixedLoggerInjectable = getInjectable({ id: "prefixed-logger", instantiate: (di, prefix): Logger => { - const logger = di.inject(loggerInjectable); + const logger = di.inject(loggerInjectionToken); return { debug: (message, ...args) => {