diff --git a/package-lock.json b/package-lock.json index fc536af026..5420946096 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3943,6 +3943,10 @@ "resolved": "packages/list-layout", "link": true }, + "node_modules/@k8slens/logging": { + "resolved": "packages/logging", + "link": true + }, "node_modules/@k8slens/messaging": { "resolved": "packages/technical-features/messaging/agnostic", "link": true @@ -36686,6 +36690,26 @@ "react": "^17.0.2" } }, + "packages/logging": { + "name": "@k8slens/logging", + "version": "1.0.0-alpha.1", + "license": "MIT", + "devDependencies": { + "@k8slens/eslint-config": "^6.5.0-alpha.2", + "@k8slens/jest": "^6.5.0-alpha.4", + "@k8slens/typescript": "^6.5.0-alpha.2" + }, + "peerDependencies": { + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", + "@k8slens/test-utils": "^1.0.0-alpha.0", + "@k8slens/utilities": "^1.0.0-alpha.0", + "@ogre-tools/injectable": "^15.1.2", + "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0", + "react": "^17.0.2", + "winston": "^3.8.2" + } + }, "packages/metrics": { "name": "@k8slens/metrics", "version": "6.5.0-alpha.4", 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 59d30dbe77..e41ea819c4 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; /** * Requests the permissions for actions on the kube cluster 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 b3e8875dc1..eb5bf15e2e 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { KubeApiResource } from "../rbac"; export type CanListResource = (resource: KubeApiResource) => boolean; diff --git a/packages/core/src/common/ipc/ipc.ts b/packages/core/src/common/ipc/ipc.ts index afc451761e..192095be94 100644 --- a/packages/core/src/common/ipc/ipc.ts +++ b/packages/core/src/common/ipc/ipc.ts @@ -12,7 +12,7 @@ import { toJS } from "../utils/toJS"; import type { Disposer } from "@k8slens/utilities"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; -import loggerInjectable from "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import ipcMainInjectionToken from "./ipc-main-injection-token"; import clusterFramesInjectable from "../cluster-frames.injectable"; 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 0490f446fe..88236d5bb2 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { ApiManager } from "../api-manager"; import apiManagerInjectable from "../api-manager/manager.injectable"; import { KubeApi } from "../kube-api"; 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 e6efa606b9..e96569b9ef 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts @@ -20,7 +20,7 @@ import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kub import apiManagerInjectable from "../api-manager/manager.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import ingressApiInjectable from "../endpoints/ingress.api.injectable"; -import loggerInjectable from "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { Cluster } from "../../cluster/cluster"; 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 fbf46e2b42..16bc745eb7 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { KubeApi } from "../kube-api"; import type { KubeObject } from "../kube-object"; import type { KubeObjectStoreDependencies } from "../kube-object.store"; 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 be5b49246d..0a0bc66341 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { JsonApiConfig, JsonApiData, JsonApiDependencies, JsonApiParams } from "./json-api"; import { JsonApi } from "./json-api"; @@ -28,7 +28,7 @@ const createJsonApiInjectable = getInjectable({ const agent = new Agent({ ca: lensProxyCert.get().cert, }); - + return { agent, }; 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 dc3a3fef69..7b25b1815d 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { apiKubePrefix } from "../vars"; import isDevelopmentInjectable from "../vars/is-development.injectable"; import apiBaseInjectable from "./api-base.injectable"; 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 bd7d2b1630..3728499d7d 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import isDevelopmentInjectable from "../vars/is-development.injectable"; import createKubeJsonApiInjectable from "./create-kube-json-api.injectable"; import type { KubeApiOptions } from "./kube-api"; 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 cce470b132..01e67677b7 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { DerivedKubeApiOptions, KubeApiDependencies } from "./kube-api"; import maybeKubeApiInjectable from "./maybe-kube-api.injectable"; 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 eb0a72cc5f..4945207b50 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { JsonApiConfig, JsonApiDependencies } from "./json-api"; import { KubeJsonApi } from "./kube-json-api"; @@ -28,13 +28,13 @@ const createKubeJsonApiInjectable = getInjectable({ const agent = new Agent({ ca: lensProxyCert.get().cert, }); - + return { agent, }; }; } - + return new KubeJsonApi(dependencies, config, reqInit); }; }, 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 4965a86edc..1c79c1cd59 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterRoleBindingApiInjectable = getInjectable({ 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 b22e198d1e..6b70108aff 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterRoleApiInjectable = getInjectable({ 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 494ef9d94b..d075ea878e 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const clusterApiInjectable = getInjectable({ 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 01bb16e6b4..d8f4ec935d 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const componentStatusApiInjectable = getInjectable({ id: "component-status-api", 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 e41cc23111..281787f113 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const configMapApiInjectable = getInjectable({ 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 2831a726aa..5532cc67d5 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const cronJobApiInjectable = getInjectable({ 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 cf8a6560a0..b80bf83d7d 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const customResourceDefinitionApiInjectable = getInjectable({ id: "custom-resource-definition-api", 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 8a904519b6..857dc73360 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const daemonSetApiInjectable = getInjectable({ 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 47236b1a6f..3495898020 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const deploymentApiInjectable = getInjectable({ 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 6288dc2448..a30da804a5 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const endpointsApiInjectable = getInjectable({ 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 a64afb877e..ecb040b6ba 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const kubeEventApiInjectable = getInjectable({ 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 d891e45e0f..4ec0c9b7fe 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const horizontalPodAutoscalerApiInjectable = getInjectable({ 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 d7d9bf32b9..be56ae68a7 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,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { IngressClassApi } from "./ingress-class.api"; import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; -import loggerInjectable from "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const ingressClassApiInjectable = getInjectable({ 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 ec25b199b0..ee70c08969 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const ingressApiInjectable = getInjectable({ 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 923b96a2eb..40e0786924 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const jobApiInjectable = getInjectable({ 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 f5d8e73b55..014e2fc9a1 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const leaseApiInjectable = getInjectable({ 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 7f50e2df92..8752debb05 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const limitRangeApiInjectable = getInjectable({ 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 c307f9ddf1..42b1603d72 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { MutatingWebhookConfigurationApi } from "./mutating-webhook-configuration.api"; 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 fe722433c1..3a1e93e0a4 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const namespaceApiInjectable = getInjectable({ 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 66c6a95732..2a0ad3c923 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const networkPolicyApiInjectable = getInjectable({ 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 b780d69ee7..2cbf959349 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const nodeApiInjectable = getInjectable({ 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 5d21ba9587..3f0127f2e7 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const persistentVolumeClaimApiInjectable = getInjectable({ 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 cde587942c..edbcd8753c 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const persistentVolumeApiInjectable = getInjectable({ 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 68d830ee69..0113d660ab 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podDisruptionBudgetApiInjectable = getInjectable({ 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 ddd2b109ef..e671119599 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podMetricsApiInjectable = getInjectable({ 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 c62b568e87..36537b40b0 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podSecurityPolicyApiInjectable = getInjectable({ 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 f2c1635b14..966e5202cd 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const podApiInjectable = getInjectable({ 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 e21a85a290..5b65a68c01 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const priorityClassApiInjectable = getInjectable({ 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 c6c75d8192..2dcadedd8c 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const replicaSetApiInjectable = getInjectable({ 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 6d65f446b5..ae53717793 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { ReplicationControllerApi } from "./replication-controller.api"; 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 a82fa3abd9..5ac6caed4c 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const resourceQuotaApiInjectable = getInjectable({ 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 489b20401a..3d55e8d55f 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const roleBindingApiInjectable = getInjectable({ 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 d91d6a1fb8..4f892b113f 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const roleApiInjectable = getInjectable({ 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 3fbeab9a09..9f34037e01 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const runtimeClassApiInjectable = getInjectable({ 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 c4173987da..9feb63be68 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const secretApiInjectable = getInjectable({ 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 8034b9d47f..ea625ca84c 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const selfSubjectRulesReviewApiInjectable = getInjectable({ 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 70a477ac54..f4635617a7 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const serviceAccountApiInjectable = getInjectable({ 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 78a0f744de..70f0bacba6 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const serviceApiInjectable = getInjectable({ 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 1dd58fde3c..561ffbecd1 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const statefulSetApiInjectable = getInjectable({ 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 e65247aa8d..495a4c0d67 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const storageClassApiInjectable = getInjectable({ 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 a1d6e40417..1c2fd704ef 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { ValidatingWebhookConfigurationApi } from "./validating-webhook-configuration.api"; 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 84dcb1899a..82a73cbdb7 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 "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; const verticalPodAutoscalerApiInjectable = getInjectable({ diff --git a/packages/core/src/common/k8s-api/json-api.ts b/packages/core/src/common/k8s-api/json-api.ts index ad29cfae4c..37e2c5e0dd 100644 --- a/packages/core/src/common/k8s-api/json-api.ts +++ b/packages/core/src/common/k8s-api/json-api.ts @@ -13,7 +13,7 @@ import { stringify } from "querystring"; import type { Patch } from "rfc6902"; import type { PartialDeep, ValueOf } from "type-fest"; import { EventEmitter } from "../../common/event-emitter"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { Fetch } from "../fetch/fetch.injectable"; import type { Defaulted } from "@k8slens/utilities"; import { isObject, isString, json } from "@k8slens/utilities"; diff --git a/packages/core/src/common/k8s-api/kube-api.ts b/packages/core/src/common/k8s-api/kube-api.ts index 4bdbd02e45..9d342791f3 100644 --- a/packages/core/src/common/k8s-api/kube-api.ts +++ b/packages/core/src/common/k8s-api/kube-api.ts @@ -19,7 +19,7 @@ import type { RequestInit, Response } from "@k8slens/node-fetch"; import type { Patch } from "rfc6902"; import assert from "assert"; import type { PartialDeep } from "type-fest"; -import type { Logger } from "../logger"; +import type { Logger } from "@k8slens/logging"; import { matches } from "lodash/fp"; import { makeObservable, observable } from "mobx"; diff --git a/packages/core/src/common/k8s-api/kube-object.store.ts b/packages/core/src/common/k8s-api/kube-object.store.ts index 9efaca4dee..9ccbb6d6c4 100644 --- a/packages/core/src/common/k8s-api/kube-object.store.ts +++ b/packages/core/src/common/k8s-api/kube-object.store.ts @@ -14,7 +14,7 @@ import type { KubeApiQueryParams, KubeApi, KubeApiWatchCallback } from "./kube-a import { parseKubeApi } from "./kube-api-parse"; import type { RequestInit } from "@k8slens/node-fetch"; import type { Patch } from "rfc6902"; -import type { Logger } from "../logger"; +import type { Logger } from "@k8slens/logging"; import assert from "assert"; import type { PartialDeep } from "type-fest"; import type { ClusterContext } from "../../renderer/cluster-frame-context/cluster-frame-context"; 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 083d240b3a..2c4b142042 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import joinPathsInjectable from "../path/join-paths.injectable"; import type { ResourceApplyingStack, ResourceStackDependencies } from "./resource-stack"; import { ResourceStack } from "./resource-stack"; diff --git a/packages/core/src/common/k8s/resource-stack.ts b/packages/core/src/common/k8s/resource-stack.ts index 75460423d1..f9d9fb476d 100644 --- a/packages/core/src/common/k8s/resource-stack.ts +++ b/packages/core/src/common/k8s/resource-stack.ts @@ -8,7 +8,7 @@ import yaml from "js-yaml"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import productNameInjectable from "../vars/product-name.injectable"; import type { AsyncResult } from "@k8slens/utilities"; -import type { Logger } from "../logger"; +import type { Logger } from "@k8slens/logging"; import type { KubectlApplyAll, KubectlDeleteAll } from "../kube-helpers/channels"; import type { ReadDirectory } from "../fs/read-directory.injectable"; import type { JoinPaths } from "../path/join-paths.injectable"; diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/common/persistent-storage/create.injectable.ts index da54076a5a..bf265e4388 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getBasenameOfPathInjectable from "../path/get-basename.injectable"; import { enlistMessageChannelListenerInjectionToken, sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import type { MessageChannel } from "@k8slens/messaging"; diff --git a/packages/core/src/common/persistent-storage/migrations.injectable.ts b/packages/core/src/common/persistent-storage/migrations.injectable.ts index e4bd43d1de..acd3314482 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 "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { getOrInsert, iter, object } from "@k8slens/utilities"; export type AllowedSetValue = T extends (...args: any[]) => any diff --git a/packages/core/src/common/protocol-handler/router.ts b/packages/core/src/common/protocol-handler/router.ts index 33bc911f69..2ad42901ef 100644 --- a/packages/core/src/common/protocol-handler/router.ts +++ b/packages/core/src/common/protocol-handler/router.ts @@ -15,7 +15,7 @@ import type { LensExtension } from "../../extensions/lens-extension"; import type { RouteHandler, RouteParams } from "./registration"; import { when } from "mobx"; import { ipcRenderer } from "electron"; -import type { Logger } from "../logger"; +import type { Logger } from "@k8slens/logging"; import type { IsExtensionEnabled } from "../../features/extensions/enabled/common/is-enabled.injectable"; // IPC channel for protocol actions. Main broadcasts the open-url events to this channel. diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts index 37bf7220c7..d700c55729 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import logErrorInjectable from "../../log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; export type WithErrorLoggingFor = ( getErrorMessage: (error: unknown) => string diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts index 9cc5899ce6..1badbc594e 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts @@ -9,7 +9,7 @@ import { pipeline } from "@ogre-tools/fp"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getPromiseStatus } from "@k8slens/test-utils"; -import logErrorInjectable from "../../log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("with-error-logging", () => { describe("given decorated sync function", () => { diff --git a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts index a138c152e7..dbbe9408b4 100644 --- a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts +++ b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts @@ -6,7 +6,7 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting"; import withOrphanPromiseInjectable from "./with-orphan-promise.injectable"; -import logErrorInjectable from "../../log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("with orphan promise, when called", () => { let toBeDecorated: AsyncFnMock<(arg1: string, arg2: string) => Promise>; diff --git a/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts b/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts index f9016f045b..c5f951e2f9 100644 --- a/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts +++ b/packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts @@ -5,7 +5,7 @@ import type { Injectable } from "@ogre-tools/injectable"; import { asLegacyGlobalForExtensionApi } from "./as-legacy-global-object-for-extension-api"; import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface LegacySingleton { createInstance(): T; diff --git a/packages/core/src/extensions/common-api/index.ts b/packages/core/src/extensions/common-api/index.ts index 83b6ae28b6..86c5090594 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; // APIs @@ -15,7 +15,7 @@ export * as Catalog from "./catalog"; export * as Types from "./types"; export * as Proxy from "./proxy"; -export type { Logger } from "../../common/logger"; +export type { Logger } from "@k8slens/logging"; export type { LensExtension } from "../lens-extension"; export type { PackageJson } from "type-fest"; export type { LensExtensionManifest, InstalledExtension } from "@k8slens/legacy-extensions"; diff --git a/packages/core/src/extensions/common-api/k8s-api.ts b/packages/core/src/extensions/common-api/k8s-api.ts index dfb96860c0..a5dbd73d81 100644 --- a/packages/core/src/extensions/common-api/k8s-api.ts +++ b/packages/core/src/extensions/common-api/k8s-api.ts @@ -22,7 +22,7 @@ import type { DerivedKubeApiOptions, KubeApiDependencies, KubeApiOptions } from import { KubeApi as InternalKubeApi } from "../../common/k8s-api/kube-api"; import clusterFrameContextForNamespacedResourcesInjectable from "../../renderer/cluster-frame-context/for-namespaced-resources.injectable"; import type { ClusterContext } from "../../renderer/cluster-frame-context/cluster-frame-context"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import maybeKubeApiInjectable from "../../common/k8s-api/maybe-kube-api.injectable"; import { DeploymentApi as InternalDeploymentApi, IngressApi as InternalIngressApi, NodeApi, PersistentVolumeClaimApi, PodApi } from "../../common/k8s-api/endpoints"; 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 92b1c8cf77..64029eef23 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import watchInjectable from "../../common/fs/watch/watch.injectable"; import accessPathInjectable from "../../common/fs/access-path.injectable"; diff --git a/packages/core/src/extensions/extension-discovery/extension-discovery.ts b/packages/core/src/extensions/extension-discovery/extension-discovery.ts index 107a61f886..731acf1d59 100644 --- a/packages/core/src/extensions/extension-discovery/extension-discovery.ts +++ b/packages/core/src/extensions/extension-discovery/extension-discovery.ts @@ -15,7 +15,7 @@ import type { ExtensionInstallationStateStore } from "../extension-installation- import { extensionDiscoveryStateChannel } from "../../common/ipc/extension-handling"; import { requestInitialExtensionDiscovery } from "../../renderer/ipc"; import type { ReadJson } from "../../common/fs/read-json-file.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { PathExists } from "../../common/fs/path-exists.injectable"; import type { Watch, Watcher } from "../../common/fs/watch/watch.injectable"; import type { Stats } from "fs"; 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 e7ad2285bc..f1ed75a48f 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,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { ExtensionInstallationStateStore } from "./extension-installation-state-store"; const extensionInstallationStateStoreInjectable = getInjectable({ diff --git a/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.ts b/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.ts index 8553ce9c40..e42835c3c0 100644 --- a/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.ts +++ b/packages/core/src/extensions/extension-installation-state-store/extension-installation-state-store.ts @@ -9,7 +9,7 @@ import type { ExtendableDisposer } from "@k8slens/utilities"; import * as uuid from "uuid"; import { broadcastMessage } from "../../common/ipc"; import { ipcRenderer } from "electron"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; export enum ExtensionInstallationState { INSTALLING = "installing", 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 9a77273a30..4daa398d29 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import { bundledExtensionInjectionToken } from "@k8slens/legacy-extensions"; diff --git a/packages/core/src/extensions/extension-loader/extension-loader.ts b/packages/core/src/extensions/extension-loader/extension-loader.ts index c81d071714..8245d42ccb 100644 --- a/packages/core/src/extensions/extension-loader/extension-loader.ts +++ b/packages/core/src/extensions/extension-loader/extension-loader.ts @@ -16,7 +16,7 @@ import { requestExtensionLoaderInitialState } from "../../renderer/ipc"; import assert from "assert"; import { EventEmitter } from "../../common/event-emitter"; import type { Extension } from "./extension/extension.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"; import type { UpdateExtensionsState } from "../../features/extensions/enabled/common/update-state.injectable"; diff --git a/packages/core/src/extensions/install-extension/install-extension.injectable.ts b/packages/core/src/extensions/install-extension/install-extension.injectable.ts index 6737b7362b..ea4a5c66dd 100644 --- a/packages/core/src/extensions/install-extension/install-extension.injectable.ts +++ b/packages/core/src/extensions/install-extension/install-extension.injectable.ts @@ -7,7 +7,7 @@ import { fork } from "child_process"; import AwaitLock from "await-lock"; import pathToNpmCliInjectable from "../../common/app-paths/path-to-npm-cli.injectable"; import extensionPackageRootDirectoryInjectable from "./extension-package-root-directory.injectable"; -import prefixedLoggerInjectable from "../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import type { PackageJson } from "../common-api"; diff --git a/packages/core/src/extensions/ipc/ipc-main.ts b/packages/core/src/extensions/ipc/ipc-main.ts index 20190d8774..16ebebb1e8 100644 --- a/packages/core/src/extensions/ipc/ipc-main.ts +++ b/packages/core/src/extensions/ipc/ipc-main.ts @@ -11,7 +11,7 @@ import { once } from "lodash"; import { ipcMainHandle } from "../../common/ipc"; import type { Logger } from "../common-api"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; interface Dependencies { readonly logger: Logger; diff --git a/packages/core/src/extensions/lens-main-extension.ts b/packages/core/src/extensions/lens-main-extension.ts index 69d3594fa7..19a0389932 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 "../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import navigateForExtensionInjectable from "../main/start-main-application/lens-window/navigate-for-extension.injectable"; import ensureHashedDirectoryForExtensionInjectable from "./extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable"; diff --git a/packages/core/src/extensions/lens-renderer-extension.ts b/packages/core/src/extensions/lens-renderer-extension.ts index c4cdcb3468..76f6eb810b 100644 --- a/packages/core/src/extensions/lens-renderer-extension.ts +++ b/packages/core/src/extensions/lens-renderer-extension.ts @@ -39,7 +39,7 @@ import type { InstalledExtension } from "./common-api"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "./as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import catalogCategoryRegistryInjectable from "../common/catalog/category-registry.injectable"; import catalogEntityRegistryInjectable from "../renderer/api/catalog/entity/registry.injectable"; -import loggerInjectable from "../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getExtensionPageParametersInjectable from "../renderer/routes/get-extension-page-parameters.injectable"; import navigateToRouteInjectable from "../renderer/routes/navigate-to-route.injectable"; import routesInjectable from "../renderer/routes/routes.injectable"; diff --git a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts index 569ea9102f..b8477e0f15 100644 --- a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts +++ b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts @@ -9,7 +9,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; -import logErrorInjectable from "../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("application-menu-in-legacy-extension-api", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts index b567f99a7d..4e5c9bf282 100644 --- a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts +++ b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts @@ -10,7 +10,7 @@ import { getCompositePaths } from "../../common/utils/composite/get-composite-pa import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; import { runInAction } from "mobx"; -import logErrorInjectable from "../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("handling-of-orphan-application-menu-items, given orphan menu item", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts index b9012fb67b..319b5ffcd7 100644 --- a/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts +++ b/packages/core/src/features/application-menu/main/application-menu-item-composite.injectable.ts @@ -12,7 +12,7 @@ import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-ite import type { RootComposite } from "../../../common/utils/composite/interfaces"; import type { Discriminable } from "../../../common/utils/composable-responsibilities/discriminable/discriminable"; import { orderByOrderNumber } from "../../../common/utils/composable-responsibilities/orderable/orderable"; -import logErrorInjectable from "../../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable"; export type MenuItemRoot = Discriminable<"root"> & RootComposite<"root">; diff --git a/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts b/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts index a4f5c79639..e7a682ae3a 100644 --- a/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts +++ b/packages/core/src/features/application-menu/main/application-menu-item-registrator.injectable.ts @@ -15,7 +15,7 @@ import type { } from "./menu-items/application-menu-item-injection-token"; import applicationMenuItemInjectionToken from "./menu-items/application-menu-item-injection-token"; import type { MenuRegistration } from "./menu-registration"; -import logErrorInjectable from "../../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; const applicationMenuItemRegistratorInjectable = getInjectable({ id: "application-menu-item-registrator", 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 ca63120810..2111d2ceda 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,7 +6,7 @@ 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 "../../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const openDocumentationMenuItemInjectable = getInjectable({ id: "open-documentation-menu-item", 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 7a1db63078..805b8b6fb8 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,7 +6,7 @@ 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 "../../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const openSupportItemInjectable = getInjectable({ id: "open-support-menu-item", 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 22726467a9..d8cc3ffea5 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 "../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { UpdateCheckResult } from "electron-updater"; export type CheckForUpdatesResult = { 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 5a4262baf1..5996e16123 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 "../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { noop } from "@k8slens/utilities"; describe("check-for-platform-updates", () => { 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 14c4d2b075..2948f8fe64 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 "../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { ProgressInfo } from "electron-updater"; import type { ProgressOfDownload } from "../../../common/progress-of-update-download/progress-of-update-download.injectable"; 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 d39931e6ac..eb2bd1c149 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 "../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { noop } from "@k8slens/utilities"; describe("download-platform-update", () => { 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 9a798123e7..8fd40ee3a4 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; import { platformSpecificRequestSystemCAsInjectionToken } from "../common/request-system-cas-token"; 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 2c4cc6f906..dedd25381c 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { platformSpecificRequestSystemCAsInjectionToken } from "../common/request-system-cas-token"; const pemEncoding = (hexEncodedCert: String) => { 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 eb11d4b4e4..f12ffbd4a3 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable"; import storeMigrationVersionInjectable from "../../../../common/vars/store-migration-version.injectable"; 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 325f3e305d..908faf21e0 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 "../../../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const publicHelmReposUrl = "https://github.com/lensapp/artifact-hub-repositories/releases/download/latest/repositories.json"; 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 c11cd2e43f..a9628e7416 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,8 +12,8 @@ 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 "../../common/logger.injectable"; -import type { Logger } from "../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; import requestPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; import { noop } from "@k8slens/utilities"; diff --git a/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts b/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts index 8d35af255b..75a2cb88b4 100644 --- a/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts +++ b/packages/core/src/features/hotbar/storage/common/create-hotbar.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { CreateHotbarData } from "./types"; -import prefixedLoggerInjectable from "../../../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; import type { HotbarDependencies } from "./hotbar"; import { Hotbar } from "./hotbar"; diff --git a/packages/core/src/features/hotbar/storage/common/hotbar.ts b/packages/core/src/features/hotbar/storage/common/hotbar.ts index efb2e60579..b954fba322 100644 --- a/packages/core/src/features/hotbar/storage/common/hotbar.ts +++ b/packages/core/src/features/hotbar/storage/common/hotbar.ts @@ -11,7 +11,7 @@ import { defaultHotbarCells } from "./types"; import { broadcastMessage } from "../../../../common/ipc"; import { hotbarTooManyItemsChannel } from "../../../../common/ipc/hotbar"; import * as uuid from "uuid"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { tuple } from "@k8slens/utilities"; export interface HotbarDependencies { 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 a777a81b6a..24c3667fe7 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { generateNewIdFor } from "../../../../common/utils/generate-new-id-for"; import type { ClusterModel } from "../../../../common/cluster-types"; import { defaultHotbarCells } from "../common/types"; 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 54e6875c0a..6c6bd30d12 100644 --- a/packages/core/src/features/hotbar/storage/storage-technical.test.ts +++ b/packages/core/src/features/hotbar/storage/storage-technical.test.ts @@ -12,8 +12,8 @@ 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 "../../../common/logger.injectable"; -import type { Logger } from "../../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable"; import writeJsonSyncInjectable from "../../../common/fs/write-json-sync.injectable"; diff --git a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts index 6309eba979..8657b72577 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { DiContainer } from "@ogre-tools/injectable"; -import winstonLoggerInjectable from "../../common/winston-logger.injectable"; +import { winstonLoggerInjectable } from "@k8slens/logging"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type winston from "winston"; diff --git a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts index 6d7039e099..3a33c4160d 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts @@ -6,7 +6,7 @@ import type winston from "winston"; import type { SendMessageToChannel } from "@k8slens/messaging"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import type { DiContainer } from "@ogre-tools/injectable"; -import winstonLoggerInjectable from "../../../common/winston-logger.injectable"; +import { winstonLoggerInjectable } from "@k8slens/logging"; import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; diff --git a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts index a4f934164c..15fce473b8 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts @@ -4,7 +4,7 @@ */ import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { getInjectable } from "@ogre-tools/injectable"; -import winstonLoggerInjectable from "../../../common/winston-logger.injectable"; +import { winstonLoggerInjectable } from "@k8slens/logging"; import { closeIpcFileLoggerChannel } from "../common/ipc-file-logger-channel"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; diff --git a/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts index 0145882e74..8dd5419ec6 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.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 { loggerTransportInjectionToken } from "../../../common/logger/transports"; +import { loggerTransportInjectionToken } from "@k8slens/logging"; import type winston from "winston"; import { MESSAGE } from "triple-beam"; diff --git a/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx b/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx index e7a04a4b04..750ffbd64e 100644 --- a/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx +++ b/packages/core/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx @@ -10,7 +10,7 @@ import "@testing-library/jest-dom/extend-expect"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import type { Discover } from "@k8slens/react-testing-library-discovery"; import { discoverFor } from "@k8slens/react-testing-library-discovery"; -import logErrorInjectable from "../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("preferences - navigation to extension specific preferences", () => { let builder: ApplicationBuilder; 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 80733108fe..cbdebee0b0 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 "../../../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface SyncKind { type: "file" | "folder" | "unknown"; 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 510fbd0115..fabb142ce4 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,8 +13,8 @@ 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 "../../../../../../common/logger.injectable"; -import type { Logger } from "../../../../../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; import type { DiscoverAllKubeconfigSyncKinds } from "./discover-all-sync-kinds.injectable"; import type { DiscoverKubeconfigSyncKind, SyncKind } from "./discover-sync-kind.injectable"; import discoverKubeconfigSyncKindInjectable from "./discover-sync-kind.injectable"; diff --git a/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts index dd1ffd1ed8..1bbf520fa7 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts +++ b/packages/core/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts @@ -10,7 +10,7 @@ import { preferenceItemInjectionToken } from "./preference-item-injection-token" import { pipeline } from "@ogre-tools/fp"; import type { PreferenceTabsRoot } from "./preference-tab-root"; import { preferenceTabsRoot } from "./preference-tab-root"; -import logErrorInjectable from "../../../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; import { isShown } from "../../../../common/utils/composable-responsibilities/showable/showable"; import { orderByOrderNumber } from "../../../../common/utils/composable-responsibilities/orderable/orderable"; import { getCompositeFor } from "../../../../common/utils/composite/get-composite/get-composite"; 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 7fd78f9f56..99406d7dbb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import processExecPathInjectable from "./execPath.injectable"; import processEnvInjectable from "./env.injectable"; import { object } from "@k8slens/utilities"; 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 f7a8b65974..adafde9620 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import electronAppInjectable from "../../../main/electron-app/electron-app.injectable"; diff --git a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts index 2840c2a9fa..17610402fe 100644 --- a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts +++ b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts @@ -8,7 +8,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting"; import telemetryWhiteListForParameterlessFunctionsInjectable from "./renderer/telemetry-white-list-for-parameterless-functions.injectable"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; -import logErrorInjectable from "../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; import telemetryDecoratorInjectable from "./renderer/telemetry-decorator.injectable"; describe("emit-telemetry-from-specific-function-calls", () => { diff --git a/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts b/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts index e8c7b71f08..b2267e923b 100644 --- a/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts +++ b/packages/core/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts @@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import getRandomIdInjectable from "../../common/utils/get-random-id.injectable"; -import logErrorInjectable from "../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; describe("clicking tray menu item originating from extension", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/user-preferences/common/storage.injectable.ts b/packages/core/src/features/user-preferences/common/storage.injectable.ts index d736c28677..3b21525db3 100644 --- a/packages/core/src/features/user-preferences/common/storage.injectable.ts +++ b/packages/core/src/features/user-preferences/common/storage.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { action } from "mobx"; -import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; import createPersistentStorageInjectable from "../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../common/persistent-storage/migrations.injectable"; import { userPreferencesMigrationInjectionToken } from "./migrations-token"; 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 d7baa496b0..54d78d3d52 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; import type { ClusterStoreModel } from "../../../features/cluster/storage/common/storage.injectable"; import type { UserPreferencesModel, KubeconfigSyncEntry } from "../common/preferences-helpers"; diff --git a/packages/core/src/main/__test__/kubeconfig-manager.test.ts b/packages/core/src/main/__test__/kubeconfig-manager.test.ts index fb9b329b69..4b9534e7b1 100644 --- a/packages/core/src/main/__test__/kubeconfig-manager.test.ts +++ b/packages/core/src/main/__test__/kubeconfig-manager.test.ts @@ -8,8 +8,8 @@ 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 "../../common/logger.injectable"; -import type { Logger } from "../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable"; 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 7869bbd6c5..9f53bc7704 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,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { persistStateToConfigInjectionToken } from "../../common/persistent-storage/save-to-file"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const persistStateToConfigInjectable = getInjectable({ id: "persist-state-to-config", diff --git a/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts b/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts index 4705da78d2..a7a1745d16 100644 --- a/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts +++ b/packages/core/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; const kubeconfigSyncLoggerInjectable = getInjectable({ id: "kubeconfig-sync-logger", diff --git a/packages/core/src/main/catalog-sources/kubeconfig-sync/manager.ts b/packages/core/src/main/catalog-sources/kubeconfig-sync/manager.ts index cecf52e4c1..b106915b57 100644 --- a/packages/core/src/main/catalog-sources/kubeconfig-sync/manager.ts +++ b/packages/core/src/main/catalog-sources/kubeconfig-sync/manager.ts @@ -8,7 +8,7 @@ import { action, observable, computed, makeObservable, observe } from "mobx"; import type { CatalogEntity } from "../../../common/catalog"; import type { Disposer } from "@k8slens/utilities"; import { iter } from "@k8slens/utilities"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { WatchKubeconfigFileChanges } from "./watch-file-changes.injectable"; import type { KubeconfigSyncValue } from "../../../features/user-preferences/common/preferences-helpers"; 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 51e18f0bfd..223b695683 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export type BroadcastConnectionUpdate = (update: KubeAuthUpdate) => void; diff --git a/packages/core/src/main/cluster/cluster-connection.injectable.ts b/packages/core/src/main/cluster/cluster-connection.injectable.ts index 3f40898fc7..4d911892ee 100644 --- a/packages/core/src/main/cluster/cluster-connection.injectable.ts +++ b/packages/core/src/main/cluster/cluster-connection.injectable.ts @@ -9,7 +9,7 @@ import { ClusterStatus } from "../../common/cluster-types"; import type { CreateListNamespaces } from "../../common/cluster/list-namespaces.injectable"; import type { BroadcastMessage } from "../../common/ipc/broadcast-message.injectable"; import { clusterListNamespaceForbiddenChannel } from "../../common/ipc/cluster"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { KubeApiResource } from "../../common/rbac"; import { formatKubeApiResource } from "../../common/rbac"; import { disposer, isDefined, isRequestError, withConcurrencyLimit } from "@k8slens/utilities"; @@ -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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import prometheusHandlerInjectable from "./prometheus-handler/prometheus-handler.injectable"; import removeProxyKubeconfigInjectable from "./remove-proxy-kubeconfig.injectable"; import requestApiResourcesInjectable from "./request-api-resources.injectable"; diff --git a/packages/core/src/main/cluster/manager.injectable.ts b/packages/core/src/main/cluster/manager.injectable.ts index 21530dfe4d..5dbd7239c3 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import addClusterInjectable from "../../features/cluster/storage/common/add.injectable"; import clustersInjectable from "../../features/cluster/storage/common/clusters.injectable"; import getClusterByIdInjectable from "../../features/cluster/storage/common/get-by-id.injectable"; diff --git a/packages/core/src/main/cluster/manager.ts b/packages/core/src/main/cluster/manager.ts index f52050ffa4..4802b84e45 100644 --- a/packages/core/src/main/cluster/manager.ts +++ b/packages/core/src/main/cluster/manager.ts @@ -12,7 +12,7 @@ import { ipcMainOn } from "../../common/ipc"; import { once } from "lodash"; import type { ClusterId } from "../../common/cluster-types"; import type { CatalogEntityRegistry } from "../catalog"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { UpdateEntityMetadata } from "./update-entity-metadata.injectable"; import type { UpdateEntitySpec } from "./update-entity-spec.injectable"; import type { ClusterConnection } from "./cluster-connection.injectable"; 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 bf022b87f9..6586c77e42 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import loadProxyKubeconfigInjectable from "../load-proxy-kubeconfig.injectable"; const prometheusHandlerInjectable = getInjectable({ diff --git a/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.ts b/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.ts index ddf5cc461a..b80171698f 100644 --- a/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.ts +++ b/packages/core/src/main/cluster/prometheus-handler/prometheus-handler.ts @@ -9,7 +9,7 @@ import type { Cluster } from "../../../common/cluster/cluster"; import { CoreV1Api } from "@kubernetes/client-node"; import type { GetPrometheusProviderByKind } from "../../prometheus/get-by-kind.injectable"; import type { IComputedValue } from "mobx"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { LoadProxyKubeconfig } from "../load-proxy-kubeconfig.injectable"; export interface PrometheusDetails { 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 14776bb93a..41e6705056 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { KubeApiResource } from "../../common/rbac"; import type { Cluster } from "../../common/cluster/cluster"; import { apiVersionsRequesterInjectionToken } from "./api-versions-requester"; 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 5f43359d8d..2ceed91ebb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import writeFileSyncInjectable from "../../../common/fs/write-file-sync.injectable"; const v360Beta1ClusterStoreMigrationInjectable = getInjectable({ 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 6c33cfa2c4..9d24db235e 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token"; import { generateNewIdFor } from "../../../common/utils/generate-new-id-for"; 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 f20f0a4820..c34f164379 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import type { ClusterModel } from "../../../common/cluster-types"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; 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 a7a4c7b34c..9ab2275ff7 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable"; import { startsWith, toLower } from "lodash/fp"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; 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 06b1f39f33..ff4a05498e 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ 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 61e37642e1..55f2e452d6 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import applicationMenuItemCompositeInjectable from "../../../../features/application-menu/main/application-menu-item-composite.injectable"; import pushCatalogToRendererInjectable from "../../../catalog-sync-to-renderer/push-catalog-to-renderer.injectable"; 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 4752599dcc..cb80b4adbb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; 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 f8b08a1062..664cffb0bd 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import execHelmInjectable from "./exec-helm/exec-helm.injectable"; import readFileInjectable from "../../common/fs/read-file.injectable"; import statInjectable from "../../common/fs/stat.injectable"; diff --git a/packages/core/src/main/helm/helm-chart-manager.ts b/packages/core/src/main/helm/helm-chart-manager.ts index 6419e5fc92..98975be235 100644 --- a/packages/core/src/main/helm/helm-chart-manager.ts +++ b/packages/core/src/main/helm/helm-chart-manager.ts @@ -7,7 +7,7 @@ import * as yaml from "js-yaml"; import { iter, put, sortBySemverVersion } from "@k8slens/utilities"; import type { HelmRepo } from "../../common/helm/helm-repo"; import type { HelmChartManagerCache } from "./helm-chart-manager-cache.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; import type { ExecHelm } from "./exec-helm/exec-helm.injectable"; import type { ReadFile } from "../../common/fs/read-file.injectable"; 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 63244b4583..6384262bc2 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { DeleteHelmReleaseData } from "../delete-helm-release.injectable"; import deleteHelmReleaseInjectable from "../delete-helm-release.injectable"; 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 45ca241c89..ba5663e017 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { GetHelmReleaseHistoryData } from "../get-helm-release-history.injectable"; import getHelmReleaseHistoryInjectable from "../get-helm-release-history.injectable"; 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 41c0d44e8f..e7a7375cb1 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { Cluster } from "../../../common/cluster/cluster"; import type { GetHelmReleaseValuesData } from "../get-helm-release-values.injectable"; import getHelmReleaseValuesInjectable from "../get-helm-release-values.injectable"; 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 8a9144999f..eb34dc7baf 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import { isObject, json } from "@k8slens/utilities"; import execHelmInjectable from "../exec-helm/exec-helm.injectable"; 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 d594c3f756..4bb78798cb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import listHelmReleasesInjectable from "../list-helm-releases.injectable"; 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 0be6afccbe..03216bce8b 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { RollbackHelmReleaseData } from "../rollback-helm-release.injectable"; import rollbackHelmReleaseInjectable from "../rollback-helm-release.injectable"; 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 0df63447b3..44243cdbd7 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import tempy from "tempy"; import getHelmReleaseInjectable from "./get-helm-release.injectable"; import writeFileInjectable from "../../../common/fs/write-file.injectable"; 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 27272a76f3..3b22f7b0eb 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { HelmRepo } from "../../../../common/helm/helm-repo"; const addHelmRepositoryInjectable = getInjectable({ 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 fe0690b59d..863569706c 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; interface HelmRepositoryFromYaml { 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 a7811c006d..6ce9a0b4b9 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { AsyncResult } from "@k8slens/utilities"; const removeHelmRepositoryInjectable = getInjectable({ 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 df7108d8f1..1a9b547951 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable"; import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable"; import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable"; 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 6e5f54b24c..be2b4677d4 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; diff --git a/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts b/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts index 276692c500..a869213830 100644 --- a/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts +++ b/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts @@ -7,7 +7,7 @@ import type { KubeConfig } from "@kubernetes/client-node"; import { dumpConfigYaml } from "../../common/kube-helpers"; import { isErrnoException } from "@k8slens/utilities"; import type { PartialDeep } from "type-fest"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"; import type { PathExists } from "../../common/fs/path-exists.injectable"; diff --git a/packages/core/src/main/kubectl/create-kubectl.injectable.ts b/packages/core/src/main/kubectl/create-kubectl.injectable.ts index f84046af92..a146b80a1b 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import unlinkInjectable from "../../common/fs/unlink.injectable"; import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable"; diff --git a/packages/core/src/main/kubectl/kubectl.ts b/packages/core/src/main/kubectl/kubectl.ts index 1ad1a29147..22fcc89603 100644 --- a/packages/core/src/main/kubectl/kubectl.ts +++ b/packages/core/src/main/kubectl/kubectl.ts @@ -15,7 +15,7 @@ import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"; import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable"; import type { NormalizedPlatform } from "../../common/vars/normalized-platform.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { ExecFile } from "../../common/fs/exec-file.injectable"; import { hasTypedProperty, isObject, isString, json } from "@k8slens/utilities"; import type { Unlink } from "../../common/fs/unlink.injectable"; 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 96079563ca..ba2c01842a 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; import getClusterForRequestInjectable from "./get-cluster-for-request.injectable"; import kubeAuthProxyServerInjectable from "../cluster/kube-auth-proxy-server.injectable"; diff --git a/packages/core/src/main/lens-proxy/lens-proxy.ts b/packages/core/src/main/lens-proxy/lens-proxy.ts index 92624cdf44..a574c67066 100644 --- a/packages/core/src/main/lens-proxy/lens-proxy.ts +++ b/packages/core/src/main/lens-proxy/lens-proxy.ts @@ -15,7 +15,7 @@ import { getBoolean } from "../utils/parse-query"; import assert from "assert"; import type { SetRequired } from "type-fest"; import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { SelfSignedCert } from "selfsigned"; import type { KubeAuthProxyServer } from "../cluster/kube-auth-proxy-server.injectable"; import stoppable from "stoppable"; 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 afaf2a870d..1596c736cb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getClusterForRequestInjectable from "../get-cluster-for-request.injectable"; const shellApiRequestInjectable = getInjectable({ diff --git a/packages/core/src/main/logger/console-transport.injectable.ts b/packages/core/src/main/logger/console-transport.injectable.ts index 1e70b92be9..60ec9eb388 100644 --- a/packages/core/src/main/logger/console-transport.injectable.ts +++ b/packages/core/src/main/logger/console-transport.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { format, transports } from "winston"; import { ConsoleFormat } from "./console-format"; -import { loggerTransportInjectionToken } from "../../common/logger/transports"; +import { loggerTransportInjectionToken } from "@k8slens/logging"; import logLevelInjectable from "./level.injectable"; const consoleLoggerTransportInjectable = getInjectable({ diff --git a/packages/core/src/main/logger/file-transport.injectable.ts b/packages/core/src/main/logger/file-transport.injectable.ts index c71b44a2a0..2b280a1b19 100644 --- a/packages/core/src/main/logger/file-transport.injectable.ts +++ b/packages/core/src/main/logger/file-transport.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { transports } from "winston"; import directoryForLogsInjectable from "../../common/app-paths/directory-for-logs.injectable"; -import { loggerTransportInjectionToken } from "../../common/logger/transports"; +import { loggerTransportInjectionToken } from "@k8slens/logging"; const fileLoggerTransportInjectable = getInjectable({ id: "file-logger-transport", 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 009f8ab2a4..643485fc66 100644 --- a/packages/core/src/main/logger/log-on-quit.injectable.ts +++ b/packages/core/src/main/logger/log-on-quit.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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { onQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; const logOnQuitOfBackendInjectable = getInjectable({ 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 53057f2e23..cc67e05e22 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import appNameInjectable from "../../common/vars/app-name.injectable"; import { buildVersionInitializable } from "../../features/vars/build-version/common/token"; import { buildVersionInitializationInjectable } from "../../features/vars/build-version/main/init.injectable"; 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 92fbdd8737..8b1b706085 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable"; const lensProtocolRouterMainInjectable = getInjectable({ 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 245a3551bf..7fb3d4b5d7 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import { ResourceApplier } from "./resource-applier"; import createKubectlInjectable from "../kubectl/create-kubectl.injectable"; diff --git a/packages/core/src/main/resource-applier/resource-applier.ts b/packages/core/src/main/resource-applier/resource-applier.ts index 6df02debc8..a1cc0133f9 100644 --- a/packages/core/src/main/resource-applier/resource-applier.ts +++ b/packages/core/src/main/resource-applier/resource-applier.ts @@ -9,7 +9,7 @@ import tempy from "tempy"; import type { Patch } from "rfc6902"; import type { KubernetesObject } from "@kubernetes/client-node"; import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { WriteFile } from "../../common/fs/write-file.injectable"; import type { RemovePath } from "../../common/fs/remove.injectable"; import type { ExecFile } from "../../common/fs/exec-file.injectable"; 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 d007172294..c8702cc6d3 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { object } from "@k8slens/utilities"; import type { LensApiRequest, Route } from "./route"; import { contentTypes } from "./router-content-types"; diff --git a/packages/core/src/main/routes/files/production.injectable.ts b/packages/core/src/main/routes/files/production.injectable.ts index 1e4c360138..587b5ba8de 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { publicPath } from "../../../common/vars"; const prodStaticFileRouteHandlerInjectable = getInjectable({ 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 fe3d2b01fa..3cbe3cd620 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import prometheusHandlerInjectable from "../../cluster/prometheus-handler/prometheus-handler.injectable"; import { runInAction } from "mobx"; 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 e2bfb8a517..8c88539884 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export type CreatePortForward = (pathToKubeConfig: string, args: PortForwardArgs) => PortForward; diff --git a/packages/core/src/main/routes/port-forward/functionality/port-forward.ts b/packages/core/src/main/routes/port-forward/functionality/port-forward.ts index 0419024f2f..f7119d2e0b 100644 --- a/packages/core/src/main/routes/port-forward/functionality/port-forward.ts +++ b/packages/core/src/main/routes/port-forward/functionality/port-forward.ts @@ -7,7 +7,7 @@ import type { ChildProcessWithoutNullStreams } from "child_process"; import { spawn } from "child_process"; import * as tcpPortUsed from "tcp-port-used"; import { TypedRegEx } from "typed-regex"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; const internalPortMatcher = "^forwarding from (?
.+) ->"; const internalPortRegex = Object.assign(TypedRegEx(internalPortMatcher, "i"), { 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 170f93fef8..eed4766f62 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; const startPortForwardRouteInjectable = getRouteInjectable({ 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 1fc76e9b72..933655ab41 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,7 +6,7 @@ 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const stopCurrentPortForwardRouteInjectable = getRouteInjectable({ id: "stop-current-port-forward-route", 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 63509cbfe2..0802032b38 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type WebSocket from "ws"; import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; 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 d8d50a8b6a..514d075e16 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable"; import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable"; import spawnPtyInjectable from "../spawn-pty.injectable"; diff --git a/packages/core/src/main/shell-session/shell-session.ts b/packages/core/src/main/shell-session/shell-session.ts index 9ce5e0cb0f..dc927ab423 100644 --- a/packages/core/src/main/shell-session/shell-session.ts +++ b/packages/core/src/main/shell-session/shell-session.ts @@ -12,7 +12,7 @@ import os from "os"; import type * as pty from "node-pty"; import { getOrInsertWith } from "@k8slens/utilities"; import { type TerminalMessage, TerminalChannels } from "../../common/terminal/channels"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { ComputeShellEnvironment } from "../../features/shell-sync/main/compute-shell-environment.injectable"; import type { SpawnPty } from "./spawn-pty.injectable"; import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable"; 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 0693c71643..a07b89aeca 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import applicationWindowStateInjectable from "./application-window-state.injectable"; import { BrowserWindow } from "electron"; import type { ElectronWindow } from "./create-lens-window.injectable"; diff --git a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts index d44d91dc5c..23604af3db 100644 --- a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { onQuitOfBackEndInjectionToken } from "../runnable-tokens/phases"; import shellSessionProcessesInjectable from "../../shell-session/processes.injectable"; -import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; const cleanUpShellSessionsInjectable = getInjectable({ id: "clean-up-shell-sessions", diff --git a/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts b/packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts index cf89992ade..1d5b6a6019 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; 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 96ec45884c..af71806a73 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; 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 96add28ac7..901b7df9df 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters"; import trayIconInjectable from "../menu-icon/tray-icon.injectable"; import applicationDescriptionInjectable from "../../../common/vars/application-description.injectable"; 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 983ed66313..2f93b5670d 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface GetPortFromStreamArgs { /** diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts index 9ee9c86459..c9c8d80da1 100644 --- a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts +++ b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts @@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getPromiseStatus } from "@k8slens/test-utils"; -import logErrorInjectable from "../../../common/log-error.injectable"; +import { logErrorInjectable } from "@k8slens/logging"; import type { DiContainer } from "@ogre-tools/injectable"; import type { BrowserWindow, Session, WebContents } from "electron"; 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 a06413afdf..68741d7dff 100644 --- a/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts +++ b/packages/core/src/renderer/api/catalog/entity/registry.injectable.ts @@ -6,7 +6,7 @@ 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const catalogEntityRegistryInjectable = getInjectable({ id: "catalog-entity-registry", diff --git a/packages/core/src/renderer/api/catalog/entity/registry.ts b/packages/core/src/renderer/api/catalog/entity/registry.ts index d3f205a094..35a02d8699 100644 --- a/packages/core/src/renderer/api/catalog/entity/registry.ts +++ b/packages/core/src/renderer/api/catalog/entity/registry.ts @@ -15,7 +15,7 @@ import { ipcRenderer } from "electron"; import { catalogInitChannel, catalogItemsChannel, catalogEntityRunListener } from "../../../../common/ipc/catalog"; import { isMainFrame } from "process"; import type { Navigate } from "../../../navigation/navigate.injectable"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; export type EntityFilter = (entity: CatalogEntity) => any; export type CatalogEntityOnBeforeRun = (event: CatalogRunEvent) => void | Promise; 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 63581623bf..b7516c574f 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable"; import defaultWebsocketApiParamsInjectable from "./default-websocket-api-params.injectable"; import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api"; diff --git a/packages/core/src/renderer/api/terminal-api.ts b/packages/core/src/renderer/api/terminal-api.ts index fadd544bb6..8547ed38a1 100644 --- a/packages/core/src/renderer/api/terminal-api.ts +++ b/packages/core/src/renderer/api/terminal-api.ts @@ -9,7 +9,7 @@ import isEqual from "lodash/isEqual"; import url from "url"; import { makeObservable, observable } from "mobx"; import { ipcRenderer } from "electron"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { once } from "lodash"; import { type TerminalMessage, TerminalChannels } from "../../common/terminal/channels"; 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 dae545b32c..b3d540e579 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import frameRoutingIdInjectable from "../../frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable"; import closeRendererLogFileInjectable from "../../../features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable"; 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 c23a34d767..27d054393c 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts @@ -9,7 +9,7 @@ import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints import { KubeApi } from "../../../common/k8s-api/kube-api"; import { KubeObject } from "../../../common/k8s-api/kube-object"; import maybeKubeApiInjectable from "../../../common/k8s-api/maybe-kube-api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { injectableDifferencingRegistratorWith } from "../../../common/utils/registrator-helper"; import customResourceDefinitionStoreInjectable from "../../components/+custom-resources/definition.store.injectable"; import { beforeClusterFrameStartsSecondInjectionToken } from "../tokens"; 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 d175ce2899..869d9a9510 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import openDeleteClusterDialogInjectable from "../../components/delete-cluster-dialog/open.injectable"; import { beforeFrameStartsSecondInjectionToken } from "../tokens"; diff --git a/packages/core/src/renderer/components/+catalog/catalog.tsx b/packages/core/src/renderer/components/+catalog/catalog.tsx index 9d6846d45c..dff59cb5c8 100644 --- a/packages/core/src/renderer/components/+catalog/catalog.tsx +++ b/packages/core/src/renderer/components/+catalog/catalog.tsx @@ -28,8 +28,8 @@ import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entit import visitEntityContextMenuInjectable from "../../../common/catalog/visit-entity-context-menu.injectable"; import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; -import type { Logger } from "../../../common/logger"; -import loggerInjectable from "../../../common/logger.injectable"; +import type { Logger } from "@k8slens/logging"; +import { loggerInjectable } from "@k8slens/logging"; import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable"; import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable"; import type { Navigate } from "../../navigation/navigate.injectable"; 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 1b64040d40..75d5529bee 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const clusterOverviewStoreInjectable = getInjectable({ id: "cluster-overview-store", 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 f4d675fa3d..cc71ef4431 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 @@ -16,12 +16,12 @@ import type { HorizontalPodAutoscalerMetricSpec, HorizontalPodAutoscalerMetricTa import { HorizontalPodAutoscaler, HpaMetricType } from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getHorizontalPodAutoscalerMetrics from "./get-metrics.injectable"; import { getMetricName } from "./get-metric-name"; diff --git a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.injectable.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.injectable.ts index 6b09568537..7175ff2834 100644 --- a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/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 horizontalPodAutoscalerApiInjectable from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { HorizontalPodAutoscalerStore } from "./store"; diff --git a/packages/core/src/renderer/components/+config-leases/store.injectable.ts b/packages/core/src/renderer/components/+config-leases/store.injectable.ts index 26cf598aff..8c9b63f331 100644 --- a/packages/core/src/renderer/components/+config-leases/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-leases/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 leaseApiInjectable from "../../../common/k8s-api/endpoints/lease.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { LeaseStore } from "./store"; diff --git a/packages/core/src/renderer/components/+config-limit-ranges/limit-range-details.tsx b/packages/core/src/renderer/components/+config-limit-ranges/limit-range-details.tsx index 79c3038a5d..118d22912a 100644 --- a/packages/core/src/renderer/components/+config-limit-ranges/limit-range-details.tsx +++ b/packages/core/src/renderer/components/+config-limit-ranges/limit-range-details.tsx @@ -12,9 +12,9 @@ import type { LimitRangeItem } from "../../../common/k8s-api/endpoints/limit-ran import { LimitPart, LimitRange, Resource } from "../../../common/k8s-api/endpoints/limit-range.api"; import { DrawerItem } from "../drawer/drawer-item"; import { Badge } from "../badge"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface LimitRangeDetailsProps extends KubeObjectDetailsProps { } 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 5109b25079..ec27cefd2d 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { LimitRangeStore } from "./store"; 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 a770f6d324..3d52375cc5 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 @@ -13,13 +13,13 @@ import type { ShowNotification } from "../notifications"; import { Button } from "@k8slens/button"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ConfigMap } from "../../../common/k8s-api/endpoints"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { ConfigMapStore } from "./store"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { MonacoEditor } from "../monaco-editor"; export interface ConfigMapDetailsProps extends KubeObjectDetailsProps { diff --git a/packages/core/src/renderer/components/+config-maps/store.injectable.ts b/packages/core/src/renderer/components/+config-maps/store.injectable.ts index e282e4d121..46be122625 100644 --- a/packages/core/src/renderer/components/+config-maps/store.injectable.ts +++ b/packages/core/src/renderer/components/+config-maps/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 configMapApiInjectable from "../../../common/k8s-api/endpoints/config-map.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { ConfigMapStore } from "./store"; diff --git a/packages/core/src/renderer/components/+config-mutating-webhook-configurations/mutating-webhook-configuration-store.injectable.ts b/packages/core/src/renderer/components/+config-mutating-webhook-configurations/mutating-webhook-configuration-store.injectable.ts index 6522360bd0..8ad0a1c7e8 100644 --- a/packages/core/src/renderer/components/+config-mutating-webhook-configurations/mutating-webhook-configuration-store.injectable.ts +++ b/packages/core/src/renderer/components/+config-mutating-webhook-configurations/mutating-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 { MutatingWebhookConfigurationStore } from "./mutating-webhook-configuration-store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import mutatingWebhookConfigurationApiInjectable from "../../../common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable"; 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 3f3b83e21f..c70ae00ef4 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PodDisruptionBudgetStore } from "./store"; 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 e3e22a53b9..45ac560148 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PriorityClassStore } from "./store"; 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 c032de2a25..be5adc5e75 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 @@ -13,9 +13,9 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ResourceQuota } from "../../../common/k8s-api/endpoints/resource-quota.api"; import { LineProgress } from "../line-progress"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface ResourceQuotaDetailsProps extends KubeObjectDetailsProps { } 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 cbbb014d05..6d38a706ba 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { ResourceQuotaStore } from "./store"; 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 70c0efa6c4..0d89484a29 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { RuntimeClassStore } from "./store"; 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 fcf5f7ce18..74fdddb748 100644 --- a/packages/core/src/renderer/components/+config-secrets/secret-details.tsx +++ b/packages/core/src/renderer/components/+config-secrets/secret-details.tsx @@ -16,10 +16,10 @@ import { base64, toggle } from "@k8slens/utilities"; import { Icon } from "../icon"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Secret } from "../../../common/k8s-api/endpoints"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import secretStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import type { ShowCheckedErrorNotification } from "../notifications/show-checked-error.injectable"; 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 a18fff90b2..341570788f 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { SecretStore } from "./store"; 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 44df67ebdb..6b2dad24f8 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import validatingWebhookConfigurationApiInjectable from "../../../common/k8s-api/endpoints/validating-webhook-configuration-api.injectable"; 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 583bba75f5..6e07d05855 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import verticalPodAutoscalerApiInjectable from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; 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 532ecf39aa..2c691a8f54 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,8 +16,8 @@ import { cssNames } from "@k8slens/utilities"; import { ContainerScalingMode, ControlledValues, ResourceName, UpdateMode, VerticalPodAutoscaler } from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api"; import type { PodUpdatePolicy, PodResourcePolicy, VerticalPodAutoscalerStatus } from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import loggerInjectable from "../../../common/logger.injectable"; -import type { Logger } from "../../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; 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 23194dbc73..59fd3ff202 100644 --- a/packages/core/src/renderer/components/+custom-resources/crd-details.tsx +++ b/packages/core/src/renderer/components/+custom-resources/crd-details.tsx @@ -15,9 +15,9 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { Input } from "../input"; import { MonacoEditor } from "../monaco-editor"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface CRDDetailsProps extends KubeObjectDetailsProps { } 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 6b899563a9..eddba13d77 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,9 +16,9 @@ import type { AdditionalPrinterColumnsV1 } from "../../../common/k8s-api/endpoin import { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/custom-resource-definition.api"; import type { KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-api/kube-object"; import { KubeObject } from "../../../common/k8s-api/kube-object"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface CustomResourceDetailsProps extends KubeObjectDetailsProps { crd?: CustomResourceDefinition; 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 dbbd2460aa..527fa77845 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { CustomResourceDefinitionStore } from "./definition.store"; diff --git a/packages/core/src/renderer/components/+events/event-details.tsx b/packages/core/src/renderer/components/+events/event-details.tsx index 1e825993c4..7bbe18edb0 100644 --- a/packages/core/src/renderer/components/+events/event-details.tsx +++ b/packages/core/src/renderer/components/+events/event-details.tsx @@ -14,14 +14,14 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { KubeEvent } from "../../../common/k8s-api/endpoints/events.api"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { DurationAbsoluteTimestamp } from "./duration-absolute"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface EventDetailsProps extends KubeObjectDetailsProps { } 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 76010a8e14..a08588800f 100644 --- a/packages/core/src/renderer/components/+events/kube-event-details.tsx +++ b/packages/core/src/renderer/components/+events/kube-event-details.tsx @@ -12,13 +12,13 @@ import { DrawerItem, DrawerTitle } from "../drawer"; import { cssNames } from "@k8slens/utilities"; import { LocaleDate } from "../locale-date"; import type { EventStore } from "./store"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface KubeEventDetailsProps { object: KubeObject; diff --git a/packages/core/src/renderer/components/+events/store.injectable.ts b/packages/core/src/renderer/components/+events/store.injectable.ts index b81a198413..628849212e 100644 --- a/packages/core/src/renderer/components/+events/store.injectable.ts +++ b/packages/core/src/renderer/components/+events/store.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import getPodByIdInjectable from "../+workloads-pods/get-pod-by-id.injectable"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import kubeEventApiInjectable from "../../../common/k8s-api/endpoints/events.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { EventStore } from "./store"; diff --git a/packages/core/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx b/packages/core/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx index 8f2e5692d1..62f237a671 100644 --- a/packages/core/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx +++ b/packages/core/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx @@ -18,7 +18,7 @@ import downloadBinaryInjectable from "../../../common/fetch/download-binary.inje import downloadJsonInjectable from "../../../common/fetch/download-json/normal.injectable"; import type { PackageJson } from "type-fest"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface ExtensionInfo { name: string; 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 fd55adce36..f13ad0f445 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import writeFileInjectable from "../../../../common/fs/write-file.injectable"; import joinPathsInjectable from "../../../../common/path/join-paths.injectable"; import tempDirectoryPathInjectable from "../../../../common/os/temp-directory-path.injectable"; 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 47dd5e02cf..7d25eeec70 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showInfoNotificationInjectable from "../../notifications/show-info-notification.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; 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 2707f99a3b..adc26993a8 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { defaultExtensionRegistryUrl } from "../../../../features/user-preferences/common/preferences-helpers"; import userPreferencesStateInjectable from "../../../../features/user-preferences/common/state.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; 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 e879599299..6f32caaa90 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable"; import { withTimeout } from "../../../common/fetch/timeout-controller"; 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 e1779eb223..a443435752 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import attemptInstallsInjectable from "./attempt-installs.injectable"; export type InstallOnDrop = (files: File[]) => Promise; 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 d907314b33..cbb0c58e97 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import readFileBufferInjectable from "../../../../common/fs/read-file-buffer.injectable"; export type ReadFileNotify = (filePath: string, showError?: boolean) => Promise; 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 d70d56b5f9..b56855612c 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { LensExtensionId } from "@k8slens/legacy-extensions"; import { extensionDisplayName } from "../../../extensions/lens-extension"; import React from "react"; diff --git a/packages/core/src/renderer/components/+namespaces/namespace-details.tsx b/packages/core/src/renderer/components/+namespaces/namespace-details.tsx index 98ab923248..ab113bff19 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-details.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-details.tsx @@ -24,8 +24,8 @@ import type { LimitRangeStore } from "../+config-limit-ranges/store"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import limitRangeStoreInjectable from "../+config-limit-ranges/store.injectable"; import resourceQuotaStoreInjectable from "../+config-resource-quotas/store.injectable"; -import type { Logger } from "../../../common/logger"; -import loggerInjectable from "../../../common/logger.injectable"; +import type { Logger } from "@k8slens/logging"; +import { loggerInjectable } from "@k8slens/logging"; import { NamespaceTreeView } from "./namespace-tree-view"; import namespaceStoreInjectable from "./store.injectable"; import type { NamespaceStore } from "./store"; diff --git a/packages/core/src/renderer/components/+namespaces/store.injectable.ts b/packages/core/src/renderer/components/+namespaces/store.injectable.ts index 68540d0ce5..8a193049cf 100644 --- a/packages/core/src/renderer/components/+namespaces/store.injectable.ts +++ b/packages/core/src/renderer/components/+namespaces/store.injectable.ts @@ -10,7 +10,7 @@ import assert from "assert"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import clusterConfiguredAccessibleNamespacesInjectable from "../../cluster/accessible-namespaces.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import selectedNamespacesStorageInjectable from "../../../features/namespace-filtering/renderer/storage.injectable"; const namespaceStoreInjectable = getInjectable({ diff --git a/packages/core/src/renderer/components/+network-endpoints/endpoint-details.tsx b/packages/core/src/renderer/components/+network-endpoints/endpoint-details.tsx index 6e806683e8..b252c72136 100644 --- a/packages/core/src/renderer/components/+network-endpoints/endpoint-details.tsx +++ b/packages/core/src/renderer/components/+network-endpoints/endpoint-details.tsx @@ -11,9 +11,9 @@ import { DrawerTitle } from "../drawer"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Endpoints } from "../../../common/k8s-api/endpoints"; import { EndpointSubsetList } from "./endpoint-subset-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface EndpointsDetailsProps extends KubeObjectDetailsProps { } 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 ee8474c8a8..bca709ffd5 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { EndpointsStore } from "./store"; 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 98315f91ac..3fa142372c 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const ingressClassStoreInjectable = getInjectable({ id: "ingress-class-store", 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 a01ced5b7f..2bab04684f 100644 --- a/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/packages/core/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -13,9 +13,9 @@ import { Ingress } from "../../../common/k8s-api/endpoints"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { computeRuleDeclarations } from "../../../common/k8s-api/endpoints/ingress.api"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface IngressDetailsProps extends KubeObjectDetailsProps { } 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 ebd460664e..cde6399865 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { IngressStore } from "./ingress-store"; 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 08b03e7186..faeb1d5091 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 @@ -13,11 +13,11 @@ import { Badge } from "../badge"; import { SubTitle } from "../layout/sub-title"; import { observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { LabelMatchExpression, LabelSelector } from "../../../common/k8s-api/kube-object"; import { isEmpty } from "lodash"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface NetworkPolicyDetailsProps extends KubeObjectDetailsProps { } 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 b3d7cfa0bf..b47963e1b4 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { NetworkPolicyStore } from "./store"; 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 324f035fa7..e15ba3f165 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 @@ -7,11 +7,11 @@ import { observer } from "mobx-react"; import React from "react"; import { Table, TableHead, TableCell, TableRow } from "../table"; import { prevDefault } from "@k8slens/utilities"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { Endpoints } from "../../../common/k8s-api/endpoints"; import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showDetailsInjectable from "../kube-detail-params/show-details.injectable"; export interface ServiceDetailsEndpointProps { 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 a9d5e8a93c..1227ccd035 100644 --- a/packages/core/src/renderer/components/+network-services/service-details.tsx +++ b/packages/core/src/renderer/components/+network-services/service-details.tsx @@ -15,13 +15,13 @@ import { ServicePortComponent } from "./service-port-component"; import type { EndpointsStore } from "../+network-endpoints/store"; import { ServiceDetailsEndpoint } from "./service-details-endpoint"; import type { PortForwardStore } from "../../port-forward"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface ServiceDetailsProps extends KubeObjectDetailsProps { } 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 0aba62ca37..3d4bcd383d 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 @@ -18,12 +18,12 @@ import { Spinner } from "../spinner"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; import portForwardDialogModelInjectable from "../../port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import aboutPortForwardingInjectable from "../../port-forward/about-port-forwarding.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; export interface ServicePortComponentProps { diff --git a/packages/core/src/renderer/components/+network-services/store.injectable.ts b/packages/core/src/renderer/components/+network-services/store.injectable.ts index a4a2f831eb..9259d9f28c 100644 --- a/packages/core/src/renderer/components/+network-services/store.injectable.ts +++ b/packages/core/src/renderer/components/+network-services/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 serviceApiInjectable from "../../../common/k8s-api/endpoints/service.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { ServiceStore } from "./store"; diff --git a/packages/core/src/renderer/components/+nodes/details.tsx b/packages/core/src/renderer/components/+nodes/details.tsx index 96a122d7be..8565e2a6be 100644 --- a/packages/core/src/renderer/components/+nodes/details.tsx +++ b/packages/core/src/renderer/components/+nodes/details.tsx @@ -16,13 +16,13 @@ import { formatNodeTaint, Node } from "../../../common/k8s-api/endpoints"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; import { NodeDetailsResources } from "./details-resources"; import { DrawerTitle } from "../drawer/drawer-title"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 type { PodStore } from "../+workloads-pods/store"; import podStoreInjectable from "../+workloads-pods/store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import loadPodsFromAllNamespacesInjectable from "../+workloads-pods/load-pods-from-all-namespaces.injectable"; diff --git a/packages/core/src/renderer/components/+nodes/store.injectable.ts b/packages/core/src/renderer/components/+nodes/store.injectable.ts index b12845b6a4..3d38f0e376 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { NodeStore } from "./store"; 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 d30ae17898..c1da3ca1e0 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 @@ -12,9 +12,9 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { PodSecurityPolicy } from "../../../common/k8s-api/endpoints"; import { Badge } from "../badge"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface PodSecurityPolicyDetailsProps extends KubeObjectDetailsProps { } 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 0c90fa571e..8ebd5cd35f 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PodSecurityPolicyStore } from "./store"; 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 14f76cda32..1e1c01ca96 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 @@ -15,13 +15,13 @@ import { StorageClass } from "../../../common/k8s-api/endpoints"; import type { StorageClassStore } from "./store"; import { VolumeDetailsList } from "../+storage-volumes/volume-details-list"; import type { PersistentVolumeStore } from "../+storage-volumes/store"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 storageClassStoreInjectable from "./store.injectable"; import persistentVolumeStoreInjectable from "../+storage-volumes/store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface StorageClassDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+storage-classes/store.injectable.ts b/packages/core/src/renderer/components/+storage-classes/store.injectable.ts index b0508f01fd..8d884ae0dd 100644 --- a/packages/core/src/renderer/components/+storage-classes/store.injectable.ts +++ b/packages/core/src/renderer/components/+storage-classes/store.injectable.ts @@ -7,7 +7,7 @@ import assert from "assert"; import getPersistentVolumesByStorageClassInjectable from "../+storage-volumes/get-persisten-volumes-by-storage-class.injectable"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { StorageClassStore } from "./store"; diff --git a/packages/core/src/renderer/components/+storage-volume-claims/store.injectable.ts b/packages/core/src/renderer/components/+storage-volume-claims/store.injectable.ts index a9289a1fd0..3cb8822f45 100644 --- a/packages/core/src/renderer/components/+storage-volume-claims/store.injectable.ts +++ b/packages/core/src/renderer/components/+storage-volume-claims/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 persistentVolumeClaimApiInjectable from "../../../common/k8s-api/endpoints/persistent-volume-claim.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PersistentVolumeClaimStore } from "./store"; diff --git a/packages/core/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx b/packages/core/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx index 6447faa4f4..4d8fb0fbfa 100644 --- a/packages/core/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx +++ b/packages/core/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx @@ -13,7 +13,7 @@ import { Link } from "react-router-dom"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { StorageClassApi } from "../../../common/k8s-api/endpoints"; import { PersistentVolumeClaim } from "../../../common/k8s-api/endpoints"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import type { PodStore } from "../+workloads-pods/store"; @@ -21,7 +21,7 @@ import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injec import podStoreInjectable from "../+workloads-pods/store.injectable"; import { stopPropagation } from "@k8slens/utilities"; import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface PersistentVolumeClaimDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+storage-volumes/store.injectable.ts b/packages/core/src/renderer/components/+storage-volumes/store.injectable.ts index 00a0db0c8c..cd452ccca1 100644 --- a/packages/core/src/renderer/components/+storage-volumes/store.injectable.ts +++ b/packages/core/src/renderer/components/+storage-volumes/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 persistentVolumeApiInjectable from "../../../common/k8s-api/endpoints/persistent-volume.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PersistentVolumeStore } from "./store"; diff --git a/packages/core/src/renderer/components/+storage-volumes/volume-details.tsx b/packages/core/src/renderer/components/+storage-volumes/volume-details.tsx index ab7e1e48b2..c960be6e3a 100644 --- a/packages/core/src/renderer/components/+storage-volumes/volume-details.tsx +++ b/packages/core/src/renderer/components/+storage-volumes/volume-details.tsx @@ -14,10 +14,10 @@ import { Badge } from "../badge"; import type { PersistentVolumeClaimApi, StorageClassApi } from "../../../common/k8s-api/endpoints"; import { PersistentVolume } from "../../../common/k8s-api/endpoints"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { stopPropagation } from "@k8slens/utilities"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import persistentVolumeClaimApiInjectable from "../../../common/k8s-api/endpoints/persistent-volume-claim.api.injectable"; 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 54250222d3..8a1bbad2c5 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const clusterRoleBindingStoreInjectable = getInjectable({ id: "cluster-role-binding-store", 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 d7ea148d03..2d2f01cbae 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const clusterRoleStoreInjectable = getInjectable({ id: "cluster-role-store", 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 e9b9154068..02ad536549 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable"; import { RoleBindingStore } from "./store"; 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 99eddcbfa0..e25a82e831 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const roleStoreInjectable = getInjectable({ id: "role-store", 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 a4749f7ecb..4d094cefa0 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const serviceAccountStoreInjectable = getInjectable({ id: "service-account-store", 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 c8f925edc1..0e8936fb5c 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx +++ b/packages/core/src/renderer/components/+workloads-cronjobs/cronjob-details.tsx @@ -16,13 +16,13 @@ import type { CronJobStore } from "./store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import type { Job } from "../../../common/k8s-api/endpoints"; import { CronJob } from "../../../common/k8s-api/endpoints"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 cronJobStoreInjectable from "./store.injectable"; import jobStoreInjectable from "../+workloads-jobs/store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; 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 98d539a9ce..e3b6a6407b 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { CronJobStore } from "./store"; 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 260a2e8333..1086411125 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx +++ b/packages/core/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx @@ -17,13 +17,13 @@ import type { PodStore } from "../+workloads-pods/store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { DaemonSet } from "../../../common/k8s-api/endpoints"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 daemonSetStoreInjectable from "./store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface DaemonSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+workloads-daemonsets/store.injectable.ts b/packages/core/src/renderer/components/+workloads-daemonsets/store.injectable.ts index 4b79b19bb5..60400eae46 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-daemonsets/store.injectable.ts @@ -10,7 +10,7 @@ import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-create import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import { DaemonSetStore } from "./store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const daemonSetStoreInjectable = getInjectable({ id: "daemon-set-store", diff --git a/packages/core/src/renderer/components/+workloads-deployments/deployment-details.tsx b/packages/core/src/renderer/components/+workloads-deployments/deployment-details.tsx index 6137c7af48..09b5ce4ff9 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/deployment-details.tsx +++ b/packages/core/src/renderer/components/+workloads-deployments/deployment-details.tsx @@ -18,13 +18,13 @@ import type { DeploymentStore } from "./store"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; import type { ReplicaSetStore } from "../+workloads-replicasets/store"; import { DeploymentReplicaSets } from "./deployment-replicasets"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 replicaSetStoreInjectable from "../+workloads-replicasets/store.injectable"; import deploymentStoreInjectable from "./store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface DeploymentDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+workloads-deployments/store.injectable.ts b/packages/core/src/renderer/components/+workloads-deployments/store.injectable.ts index 50ae255e21..5c2d68bc2f 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-deployments/store.injectable.ts @@ -10,7 +10,7 @@ import { storesAndApisCanBeCreatedInjectionToken } from "../../../common/k8s-api import deploymentApiInjectable from "../../../common/k8s-api/endpoints/deployment.api.injectable"; import { DeploymentStore } from "./store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const deploymentStoreInjectable = getInjectable({ id: "deployment-store", diff --git a/packages/core/src/renderer/components/+workloads-jobs/job-details.tsx b/packages/core/src/renderer/components/+workloads-jobs/job-details.tsx index 388032cac7..2c75603edc 100644 --- a/packages/core/src/renderer/components/+workloads-jobs/job-details.tsx +++ b/packages/core/src/renderer/components/+workloads-jobs/job-details.tsx @@ -17,14 +17,14 @@ import type { JobStore } from "./store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { Job } from "../../../common/k8s-api/endpoints"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 type { PodStore } from "../+workloads-pods/store"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import jobStoreInjectable from "./store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface JobDetailsProps extends KubeObjectDetailsProps { } 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 083b465ded..f0da8283d6 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { JobStore } from "./store"; 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 cba2276b22..2ca596ac0c 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 @@ -18,12 +18,12 @@ import { Spinner } from "../spinner"; import { withInjectables } from "@ogre-tools/injectable-react"; import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable"; import portForwardDialogModelInjectable from "../../port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import aboutPortForwardingInjectable from "../../port-forward/about-port-forwarding.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; export interface PodContainerPortProps { diff --git a/packages/core/src/renderer/components/+workloads-pods/pod-details.tsx b/packages/core/src/renderer/components/+workloads-pods/pod-details.tsx index 2537f67c0e..4f002ab746 100644 --- a/packages/core/src/renderer/components/+workloads-pods/pod-details.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/pod-details.tsx @@ -18,7 +18,7 @@ import { PodDetailsAffinities } from "./pod-details-affinities"; import { PodDetailsTolerations } from "./pod-details-tolerations"; import { PodDetailsSecrets } from "./pod-details-secrets"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { PodVolumes } from "./details/volumes/view"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; @@ -27,7 +27,7 @@ import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.inject import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable"; import serviceAccountApiInjectable from "../../../common/k8s-api/endpoints/service-account.api.injectable"; import priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { PodDetailsContainers } from "./details/containers/pod-details-containers"; import { PodDetailsInitContainers } from "./details/containers/pod-details-init-containers"; 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 7b2bc23419..3da97e08a8 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const podStoreInjectable = getInjectable({ id: "pod-store", 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 72e73c0726..4d4d6b3521 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx +++ b/packages/core/src/renderer/components/+workloads-replicasets/replicaset-details.tsx @@ -14,7 +14,7 @@ import { disposeOnUnmount, observer } from "mobx-react"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { ReplicaSet } from "../../../common/k8s-api/endpoints"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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"; @@ -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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface ReplicaSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+workloads-replicasets/store.injectable.ts b/packages/core/src/renderer/components/+workloads-replicasets/store.injectable.ts index 34887a0590..893562e9a6 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-replicasets/store.injectable.ts @@ -10,7 +10,7 @@ import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-create import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import { ReplicaSetStore } from "./store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const replicaSetStoreInjectable = getInjectable({ id: "replica-set-store", diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts index 5749acf915..0f22b92702 100644 --- a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-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 { ReplicationControllerStore } from "./replicationcontroller-store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import replicationControllerApiInjectable from "../../../common/k8s-api/endpoints/replication-controller.api.injectable"; diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx b/packages/core/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx index 5c9eff2e84..8f74d8721b 100644 --- a/packages/core/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx +++ b/packages/core/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx @@ -16,14 +16,14 @@ import type { StatefulSetStore } from "./store"; import type { KubeObjectDetailsProps } from "../kube-object-details"; import { StatefulSet } from "../../../common/k8s-api/endpoints"; import { PodDetailsList } from "../+workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; 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 type { PodStore } from "../+workloads-pods/store"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import statefulSetStoreInjectable from "./store.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface StatefulSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/store.injectable.ts b/packages/core/src/renderer/components/+workloads-statefulsets/store.injectable.ts index b8fef46c51..dc241de220 100644 --- a/packages/core/src/renderer/components/+workloads-statefulsets/store.injectable.ts +++ b/packages/core/src/renderer/components/+workloads-statefulsets/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 statefulSetApiInjectable from "../../../common/k8s-api/endpoints/stateful-set.api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { StatefulSetStore } from "./store"; 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 079bf22b2d..666dedd377 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import { ClusterFrameHandler } from "./cluster-frame-handler"; import emitClusterVisibilityInjectable from "./emit-cluster-visibility.injectable"; diff --git a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts index eca0e28e11..ed98b51d20 100644 --- a/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts +++ b/packages/core/src/renderer/components/cluster-manager/cluster-frame-handler.ts @@ -8,7 +8,7 @@ import type { ClusterId } from "../../../common/cluster-types"; import type { Disposer } from "@k8slens/utilities"; import { onceDefined } from "@k8slens/utilities"; import assert from "assert"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { getClusterFrameUrl } from "../../../common/utils"; import type { GetClusterById } from "../../../features/cluster/storage/common/get-by-id.injectable"; diff --git a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts index 78b45f89b4..675d4a230d 100644 --- a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts +++ b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts @@ -15,7 +15,7 @@ import homeDirectoryPathInjectable from "../../../../common/os/home-directory-pa import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable"; import parsePathInjectable from "../../../../common/path/parse.injectable"; import { waitForPath } from "../../../../common/utils/wait-for-path"; -import prefixedLoggerInjectable from "../../../../common/logger/prefixed-logger.injectable"; +import { prefixedLoggerInjectable } from "@k8slens/logging"; const userCreateResourceTemplatesInjectable = getInjectable({ id: "user-create-resource-templates", diff --git a/packages/core/src/renderer/components/dock/create-resource/view.tsx b/packages/core/src/renderer/components/dock/create-resource/view.tsx index 73d6989b82..56a7abae0b 100644 --- a/packages/core/src/renderer/components/dock/create-resource/view.tsx +++ b/packages/core/src/renderer/components/dock/create-resource/view.tsx @@ -14,7 +14,7 @@ import type { CreateResourceTabStore } from "./store"; import { EditorPanel } from "../editor-panel"; import { InfoPanel } from "../info-panel"; import type { ShowNotification } from "../../notifications"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { ApiManager } from "../../../../common/k8s-api/api-manager"; import { isObject, prevDefault } from "@k8slens/utilities"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { ShowCheckedErrorNotification } from "../../notifications/show-checked-error.injectable"; import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable"; import showCheckedErrorNotificationInjectable from "../../notifications/show-checked-error.injectable"; 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 45e9700564..3394037407 100644 --- a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts +++ b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { PodLogsQuery } from "../../../../common/k8s-api/endpoints"; import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; -import loggerInjectable from "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; import callForLogsInjectable from "./call-for-logs.injectable"; @@ -18,7 +18,7 @@ const downloadAllLogsInjectable = getInjectable({ const openSaveFileDialog = di.inject(openSaveFileDialogInjectable); const logger = di.inject(loggerInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); - + return async (params: ResourceDescriptor, query: PodLogsQuery) => { const logs = await callForLogs(params, query).catch(error => { logger.error("Can't download logs: ", error); 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 88e7514855..559407f18e 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import terminalConfigInjectable from "../../../../features/user-preferences/common/terminal-config.injectable"; import terminalCopyOnSelectInjectable from "../../../../features/user-preferences/common/terminal-copy-on-select.injectable"; 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 c3fc64c7df..0ce07bd4cf 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 "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { TerminalChannels } from "../../../../common/terminal/channels"; import { waitUntilDefined, noop } from "@k8slens/utilities"; import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable"; diff --git a/packages/core/src/renderer/components/dock/terminal/terminal.ts b/packages/core/src/renderer/components/dock/terminal/terminal.ts index a0c3a5384a..26bd85e75c 100644 --- a/packages/core/src/renderer/components/dock/terminal/terminal.ts +++ b/packages/core/src/renderer/components/dock/terminal/terminal.ts @@ -13,7 +13,7 @@ import type { TerminalApi } from "../../../api/terminal-api"; import { disposer } from "@k8slens/utilities"; import { once } from "lodash"; import { clipboard } from "electron"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import assert from "assert"; import { TerminalChannels } from "../../../../common/terminal/channels"; import { LinkProvider } from "xterm-link-provider"; diff --git a/packages/core/src/renderer/components/icon/icon.test.tsx b/packages/core/src/renderer/components/icon/icon.test.tsx index f927caa7da..f486d0cbd2 100644 --- a/packages/core/src/renderer/components/icon/icon.test.tsx +++ b/packages/core/src/renderer/components/icon/icon.test.tsx @@ -4,8 +4,8 @@ */ import React from "react"; -import type { Logger } from "../../../common/logger"; -import loggerInjectable from "../../../common/logger.injectable"; +import type { Logger } from "@k8slens/logging"; +import { loggerInjectable } from "@k8slens/logging"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import type { DiRender } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor"; diff --git a/packages/core/src/renderer/components/icon/icon.tsx b/packages/core/src/renderer/components/icon/icon.tsx index 5b500b9531..867d7bd802 100644 --- a/packages/core/src/renderer/components/icon/icon.tsx +++ b/packages/core/src/renderer/components/icon/icon.tsx @@ -34,9 +34,9 @@ import User from "./user.svg"; import Users from "./users.svg"; import Wheel from "./wheel.svg"; import Workloads from "./workloads.svg"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const hrefValidation = /https?:\/\//; 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 85b3e8d369..400ecaa4f6 100644 --- a/packages/core/src/renderer/components/input/drop-file-input.tsx +++ b/packages/core/src/renderer/components/input/drop-file-input.tsx @@ -9,9 +9,9 @@ import type { IClassName } from "@k8slens/utilities"; import { cssNames } from "@k8slens/utilities"; import { observable, makeObservable } from "mobx"; import { observer } from "mobx-react"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import autoBindReact from "auto-bind/react"; export interface DropFileInputProps extends React.DOMAttributes { 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 b0ad4bac1a..c4aa1a3d1c 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 @@ -11,14 +11,14 @@ import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { Link } from "react-router-dom"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { LocaleDate } from "../locale-date"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import { KubeObjectAge } from "../kube-object/age"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { NamespaceApi } from "../../../common/k8s-api/endpoints"; import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable"; 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 c3a0d7f87f..f5dee64cbb 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showCheckedErrorNotificationInjectable from "../notifications/show-checked-error.injectable"; import kubeconfigDialogStateInjectable from "./state.injectable"; 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 592d288e13..c4f021ebb0 100644 --- a/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx +++ b/packages/core/src/renderer/components/monaco-editor/monaco-editor.tsx @@ -17,8 +17,8 @@ import type { LensTheme } from "../../themes/lens-theme"; 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 "../../../common/logger"; -import loggerInjectable from "../../../common/logger.injectable"; +import type { Logger } from "@k8slens/logging"; +import { loggerInjectable } from "@k8slens/logging"; import autoBindReact from "auto-bind/react"; import type { UserPreferencesState } from "../../../features/user-preferences/common/state.injectable"; import userPreferencesStateInjectable from "../../../features/user-preferences/common/state.injectable"; 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 770ce76e8d..59ed7639e2 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { Disposer } from "@k8slens/utilities"; import type { CreateNotificationOptions } from "./notifications.store"; import showErrorNotificationInjectable from "./show-error-notification.injectable"; 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 dd7def1626..4d77859305 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,8 +12,8 @@ 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 "../../../common/logger.injectable"; -import type { Logger } from "../../../common/logger"; +import { loggerInjectable } from "@k8slens/logging"; +import type { Logger } from "@k8slens/logging"; const statusBarItemRegistratorInjectable = getInjectable({ id: "status-bar-item-registrator", diff --git a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts index c640264ee3..907a1fa621 100644 --- a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts +++ b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts @@ -10,7 +10,7 @@ import hostedClusterInjectable from "../../../cluster-frame-context/hosted-clust import assert from "assert"; import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable"; import loadExtensionsInjectable from "../../load-extensions.injectable"; -import loggerInjectable from "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showErrorNotificationInjectable from "../../../components/notifications/show-error-notification.injectable"; const initClusterFrameInjectable = getInjectable({ diff --git a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts index 9e901a8060..39db6f4dff 100644 --- a/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts +++ b/packages/core/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts @@ -8,7 +8,7 @@ import type { ShowNotification } from "../../../components/notifications"; import { when } from "mobx"; import { requestSetClusterFrameId } from "../../../ipc"; import type { EmitAppEvent } from "../../../../common/app-event-bus/emit-event.injectable"; -import type { Logger } from "../../../../common/logger"; +import type { Logger } from "@k8slens/logging"; interface Dependencies { hostedCluster: Cluster; diff --git a/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts b/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts index 1a376819a5..2b285ffa32 100644 --- a/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts +++ b/packages/core/src/renderer/kube-watch-api/kube-watch-api.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import clusterFrameContextForNamespacedResourcesInjectable from "../cluster-frame-context/for-namespaced-resources.injectable"; import { KubeWatchApi } from "./kube-watch-api"; diff --git a/packages/core/src/renderer/kube-watch-api/kube-watch-api.ts b/packages/core/src/renderer/kube-watch-api/kube-watch-api.ts index 1724d66423..9381a4a048 100644 --- a/packages/core/src/renderer/kube-watch-api/kube-watch-api.ts +++ b/packages/core/src/renderer/kube-watch-api/kube-watch-api.ts @@ -6,7 +6,7 @@ import { comparer, reaction } from "mobx"; import type { Disposer } from "@k8slens/utilities"; import { disposer, getOrInsert, noop, WrappedAbortController } from "@k8slens/utilities"; import { once } from "lodash"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { KubeObjectStoreLoadAllParams, KubeObjectStoreSubscribeParams } from "../../common/k8s-api/kube-object.store"; import type { ClusterContext } from "../cluster-frame-context/cluster-frame-context"; diff --git a/packages/core/src/renderer/logger/browser-transport.injectable.ts b/packages/core/src/renderer/logger/browser-transport.injectable.ts index 80aafc99c5..ed45c446d2 100644 --- a/packages/core/src/renderer/logger/browser-transport.injectable.ts +++ b/packages/core/src/renderer/logger/browser-transport.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import BrowserConsole from "winston-transport-browserconsole"; -import { loggerTransportInjectionToken } from "../../common/logger/transports"; +import { loggerTransportInjectionToken } from "@k8slens/logging"; const browserLoggerTransportInjectable = getInjectable({ id: "browser-logger-transport", 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 b56eb979a2..2e8715fb2b 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens"; import observableHistoryInjectable from "./observable-history.injectable"; 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 587915779d..26badd07e6 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable"; import showErrorNotificationInjectable from "../components/notifications/show-error-notification.injectable"; import type { ForwardedPort } from "./port-forward-item"; 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 cb85dfc3a9..30399fe582 100644 --- a/packages/core/src/renderer/port-forward/port-forward-dialog.tsx +++ b/packages/core/src/renderer/port-forward/port-forward-dialog.tsx @@ -18,13 +18,13 @@ import { Checkbox } from "../components/checkbox"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { PortForwardDialogData, PortForwardDialogModel } from "./port-forward-dialog-model/port-forward-dialog-model"; import portForwardDialogModelInjectable from "./port-forward-dialog-model/port-forward-dialog-model.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; import portForwardStoreInjectable from "./port-forward-store/port-forward-store.injectable"; 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; export interface PortForwardDialogProps extends Partial {} diff --git a/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts b/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts index 3b698f4e73..0ba90a3134 100644 --- a/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts +++ b/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts @@ -9,7 +9,7 @@ import createStorageInjectable from "../../utils/create-storage/create-storage.i import notifyErrorPortForwardingInjectable from "../notify-error-port-forwarding.injectable"; import requestActivePortForwardInjectable from "./request-active-port-forward.injectable"; import apiBaseInjectable from "../../../common/k8s-api/api-base.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; const portForwardStoreInjectable = getInjectable({ id: "port-forward-store", diff --git a/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.ts b/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.ts index eaf1711bf3..8b51bdda71 100644 --- a/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.ts +++ b/packages/core/src/renderer/port-forward/port-forward-store/port-forward-store.ts @@ -10,7 +10,7 @@ import { disposer } from "@k8slens/utilities"; import type { ForwardedPort } from "../port-forward-item"; import { PortForwardItem } from "../port-forward-item"; import { waitUntilFree } from "tcp-port-used"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logging"; import type { JsonApi } from "../../../common/k8s-api/json-api"; import type { RequestActivePortForward } from "./request-active-port-forward.injectable"; import autoBind from "auto-bind"; diff --git a/packages/core/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts b/packages/core/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts index a54eb929a2..c903965e0a 100644 --- a/packages/core/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts +++ b/packages/core/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import apiBaseInjectable from "../../../common/k8s-api/api-base.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { urlBuilderFor } from "@k8slens/utilities"; import type { ForwardedPort } from "../port-forward-item"; 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 aa9525b31a..3d2c9499d6 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import showErrorNotificationInjectable from "../../components/notifications/show-error-notification.injectable"; import showShortInfoNotificationInjectable from "../../components/notifications/show-short-info.injectable"; import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable"; 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 977c5eb77c..be00de0861 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import { object } from "@k8slens/utilities"; import type { LensTheme } from "./lens-theme"; import resetThemeInjectable from "../../features/user-preferences/common/reset-theme.injectable"; 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 36eebb246d..8443afaea6 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 "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import type { StorageHelperDependencies, StorageHelperOptions } from "./storage-helper"; import { StorageHelper } from "./storage-helper"; 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 804fe4ebf1..e14ef274d4 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 "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logging"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import setupAppPathsInjectable from "../../app-paths/setup-app-paths.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application"; diff --git a/packages/core/src/renderer/utils/storage-helper.ts b/packages/core/src/renderer/utils/storage-helper.ts index 4ca4957bd8..6e561f7fbf 100755 --- a/packages/core/src/renderer/utils/storage-helper.ts +++ b/packages/core/src/renderer/utils/storage-helper.ts @@ -9,7 +9,7 @@ import type { Draft } from "immer"; import { produce, isDraft } from "immer"; import { isEqual, isPlainObject } from "lodash"; import assert from "assert"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logging"; export interface StorageChange { key: string; diff --git a/packages/logging/.eslintrc.js b/packages/logging/.eslintrc.js new file mode 100644 index 0000000000..19a14e85a4 --- /dev/null +++ b/packages/logging/.eslintrc.js @@ -0,0 +1,6 @@ +module.exports = { + extends: "@k8slens/eslint-config/eslint", + parserOptions: { + project: "./tsconfig.json", + }, +}; \ No newline at end of file diff --git a/packages/logging/.prettierrc b/packages/logging/.prettierrc new file mode 100644 index 0000000000..edd47b479e --- /dev/null +++ b/packages/logging/.prettierrc @@ -0,0 +1 @@ +"@k8slens/eslint-config/prettier" diff --git a/packages/logging/index.ts b/packages/logging/index.ts new file mode 100644 index 0000000000..e5431b0add --- /dev/null +++ b/packages/logging/index.ts @@ -0,0 +1,7 @@ +export { default as logErrorInjectable } from "./src/log-error.injectable"; +export { default as loggerInjectable } from "./src/logger.injectable"; +export type { Logger } from "./src/logger"; +export { default as winstonLoggerInjectable } from "./src/winston-logger.injectable"; +export { default as prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; +export { loggerTransportInjectionToken } from "./src/transports"; +export { default as loggingFeature } from "./src/feature"; diff --git a/packages/logging/jest.config.js b/packages/logging/jest.config.js new file mode 100644 index 0000000000..38d54ab7b6 --- /dev/null +++ b/packages/logging/jest.config.js @@ -0,0 +1 @@ +module.exports = require("@k8slens/jest").monorepoPackageConfig(__dirname).configForReact; diff --git a/packages/logging/package.json b/packages/logging/package.json new file mode 100644 index 0000000000..ff1d28c307 --- /dev/null +++ b/packages/logging/package.json @@ -0,0 +1,47 @@ +{ + "name": "@k8slens/logging", + "private": false, + "version": "1.0.0-alpha.1", + "description": "Lens logging", + "type": "commonjs", + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "files": [ + "dist" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/lensapp/lens.git" + }, + "main": "dist/index.js", + "types": "dist/index.d.ts", + "author": { + "name": "OpenLens Authors", + "email": "info@k8slens.dev" + }, + "license": "MIT", + "homepage": "https://github.com/lensapp/lens", + "scripts": { + "build": "webpack", + "clean": "rimraf dist/", + "dev": "webpack --mode=development --watch", + "test": "jest --coverage --runInBand", + "lint": "lens-lint", + "lint:fix": "lens-lint --fix" + }, + "peerDependencies": { + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/test-utils": "^1.0.0-alpha.0", + "@k8slens/utilities": "^1.0.0-alpha.0", + "@ogre-tools/injectable": "^15.1.2", + "react": "^17.0.2", + "winston": "^3.8.2" + }, + "devDependencies": { + "@k8slens/eslint-config": "^6.5.0-alpha.2", + "@k8slens/jest": "^6.5.0-alpha.4", + "@k8slens/typescript": "^6.5.0-alpha.2" + } +} diff --git a/packages/logging/src/feature.ts b/packages/logging/src/feature.ts new file mode 100644 index 0000000000..4bda5e853b --- /dev/null +++ b/packages/logging/src/feature.ts @@ -0,0 +1,18 @@ +import { getFeature } from "@k8slens/feature-core"; +import logErrorInjectable from "./log-error.injectable"; +import loggerInjectable from "./logger.injectable"; +import prefixedLoggerInjectable from "./prefixed-logger.injectable"; +import winstonLoggerInjectable from "./winston-logger.injectable"; + +export const loggingFeature = getFeature({ + id: "logging", + + register: (di) => { + di.register(logErrorInjectable); + di.register(loggerInjectable); + di.register(prefixedLoggerInjectable); + di.register(winstonLoggerInjectable); + }, +}); + +export default loggingFeature; diff --git a/packages/core/src/common/log-error.global-override-for-injectable.ts b/packages/logging/src/log-error.global-override-for-injectable.ts similarity index 100% rename from packages/core/src/common/log-error.global-override-for-injectable.ts rename to packages/logging/src/log-error.global-override-for-injectable.ts diff --git a/packages/core/src/common/log-error.injectable.ts b/packages/logging/src/log-error.injectable.ts similarity index 100% rename from packages/core/src/common/log-error.injectable.ts rename to packages/logging/src/log-error.injectable.ts diff --git a/packages/core/src/common/logger.global-override-for-injectable.ts b/packages/logging/src/logger.global-override-for-injectable.ts similarity index 100% rename from packages/core/src/common/logger.global-override-for-injectable.ts rename to packages/logging/src/logger.global-override-for-injectable.ts diff --git a/packages/core/src/common/logger.injectable.ts b/packages/logging/src/logger.injectable.ts similarity index 100% rename from packages/core/src/common/logger.injectable.ts rename to packages/logging/src/logger.injectable.ts diff --git a/packages/core/src/common/logger.ts b/packages/logging/src/logger.ts similarity index 99% rename from packages/core/src/common/logger.ts rename to packages/logging/src/logger.ts index ad81271bfa..5de5f3b628 100644 --- a/packages/core/src/common/logger.ts +++ b/packages/logging/src/logger.ts @@ -3,7 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ - export interface Logger { info: (message: string, ...args: any) => void; error: (message: string, ...args: any) => void; diff --git a/packages/core/src/common/logger/prefixed-logger.injectable.ts b/packages/logging/src/prefixed-logger.injectable.ts similarity index 91% rename from packages/core/src/common/logger/prefixed-logger.injectable.ts rename to packages/logging/src/prefixed-logger.injectable.ts index 36f86c532f..1e88da00bb 100644 --- a/packages/core/src/common/logger/prefixed-logger.injectable.ts +++ b/packages/logging/src/prefixed-logger.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; -import type { Logger } from "../logger"; -import loggerInjectable from "../logger.injectable"; +import type { Logger } from "./logger"; +import loggerInjectable from "./logger.injectable"; const prefixedLoggerInjectable = getInjectable({ id: "prefixed-logger", diff --git a/packages/core/src/common/logger/transports.ts b/packages/logging/src/transports.ts similarity index 100% rename from packages/core/src/common/logger/transports.ts rename to packages/logging/src/transports.ts diff --git a/packages/core/src/common/winston-logger.global-override-for-injectable.ts b/packages/logging/src/winston-logger.global-override-for-injectable.ts similarity index 54% rename from packages/core/src/common/winston-logger.global-override-for-injectable.ts rename to packages/logging/src/winston-logger.global-override-for-injectable.ts index 3d55f914dd..b4a709fc79 100644 --- a/packages/core/src/common/winston-logger.global-override-for-injectable.ts +++ b/packages/logging/src/winston-logger.global-override-for-injectable.ts @@ -8,16 +8,20 @@ import { getGlobalOverride } from "@k8slens/test-utils"; import { noop } from "@k8slens/utilities"; import winstonLoggerInjectable from "./winston-logger.injectable"; -export default getGlobalOverride(winstonLoggerInjectable, () => ({ - log: noop, - add: noop, - remove: noop, - clear: noop, - close: noop, +export default getGlobalOverride( + winstonLoggerInjectable, + () => + ({ + log: noop, + add: noop, + remove: noop, + clear: noop, + close: noop, - warn: noop, - debug: noop, - error: noop, - info: noop, - silly: noop, -}) as winston.Logger); + warn: noop, + debug: noop, + error: noop, + info: noop, + silly: noop, + } as winston.Logger), +); diff --git a/packages/core/src/common/winston-logger.injectable.ts b/packages/logging/src/winston-logger.injectable.ts similarity index 88% rename from packages/core/src/common/winston-logger.injectable.ts rename to packages/logging/src/winston-logger.injectable.ts index 481d520fac..e57baf03c3 100644 --- a/packages/core/src/common/winston-logger.injectable.ts +++ b/packages/logging/src/winston-logger.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { createLogger, format } from "winston"; -import { loggerTransportInjectionToken } from "./logger/transports"; +import { loggerTransportInjectionToken } from "./transports"; const winstonLoggerInjectable = getInjectable({ id: "winston-logger", diff --git a/packages/logging/tsconfig.json b/packages/logging/tsconfig.json new file mode 100644 index 0000000000..1819203dc1 --- /dev/null +++ b/packages/logging/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "@k8slens/typescript/config/base.json", + "include": ["**/*.ts"] +} diff --git a/packages/logging/webpack.config.js b/packages/logging/webpack.config.js new file mode 100644 index 0000000000..b54738d0a7 --- /dev/null +++ b/packages/logging/webpack.config.js @@ -0,0 +1 @@ +module.exports = require("@k8slens/webpack").configForReact; \ No newline at end of file diff --git a/packages/open-lens/src/main/index.ts b/packages/open-lens/src/main/index.ts index 21d668392f..d9362ad25e 100644 --- a/packages/open-lens/src/main/index.ts +++ b/packages/open-lens/src/main/index.ts @@ -11,6 +11,7 @@ import { registerFeature } from "@k8slens/feature-core"; import { applicationFeature, startApplicationInjectionToken } from '@k8slens/application' import { applicationFeatureForElectronMain } from '@k8slens/application-for-electron-main' import { messagingFeatureForMain } from "@k8slens/messaging-for-main"; +import { loggingFeature } from "@k8slens/logging"; const environment = "main"; @@ -23,7 +24,13 @@ registerMobX(di); runInAction(() => { registerLensCore(di, environment); - registerFeature(di, applicationFeature, applicationFeatureForElectronMain, messagingFeatureForMain); + registerFeature( + di, + applicationFeature, + applicationFeatureForElectronMain, + messagingFeatureForMain, + loggingFeature + ); try { autoRegister({ diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts index 5e7c2f0776..9f5b846a84 100644 --- a/packages/open-lens/src/renderer/index.ts +++ b/packages/open-lens/src/renderer/index.ts @@ -20,6 +20,7 @@ import { registerInjectableReact } from "@ogre-tools/injectable-react"; import { messagingFeatureForRenderer } from "@k8slens/messaging-for-renderer"; import { keyboardShortcutsFeature } from "@k8slens/keyboard-shortcuts"; import { reactApplicationFeature } from "@k8slens/react-application"; +import { loggingFeature } from "@k8slens/logging"; const environment = "renderer"; @@ -38,7 +39,8 @@ runInAction(() => { messagingFeatureForRenderer, keyboardShortcutsFeature, reactApplicationFeature, - metricsFeature + metricsFeature, + loggingFeature, ); autoRegister({