From 66f28046b9e195cb6320efa0819d09c648d005df Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 2 May 2023 19:13:52 +0200 Subject: [PATCH] @k8slens/logger Signed-off-by: Gabriel --- package-lock.json | 80 +++++++++++++++++++ packages/core/package.json | 4 + .../common/cluster/create-can-i.injectable.ts | 2 +- ...t-namespace-list-permissions.injectable.ts | 2 +- packages/core/src/common/ipc/ipc.ts | 2 +- .../k8s-api/__tests__/api-manager.test.ts | 2 +- .../kube-api-version-detection.test.ts | 2 +- ...create-custom-resource-store.injectable.ts | 2 +- .../k8s-api/create-json-api.injectable.ts | 2 +- .../create-kube-api-for-cluster.injectable.ts | 2 +- ...-kube-api-for-remote-cluster.injectable.ts | 2 +- .../k8s-api/create-kube-api.injectable.ts | 2 +- .../create-kube-json-api.injectable.ts | 2 +- .../cluster-role-binding.api.injectable.ts | 2 +- .../endpoints/cluster-role.api.injectable.ts | 2 +- .../endpoints/cluster.api.injectable.ts | 2 +- .../component-status.api.injectable.ts | 2 +- .../endpoints/config-map.api.injectable.ts | 2 +- .../endpoints/cron-job.api.injectable.ts | 2 +- ...stom-resource-definition.api.injectable.ts | 2 +- .../endpoints/daemon-set.api.injectable.ts | 2 +- .../endpoints/deployment.api.injectable.ts | 2 +- .../endpoints/endpoint.api.injectable.ts | 2 +- .../endpoints/events.api.injectable.ts | 2 +- ...orizontal-pod-autoscaler.api.injectable.ts | 2 +- .../endpoints/ingress-class.api.injectable.ts | 2 +- .../endpoints/ingress.api.injectable.ts | 2 +- .../k8s-api/endpoints/job.api.injectable.ts | 2 +- .../k8s-api/endpoints/lease.api.injectable.ts | 2 +- .../endpoints/limit-range.api.injectable.ts | 2 +- ...ng-webhook-configuration-api.injectable.ts | 2 +- .../endpoints/namespace.api.injectable.ts | 2 +- .../network-policy.api.injectable.ts | 2 +- .../k8s-api/endpoints/node.api.injectable.ts | 2 +- .../persistent-volume-claim.api.injectable.ts | 2 +- .../persistent-volume.api.injectable.ts | 2 +- .../pod-disruption-budget.api.injectable.ts | 2 +- .../endpoints/pod-metrics.api.injectable.ts | 2 +- .../pod-security-policy.api.injectable.ts | 2 +- .../k8s-api/endpoints/pod.api.injectable.ts | 2 +- .../priority-class.api.injectable.ts | 2 +- .../endpoints/replica-set.api.injectable.ts | 2 +- .../replication-controller.api.injectable.ts | 2 +- .../resource-quota.api.injectable.ts | 2 +- .../endpoints/role-binding.api.injectable.ts | 2 +- .../k8s-api/endpoints/role.api.injectable.ts | 2 +- .../endpoints/runtime-class.api.injectable.ts | 2 +- .../endpoints/secret.api.injectable.ts | 2 +- ...lf-subject-rules-reviews.api.injectable.ts | 2 +- .../service-account.api.injectable.ts | 2 +- .../endpoints/service.api.injectable.ts | 2 +- .../endpoints/stateful-set.api.injectable.ts | 2 +- .../endpoints/storage-class.api.injectable.ts | 2 +- ...ng-webhook-configuration-api.injectable.ts | 2 +- .../vertical-pod-autoscaler.api.injectable.ts | 2 +- packages/core/src/common/k8s-api/json-api.ts | 2 +- packages/core/src/common/k8s-api/kube-api.ts | 2 +- .../src/common/k8s-api/kube-object.store.ts | 2 +- .../k8s/create-resource-stack.injectable.ts | 2 +- .../core/src/common/k8s/resource-stack.ts | 2 +- .../core/src/common/log-error.injectable.ts | 2 +- .../logger.global-override-for-injectable.ts | 2 +- .../persistent-storage/create.injectable.ts | 2 +- .../migrations.injectable.ts | 2 +- .../src/common/protocol-handler/router.ts | 2 +- ...n-logger.global-override-for-injectable.ts | 2 +- .../core/src/extensions/common-api/index.ts | 4 +- .../core/src/extensions/common-api/k8s-api.ts | 2 +- .../extension-discovery.injectable.ts | 2 +- .../extension-discovery.ts | 2 +- ...ion-installation-state-store.injectable.ts | 2 +- .../extension-installation-state-store.ts | 2 +- .../extension-loader.injectable.ts | 2 +- .../extension-loader/extension-loader.ts | 2 +- .../install-extension.injectable.ts | 2 +- packages/core/src/extensions/ipc/ipc-main.ts | 4 +- .../src/extensions/lens-main-extension.ts | 2 +- .../src/extensions/lens-renderer-extension.ts | 2 +- ...open-documentation-menu-item.injectable.ts | 2 +- .../open-support-item.injectable.ts | 2 +- .../check-for-platform-updates.injectable.ts | 2 +- .../check-for-platform-updates.test.ts | 2 +- .../download-platform-update.injectable.ts | 2 +- .../download-platform-update.test.ts | 2 +- .../darwin-request-system-cas.injectable.ts | 2 +- .../win32-request-system-cas.injectable.ts | 2 +- .../storage/common/storage.injectable.ts | 2 +- ...est-public-helm-repositories.injectable.ts | 2 +- ...e-helm-repositories-in-preferences.test.ts | 4 +- .../common/create-hotbar.injectable.ts | 2 +- .../features/hotbar/storage/common/hotbar.ts | 2 +- .../storage/main/5.0.0-beta.10.injectable.ts | 2 +- .../hotbar/storage/storage-technical.test.ts | 4 +- .../population-of-logs-to-a-file.test.ts | 2 +- .../close-renderer-log-file-id.test.ts | 2 +- .../close-renderer-log-file.injectable.ts | 2 +- .../renderer/ipc-transport.injectable.ts | 2 +- .../discover-sync-kind.injectable.ts | 2 +- .../kubeconfig-sync/kubeconfig-sync.tsx | 4 +- ...mpute-unix-shell-environment.injectable.ts | 2 +- .../shell-sync/main/setup-shell.injectable.ts | 2 +- .../common/storage.injectable.ts | 2 +- .../main/5.0.3-beta.1.injectable.ts | 2 +- .../main/__test__/kubeconfig-manager.test.ts | 4 +- .../persist-state-to-config.injectable.ts | 2 +- .../kubeconfig-sync/logger.injectable.ts | 2 +- .../kubeconfig-sync/manager.ts | 2 +- .../broadcast-connection-update.injectable.ts | 2 +- .../cluster/cluster-connection.injectable.ts | 4 +- .../src/main/cluster/manager.injectable.ts | 2 +- packages/core/src/main/cluster/manager.ts | 2 +- .../prometheus-handler.injectable.ts | 2 +- .../prometheus-handler/prometheus-handler.ts | 2 +- .../request-api-resources.injectable.ts | 2 +- .../3.6.0-beta.1.injectable.ts | 2 +- .../5.0.0-beta.13.injectable.ts | 2 +- .../store-migrations/snap.injectable.ts | 2 +- .../setup-deep-linking.injectable.ts | 2 +- ...s-in-development-environment.injectable.ts | 2 +- .../setup-ipc-main-handlers.injectable.ts | 2 +- ...-visibility-after-activation.injectable.ts | 2 +- packages/core/src/main/getDiForUnitTesting.ts | 6 +- .../helm/helm-chart-manager.injectable.ts | 2 +- .../core/src/main/helm/helm-chart-manager.ts | 2 +- .../delete-helm-release.injectable.ts | 2 +- .../get-helm-release-history.injectable.ts | 2 +- .../get-helm-release-values.injectable.ts | 2 +- .../get-helm-release.injectable.ts | 2 +- .../list-helm-releases.injectable.ts | 2 +- .../rollback-helm-release.injectable.ts | 2 +- .../update-helm-release.injectable.ts | 2 +- .../add-helm-repository.injectable.ts | 2 +- ...get-active-helm-repositories.injectable.ts | 2 +- .../remove-helm-repository.injectable.ts | 2 +- .../create-kube-auth-proxy.injectable.ts | 2 +- .../kubeconfig-manager.injectable.ts | 2 +- .../kubeconfig-manager/kubeconfig-manager.ts | 2 +- .../main/kubectl/create-kubectl.injectable.ts | 2 +- packages/core/src/main/kubectl/kubectl.ts | 2 +- .../main/lens-proxy/lens-proxy.injectable.ts | 2 +- .../core/src/main/lens-proxy/lens-proxy.ts | 2 +- .../shell-api-request.injectable.ts | 2 +- .../logger/console-transport.injectable.ts | 2 +- .../main/logger/file-transport.injectable.ts | 2 +- .../src/main/logger/log-on-quit.injectable.ts | 2 +- .../main/logger/log-on-start.injectable.ts | 2 +- .../lens-protocol-router-main.injectable.ts | 2 +- .../create-resource-applier.injectable.ts | 2 +- .../main/resource-applier/resource-applier.ts | 2 +- .../create-handler-for-route.injectable.ts | 2 +- .../routes/files/production.injectable.ts | 2 +- .../metrics/add-metrics-route.injectable.ts | 2 +- .../create-port-forward.injectable.ts | 2 +- .../functionality/port-forward.ts | 2 +- .../start-port-forward-route.injectable.ts | 2 +- ...p-current-port-forward-route.injectable.ts | 2 +- .../local-shell-session/open.injectable.ts | 2 +- .../node-shell-session/open.injectable.ts | 2 +- .../src/main/shell-session/shell-session.ts | 2 +- .../create-electron-window.injectable.ts | 2 +- .../clean-up-shell-sessions.injectable.ts | 2 +- .../initialize-extensions.injectable.ts | 2 +- .../runnables/setup-lens-proxy.injectable.ts | 2 +- .../electron-tray/electron-tray.injectable.ts | 2 +- .../utils/get-port-from-stream.injectable.ts | 2 +- .../api/catalog/entity/registry.injectable.ts | 2 +- .../renderer/api/catalog/entity/registry.ts | 2 +- .../api/create-terminal-api.injectable.ts | 2 +- .../core/src/renderer/api/terminal-api.ts | 2 +- .../runnables/listen-unload.injectable.ts | 2 +- ...setup-auto-crd-api-creations.injectable.ts | 2 +- ...es-cluster-context-menu-open.injectable.ts | 2 +- .../renderer/components/catalog/catalog.tsx | 4 +- .../cluster-frame-handler.injectable.ts | 2 +- .../cluster-manager/cluster-frame-handler.ts | 2 +- .../cluster-overview-store.injectable.ts | 2 +- .../details.tsx | 4 +- .../store.injectable.ts | 2 +- .../config-leases/store.injectable.ts | 2 +- .../limit-range-details.tsx | 4 +- .../config-limit-ranges/store.injectable.ts | 2 +- .../config-maps/config-map-details.tsx | 2 +- .../config-maps/store.injectable.ts | 2 +- ...-webhook-configuration-store.injectable.ts | 2 +- .../pod-distruption-budgets.test.tsx | 2 +- .../store.injectable.ts | 2 +- .../store.injectable.ts | 2 +- .../resource-quota-details.tsx | 4 +- .../store.injectable.ts | 2 +- .../store.injectable.ts | 2 +- .../config-secrets/secret-details.tsx | 4 +- .../config-secrets/store.injectable.ts | 2 +- ...-webhook-configuration-store.injectable.ts | 2 +- .../store.injectable.ts | 2 +- .../vpa-details.tsx | 4 +- .../custom-resources/crd-details.tsx | 4 +- .../custom-resources/crd-resource-details.tsx | 2 +- .../definition.store.injectable.ts | 2 +- .../user-templates.injectable.ts | 2 +- .../components/dock/create-resource/view.tsx | 4 +- .../dock/logs/download-all-logs.injectable.ts | 2 +- .../terminal/create-terminal.injectable.ts | 2 +- .../dock/terminal/send-command.injectable.ts | 2 +- .../components/dock/terminal/terminal.ts | 2 +- .../components/events/event-details.tsx | 4 +- .../components/events/kube-event-details.tsx | 4 +- .../components/events/store.injectable.ts | 2 +- .../attempt-install-by-info.injectable.tsx | 2 +- ...ate-temp-files-and-validate.injectable.tsx | 2 +- .../unpack-extension.injectable.tsx | 2 +- .../get-base-registry-url.injectable.tsx | 2 +- ...nstall-extension-from-input.injectable.tsx | 2 +- .../extensions/install-on-drop.injectable.ts | 2 +- .../read-file-notify.injectable.ts | 2 +- .../uninstall-extension.injectable.tsx | 2 +- .../renderer/components/icon/icon.test.tsx | 4 +- .../src/renderer/components/icon/icon.tsx | 4 +- .../components/input/drop-file-input.tsx | 4 +- .../kube-object-meta/kube-object-meta.tsx | 4 +- .../kubeconfig-dialog/open.injectable.ts | 2 +- .../monaco-editor/monaco-editor.tsx | 4 +- .../namespaces/namespace-details.tsx | 4 +- .../components/namespaces/store.injectable.ts | 2 +- .../network-endpoints/endpoint-details.tsx | 4 +- .../network-endpoints/store.injectable.ts | 2 +- .../ingress-class-store.injectable.ts | 2 +- .../network-ingresses/ingress-details.tsx | 4 +- .../ingress-store.injectable.ts | 2 +- .../network-policy-details.tsx | 4 +- .../network-policies/store.injectable.ts | 2 +- .../service-details-endpoint.tsx | 4 +- .../network-services/service-details.tsx | 4 +- .../service-port-component.tsx | 4 +- .../network-services/store.injectable.ts | 2 +- .../src/renderer/components/nodes/details.tsx | 4 +- .../components/nodes/store.injectable.ts | 2 +- .../show-checked-error.injectable.ts | 2 +- .../pod-security-policy-details.tsx | 4 +- .../pod-security-policies/store.injectable.ts | 2 +- ...status-bar-item-registrator.injectable.tsx | 4 +- .../storage-classes/storage-class-details.tsx | 4 +- .../storage-classes/store.injectable.ts | 2 +- .../storage-volume-claims/store.injectable.ts | 2 +- .../volume-claim-details.tsx | 4 +- .../storage-volumes/store.injectable.ts | 2 +- .../storage-volumes/volume-details.tsx | 4 +- .../cluster-role-bindings/store.injectable.ts | 2 +- .../cluster-roles/store.injectable.ts | 2 +- .../role-bindings/store.injectable.ts | 2 +- .../user-management/roles/store.injectable.ts | 2 +- .../service-accounts/store.injectable.ts | 2 +- .../workloads-cronjobs/store.injectable.ts | 2 +- .../daemonset-details.tsx | 4 +- .../workloads-daemonsets/store.injectable.ts | 2 +- .../deployment-details.tsx | 4 +- .../workloads-deployments/store.injectable.ts | 2 +- .../components/workloads-jobs/job-details.tsx | 4 +- .../workloads-jobs/store.injectable.ts | 2 +- .../workloads-pods/pod-container-port.tsx | 4 +- .../components/workloads-pods/pod-details.tsx | 4 +- .../workloads-pods/store.injectable.ts | 2 +- .../replicaset-details.tsx | 4 +- .../workloads-replicasets/store.injectable.ts | 2 +- ...replication-controller-store.injectable.ts | 2 +- .../statefulset-details.tsx | 4 +- .../store.injectable.ts | 2 +- .../init-cluster-frame.injectable.ts | 2 +- .../init-cluster-frame/init-cluster-frame.ts | 2 +- .../core/src/renderer/getDiForUnitTesting.tsx | 7 +- .../kube-watch-api.injectable.ts | 2 +- .../renderer/kube-watch-api/kube-watch-api.ts | 2 +- .../logger/browser-transport.injectable.ts | 2 +- ...setup-logging-for-navigation.injectable.ts | 2 +- .../open-port-forward.injectable.ts | 2 +- .../port-forward/port-forward-dialog.tsx | 4 +- .../port-forward-store.injectable.ts | 2 +- .../port-forward-store/port-forward-store.ts | 2 +- .../request-active-port-forward.injectable.ts | 2 +- ...ens-protocol-router-renderer.injectable.ts | 2 +- .../themes/apply-lens-theme.injectable.ts | 2 +- .../utils/create-storage-helper.injectable.ts | 2 +- .../initialize-state.injectable.ts | 2 +- .../core/src/renderer/utils/storage-helper.ts | 2 +- packages/logger/README.md | 19 +++++ packages/logger/index.ts | 11 +++ packages/logger/jest.config.js | 4 + packages/logger/package.json | 53 ++++++++++++ packages/logger/src/feature.ts | 17 ++++ .../src}/logger.injectable.ts | 6 +- .../{core/src/common => logger/src}/logger.ts | 0 .../src}/prefixed-logger.injectable.ts | 8 +- .../logger => logger/src}/transports.ts | 0 .../src}/winston-logger.injectable.ts | 6 +- packages/logger/tsconfig.json | 4 + packages/logger/webpack.config.js | 1 + packages/open-lens/src/main/index.ts | 11 ++- packages/open-lens/src/renderer/index.ts | 6 ++ .../application/agnostic/package.json | 1 + 298 files changed, 549 insertions(+), 339 deletions(-) create mode 100644 packages/logger/README.md create mode 100644 packages/logger/index.ts create mode 100644 packages/logger/jest.config.js create mode 100644 packages/logger/package.json create mode 100644 packages/logger/src/feature.ts rename packages/{core/src/common => logger/src}/logger.injectable.ts (84%) rename packages/{core/src/common => logger/src}/logger.ts (100%) rename packages/{core/src/common/logger => logger/src}/prefixed-logger.injectable.ts (84%) rename packages/{core/src/common/logger => logger/src}/transports.ts (100%) rename packages/{core/src/common => logger/src}/winston-logger.injectable.ts (74%) create mode 100644 packages/logger/tsconfig.json create mode 100644 packages/logger/webpack.config.js diff --git a/package-lock.json b/package-lock.json index 0740c0b58f..f3ff4d2a37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3967,6 +3967,10 @@ "resolved": "packages/list-layout", "link": true }, + "node_modules/@k8slens/logger": { + "resolved": "packages/logger", + "link": true + }, "node_modules/@k8slens/messaging": { "resolved": "packages/technical-features/messaging/agnostic", "link": true @@ -36106,6 +36110,7 @@ "@k8slens/event-emitter": "^1.0.0-alpha.1", "@k8slens/kubectl-versions": "^1.0.0-alpha.0", "@k8slens/legacy-extensions": "^1.0.0-alpha.0", + "@k8slens/logger": "^1.0.0-alpha.5", "@k8slens/legacy-global-di": "^1.0.0-alpha.0", "@k8slens/messaging": "^1.0.0-alpha.1", "@k8slens/messaging-for-main": "^1.0.0-alpha.1", @@ -36987,6 +36992,61 @@ "react": "^17.0.2" } }, + "packages/logger": { + "name": "@k8slens/logger", + "version": "1.0.0-alpha.5", + "license": "MIT", + "devDependencies": { + "@async-fn/jest": "^1.6.4", + "@k8slens/eslint-config": "6.5.0-alpha.1", + "@k8slens/react-testing-library-discovery": "^1.0.0-alpha.3", + "@testing-library/react": "^12.1.5", + "@testing-library/user-event": "^13.5.0" + }, + "peerDependencies": { + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", + "@ogre-tools/fp": "^15.3.1", + "@ogre-tools/injectable": "^15.3.1", + "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0", + "@ogre-tools/injectable-react": "^15.3.0", + "auto-bind": "^4.0.0", + "lodash": "^4.17.21", + "mobx": "^6.8.0", + "mobx-react": "^7.6.0", + "react": "^17", + "react-dom": "^17.0.2", + "winston": "^3.8.2" + } + }, + "packages/logger/node_modules/@k8slens/eslint-config": { + "version": "6.5.0-alpha.1", + "resolved": "https://registry.npmjs.org/@k8slens/eslint-config/-/eslint-config-6.5.0-alpha.1.tgz", + "integrity": "sha512-6DdfKe/iafX85GBK/UlKgz29FOIOp/UVS03bFGLyw7Vmm7pauB0FEHTAdbr3g1qG/Zcn6nxhOM3uqQyRY/uEyA==", + "dev": true, + "bin": { + "lens-lint": "bin/lint" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": ">= 5", + "@typescript-eslint/parser": ">= 5", + "eslint": ">= 7", + "eslint-config-airbnb-typescript": ">= 17", + "eslint-config-prettier": ">= 8", + "eslint-config-react-app": "^7.0.1", + "eslint-plugin-import": ">= 2", + "eslint-plugin-jest": ">= 27", + "eslint-plugin-jsx-a11y": ">= 6", + "eslint-plugin-no-unsanitized": ">= 4.0.2", + "eslint-plugin-prettier": ">= 4", + "eslint-plugin-react-hooks": ">= 4", + "eslint-plugin-security": ">= 1.6.0", + "eslint-plugin-simple-import-sort": ">= 7", + "eslint-plugin-unused-imports": ">= 2", + "eslint-plugin-xss": ">= 0.1.12", + "prettier": ">= 2" + } + }, "packages/metrics": { "name": "@k8slens/metrics", "version": "6.5.0-alpha.4", @@ -37337,6 +37397,7 @@ }, "peerDependencies": { "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/logger": "^1.0.0-alpha.5", "@k8slens/run-many": "^1.0.0-alpha.1", "@ogre-tools/fp": "^15.8.1", "@ogre-tools/injectable": "^15.8.1", @@ -41355,6 +41416,25 @@ "@k8slens/webpack": "^6.5.0-alpha.4" } }, + "@k8slens/logger": { + "version": "file:packages/logger", + "requires": { + "@async-fn/jest": "^1.6.4", + "@k8slens/eslint-config": "6.5.0-alpha.1", + "@k8slens/react-testing-library-discovery": "^1.0.0-alpha.3", + "@testing-library/react": "^12.1.5", + "@testing-library/user-event": "^13.5.0" + }, + "dependencies": { + "@k8slens/eslint-config": { + "version": "6.5.0-alpha.1", + "resolved": "https://registry.npmjs.org/@k8slens/eslint-config/-/eslint-config-6.5.0-alpha.1.tgz", + "integrity": "sha512-6DdfKe/iafX85GBK/UlKgz29FOIOp/UVS03bFGLyw7Vmm7pauB0FEHTAdbr3g1qG/Zcn6nxhOM3uqQyRY/uEyA==", + "dev": true, + "requires": {} + } + } + }, "@k8slens/messaging": { "version": "file:packages/technical-features/messaging/agnostic", "requires": { diff --git a/packages/core/package.json b/packages/core/package.json index 63f184bc80..a1afe0b675 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -316,6 +316,10 @@ "@k8slens/application": "^6.5.0-alpha.0", "@k8slens/application-for-electron-main": "^6.5.0-alpha.0", "@k8slens/button": "^1.0.0-alpha.5", + "@k8slens/error-boundary": "^1.0.0-alpha.5", + "@k8slens/resizing-anchor": "^1.0.0-alpha.5", + "@k8slens/routing": "^1.0.0-alpha.5", + "@k8slens/logger": "^1.0.0-alpha.5", "@k8slens/cluster-settings": "^6.5.0-alpha.1", "@k8slens/error-boundary": "^1.0.0-alpha.5", "@k8slens/event-emitter": "^1.0.0-alpha.1", 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..2a391af131 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/logger"; /** * 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..0236c36a28 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/logger"; 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 7465033980..4624026e1a 100644 --- a/packages/core/src/common/ipc/ipc.ts +++ b/packages/core/src/common/ipc/ipc.ts @@ -12,7 +12,7 @@ import { toJS } from "../utils/toJS"; import type { Disposer } from "@k8slens/utilities"; import { getLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; -import loggerInjectable from "../logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 f4d93240f3..2458bceeb7 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/logger"; 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 20475205fe..dcc1a50ba4 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts @@ -21,7 +21,7 @@ import directoryForKubeConfigsInjectable from "../../app-paths/directory-for-kub import apiManagerInjectable from "../api-manager/manager.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import ingressApiInjectable from "../endpoints/ingress.api.injectable"; -import loggerInjectable from "../../logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 a12ef7eb2e..5ac2d2e88f 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/logger"; import type { KubeApi } from "../kube-api"; import type { KubeObject } from "@k8slens/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..f06bdc1b11 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/logger"; import type { JsonApiConfig, JsonApiData, JsonApiDependencies, JsonApiParams } from "./json-api"; import { JsonApi } from "./json-api"; 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 62509b5fe4..54655d8ef6 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/logger"; 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 f4b98ddb44..eec85df078 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/logger"; 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..53d5b22466 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/logger"; 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..4d0b0f34a7 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/logger"; import type { JsonApiConfig, JsonApiDependencies } from "./json-api"; import { KubeJsonApi } from "./kube-json-api"; 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..ff1a6241bd 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/logger"; 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..995071c385 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/logger"; 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..0dccc01f70 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/logger"; 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..e8912604f0 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/logger"; 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..df13055610 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/logger"; 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..2c8f4dd289 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/logger"; 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..010a4c6113 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/logger"; 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 d9b89d6ca6..a21922dd87 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/logger"; 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..f9760daf10 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/logger"; 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..750ac526c8 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/logger"; 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..906b2f9127 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/logger"; 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..065f84b81a 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/logger"; 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..d444312f0b 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/logger"; 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..3d89f47b58 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/logger"; 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..bffa467b70 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/logger"; 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..407fd18438 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/logger"; 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..1386b9a3a9 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/logger"; 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..3d55a9a626 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/logger"; 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..5b5cabef2f 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/logger"; 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..036a6b7c0b 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/logger"; 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..01f4751a9d 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/logger"; 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..ba2c6940a9 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/logger"; 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..382092a346 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/logger"; 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..9041c82ba0 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/logger"; 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..15d696bcab 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/logger"; 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..22ddce82e0 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/logger"; 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..934dd1d517 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/logger"; 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..fd56c5a8f2 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/logger"; 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..01421514c5 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/logger"; 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..68fef648d8 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/logger"; 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..4f9110f69a 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/logger"; 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..cde7f34e45 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/logger"; 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..9e1b197cbb 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/logger"; 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..44709339e6 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/logger"; 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..70197db2f9 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/logger"; 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..77a41f9a84 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/logger"; 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..080d799fe2 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/logger"; 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..cd03f98f86 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/logger"; 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..5405e7f3d0 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/logger"; 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..f1b6919c55 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/logger"; 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..7c2a025d51 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/logger"; 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..416e1f1714 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/logger"; 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 9b24d9cc1c..3b08a345ad 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 "@k8slens/event-emitter"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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 90d53bf966..31e5c7af39 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/logger"; import { matches } from "lodash/fp"; import { makeObservable, observable } from "mobx"; import type { ScaleCreateOptions } from "@k8slens/kube-object/src/types/scale"; 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 8be24ab5f5..b1ba6b5597 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/logger"; 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..868d195cf2 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/logger"; 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 cfad9537cf..7ad0e8088a 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 "@k8slens/legacy-global-di"; import productNameInjectable from "../vars/product-name.injectable"; import type { AsyncResult } from "@k8slens/utilities"; -import type { Logger } from "../logger"; +import type { Logger } from "@k8slens/logger"; 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/log-error.injectable.ts b/packages/core/src/common/log-error.injectable.ts index 84a77a679a..2a225fb993 100644 --- a/packages/core/src/common/log-error.injectable.ts +++ b/packages/core/src/common/log-error.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/logger"; const logErrorInjectable = getInjectable({ id: "log-error", diff --git a/packages/core/src/common/logger.global-override-for-injectable.ts b/packages/core/src/common/logger.global-override-for-injectable.ts index e314316d47..2dab067e69 100644 --- a/packages/core/src/common/logger.global-override-for-injectable.ts +++ b/packages/core/src/common/logger.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import loggerInjectable from "./logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import { getGlobalOverride } from "@k8slens/test-utils"; export default getGlobalOverride(loggerInjectable, () => ({ diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/common/persistent-storage/create.injectable.ts index da54076a5a..6522679a7e 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/logger"; 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..c160c3eacb 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/logger"; 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..5e265ed0a9 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/logger"; 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/winston-logger.global-override-for-injectable.ts b/packages/core/src/common/winston-logger.global-override-for-injectable.ts index 3d55f914dd..6dd47b8f9f 100644 --- a/packages/core/src/common/winston-logger.global-override-for-injectable.ts +++ b/packages/core/src/common/winston-logger.global-override-for-injectable.ts @@ -6,7 +6,7 @@ import type winston from "winston"; import { getGlobalOverride } from "@k8slens/test-utils"; import { noop } from "@k8slens/utilities"; -import winstonLoggerInjectable from "./winston-logger.injectable"; +import { winstonLoggerInjectable } from "@k8slens/logger"; export default getGlobalOverride(winstonLoggerInjectable, () => ({ log: noop, diff --git a/packages/core/src/extensions/common-api/index.ts b/packages/core/src/extensions/common-api/index.ts index a1c6681b9d..9efb4e33a7 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/logger"; import { asLegacyGlobalForExtensionApi } from "@k8slens/legacy-global-di"; // 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/logger"; 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 d579e0a86e..a8c5a59d99 100644 --- a/packages/core/src/extensions/common-api/k8s-api.ts +++ b/packages/core/src/extensions/common-api/k8s-api.ts @@ -21,7 +21,7 @@ import type { DerivedKubeApiOptions, KubeApiDependencies, KubeApiOptions } from import { KubeApi as InternalKubeApi } from "../../common/k8s-api/kube-api"; import clusterFrameContextForNamespacedResourcesInjectable from "../../renderer/cluster-frame-context/for-namespaced-resources.injectable"; import type { ClusterContext } from "../../renderer/cluster-frame-context/cluster-frame-context"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import maybeKubeApiInjectable from "../../common/k8s-api/maybe-kube-api.injectable"; import { DeploymentApi as InternalDeploymentApi, IngressApi as InternalIngressApi, NodeApi, PersistentVolumeClaimApi, PodApi } from "../../common/k8s-api/endpoints"; import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token"; 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..ae13403194 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/logger"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import watchInjectable from "../../common/fs/watch/watch.injectable"; import accessPathInjectable from "../../common/fs/access-path.injectable"; diff --git a/packages/core/src/extensions/extension-discovery/extension-discovery.ts b/packages/core/src/extensions/extension-discovery/extension-discovery.ts index 107a61f886..31ecfc04da 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/logger"; 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..080be26c8d 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/logger"; 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..fac13559ff 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/logger"; 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..51dbf01162 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/logger"; 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 fccb9014b4..591f70c25f 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 "@k8slens/event-emitter"; import type { Extension } from "./extension/extension.injectable"; -import type { Logger } from "../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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..43d4afb50e 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/logger"; 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 0012e26b50..4a710eec70 100644 --- a/packages/core/src/extensions/ipc/ipc-main.ts +++ b/packages/core/src/extensions/ipc/ipc-main.ts @@ -9,9 +9,9 @@ import type { LensMainExtension } from "../lens-main-extension"; import type { Disposer } from "@k8slens/utilities"; import { once } from "lodash"; import { ipcMainHandle } from "../../common/ipc"; -import type { Logger } from "../common-api"; +import type { Logger } from "@k8slens/logger"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di"; -import loggerInjectable from "../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 391cf71ee8..adbafd50f3 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/logger"; import navigateForExtensionInjectable from "../main/start-main-application/lens-window/navigate-for-extension.injectable"; import ensureHashedDirectoryForExtensionInjectable from "./extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable"; diff --git a/packages/core/src/extensions/lens-renderer-extension.ts b/packages/core/src/extensions/lens-renderer-extension.ts index f1fe896630..e941377347 100644 --- a/packages/core/src/extensions/lens-renderer-extension.ts +++ b/packages/core/src/extensions/lens-renderer-extension.ts @@ -39,7 +39,7 @@ import type { InstalledExtension } from "./common-api"; import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di"; import catalogCategoryRegistryInjectable from "../common/catalog/category-registry.injectable"; import catalogEntityRegistryInjectable from "../renderer/api/catalog/entity/registry.injectable"; -import loggerInjectable from "../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import getExtensionPageParametersInjectable from "../renderer/routes/get-extension-page-parameters.injectable"; import navigateToRouteInjectable from "../renderer/routes/navigate-to-route.injectable"; import routesInjectable from "../renderer/routes/routes.injectable"; 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..734adf6d47 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/logger"; 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..6dea59e6d6 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/logger"; 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..6b68a1ac02 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/logger"; 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..046c29dcf5 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/logger"; 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 94fd8b9fce..0946a26a37 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/logger"; import type { ProgressInfo } from "electron-updater"; import type { ProgressOfDownload } from "../../../common/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..94efea077b 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/logger"; 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..57dd022b3e 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/logger"; 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..aaeca73c16 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/logger"; 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..10b99cf9ed 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/logger"; import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable"; import storeMigrationVersionInjectable from "../../../../common/vars/store-migration-version.injectable"; 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..ae38d5717c 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/logger"; 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..fffd16f191 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/logger"; +import type { Logger } from "@k8slens/logger"; import requestPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/request-public-helm-repositories.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; 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..b10305e9dd 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/logger"; 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..d6030b4eaf 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/logger"; 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..bbda5d8e90 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/logger"; 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..055198a0e7 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/logger"; +import type { Logger } from "@k8slens/logger"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable"; 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..2bfa579c34 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/logger"; 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..b6815732ae 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/logger"; 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..cabe3fc9a7 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/logger"; 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..ef75f17a6d 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/logger"; import type winston from "winston"; import { MESSAGE } from "triple-beam"; 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..ca6ace0c6e 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/logger"; 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 d6a5fc718b..2d81afb508 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/logger"; +import type { Logger } from "@k8slens/logger"; import type { DiscoverAllKubeconfigSyncKinds } from "./discover-all-sync-kinds.injectable"; import type { DiscoverKubeconfigSyncKind, SyncKind } from "./discover-sync-kind.injectable"; import discoverKubeconfigSyncKindInjectable from "./discover-sync-kind.injectable"; 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..473b814465 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/logger"; 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..0d1b02471e 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/logger"; 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/user-preferences/common/storage.injectable.ts b/packages/core/src/features/user-preferences/common/storage.injectable.ts index 8350e57f97..947403c03a 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/logger"; 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..834535e8fe 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/logger"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; import type { ClusterStoreModel } from "../../../features/cluster/storage/common/storage.injectable"; import type { UserPreferencesModel, KubeconfigSyncEntry } from "../common/preferences-helpers"; diff --git a/packages/core/src/main/__test__/kubeconfig-manager.test.ts b/packages/core/src/main/__test__/kubeconfig-manager.test.ts index fb9b329b69..ad193add79 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/logger"; +import type { Logger } from "@k8slens/logger"; import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; 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..df98176906 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/logger"; 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..9de59fdaec 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/logger"; 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..b815e46f4c 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/logger"; 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..fd64c72575 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/logger"; 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..8b2046a4b1 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/logger"; 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/logger"; 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..e8e8c34e83 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/logger"; import addClusterInjectable from "../../features/cluster/storage/common/add.injectable"; import clustersInjectable from "../../features/cluster/storage/common/clusters.injectable"; import getClusterByIdInjectable from "../../features/cluster/storage/common/get-by-id.injectable"; diff --git a/packages/core/src/main/cluster/manager.ts b/packages/core/src/main/cluster/manager.ts index f52050ffa4..e49293de8e 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/logger"; 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..b1471a2f57 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/logger"; 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..81c3901750 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/logger"; 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..2dfa8c79d6 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/logger"; 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..4cf1cbb303 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/logger"; 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..292af777f9 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/logger"; 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..2352a6c2f9 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/logger"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; import type { ClusterModel } from "../../../common/cluster-types"; import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable"; 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..afa6eb459b 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/logger"; 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..8851417385 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/logger"; 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..79f9c4eedb 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/logger"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import applicationMenuItemCompositeInjectable from "../../../../features/application-menu/main/application-menu-item-composite.injectable"; import pushCatalogToRendererInjectable from "../../../catalog-sync-to-renderer/push-catalog-to-renderer.injectable"; 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..94a7ae58a7 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/logger"; import { onLoadOfApplicationInjectionToken } from "@k8slens/application"; import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable"; diff --git a/packages/core/src/main/getDiForUnitTesting.ts b/packages/core/src/main/getDiForUnitTesting.ts index d66764ed73..d01bc61d44 100644 --- a/packages/core/src/main/getDiForUnitTesting.ts +++ b/packages/core/src/main/getDiForUnitTesting.ts @@ -39,8 +39,10 @@ export function getDiForUnitTesting() { setLegacyGlobalDiForExtensionApi(di, environment); runInAction(() => { - registerFeature(di, messagingFeature, messagingTestUtils.messagingFeatureForUnitTesting); - + registerFeature(di, + messagingFeature, + messagingTestUtils.messagingFeatureForUnitTesting + ); }); di.preventSideEffects(); 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..a5eca4d0f7 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/logger"; 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..933861a040 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/logger"; 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..fd5b56674b 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/logger"; 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..1b2d173b3c 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/logger"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import type { GetHelmReleaseHistoryData } from "../get-helm-release-history.injectable"; import getHelmReleaseHistoryInjectable from "../get-helm-release-history.injectable"; 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..69cc3c259c 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/logger"; import type { Cluster } from "../../../common/cluster/cluster"; import type { GetHelmReleaseValuesData } from "../get-helm-release-values.injectable"; import getHelmReleaseValuesInjectable from "../get-helm-release-values.injectable"; 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..67786fd9d8 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/logger"; 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..2dd774390c 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/logger"; 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..73ea50885f 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/logger"; 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..ef300b4947 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/logger"; 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..5163ee8b2f 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/logger"; 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..d830a3609a 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/logger"; 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..1b6eae131c 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/logger"; 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..ad8f0b5e75 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/logger"; import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable"; import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable"; import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable"; 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..0876e1a356 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/logger"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; diff --git a/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts b/packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts index 276692c500..5cb87f8c52 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/logger"; 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..a432941438 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/logger"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import unlinkInjectable from "../../common/fs/unlink.injectable"; import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable"; diff --git a/packages/core/src/main/kubectl/kubectl.ts b/packages/core/src/main/kubectl/kubectl.ts index 1ad1a29147..3742444b3a 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/logger"; 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..dbb250c077 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/logger"; import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; import getClusterForRequestInjectable from "./get-cluster-for-request.injectable"; import kubeAuthProxyServerInjectable from "../cluster/kube-auth-proxy-server.injectable"; diff --git a/packages/core/src/main/lens-proxy/lens-proxy.ts b/packages/core/src/main/lens-proxy/lens-proxy.ts index 92624cdf44..f1b81684ac 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/logger"; 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..015035e505 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/logger"; 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..ebc8231d37 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/logger"; 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..3929e09a2d 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/logger"; 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..f6d73a61b7 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/logger"; 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..b6f982f3b3 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/logger"; import appNameInjectable from "../../common/vars/app-name.injectable"; import { buildVersionInitializable } from "../../features/vars/build-version/common/token"; import { buildVersionInitializationInjectable } from "../../features/vars/build-version/main/init.injectable"; 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..5339df2448 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/logger"; 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..50d2c71641 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/logger"; 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..639ce91eb0 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/logger"; 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..d2f2576b36 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/logger"; 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..9b45529b52 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/logger"; 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..0c9780cf7d 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/logger"; 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..11b9f11050 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/logger"; 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..837ed92014 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/logger"; 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..d576100172 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/logger"; 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..1e79912cfd 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/logger"; 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..20a868f223 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/logger"; 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..2980760efa 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/logger"; import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable"; import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable"; import spawnPtyInjectable from "../spawn-pty.injectable"; diff --git a/packages/core/src/main/shell-session/shell-session.ts b/packages/core/src/main/shell-session/shell-session.ts index 9ce5e0cb0f..caabf6eacb 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/logger"; 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..cb09c1e101 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/logger"; 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..50f571ccad 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/logger"; 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..9240193153 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/logger"; import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable"; import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; 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..22ea5b8262 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/logger"; import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; 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..44a9e18dab 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/logger"; import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters"; import trayIconInjectable from "../menu-icon/tray-icon.injectable"; import applicationDescriptionInjectable from "../../../common/vars/application-description.injectable"; 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..c938d66e7a 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/logger"; export interface GetPortFromStreamArgs { /** 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..df6d487206 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/logger"; 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..afcf308da6 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/logger"; 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..ec103375d7 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/logger"; import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable"; import defaultWebsocketApiParamsInjectable from "./default-websocket-api-params.injectable"; import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api"; diff --git a/packages/core/src/renderer/api/terminal-api.ts b/packages/core/src/renderer/api/terminal-api.ts index fadd544bb6..7e78fd4343 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/logger"; 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..4e0f4bf942 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/logger"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import frameRoutingIdInjectable from "../../frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable"; import closeRendererLogFileInjectable from "../../../features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable"; 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 b414526a40..088c01c725 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/setup-auto-crd-api-creations.injectable.ts @@ -9,7 +9,7 @@ import type { CustomResourceDefinition } from "@k8slens/kube-object"; import { KubeApi } from "../../../common/k8s-api/kube-api"; import { KubeObject } from "@k8slens/kube-object"; import maybeKubeApiInjectable from "../../../common/k8s-api/maybe-kube-api.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..176e861cd3 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/logger"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import openDeleteClusterDialogInjectable from "../../components/delete-cluster-dialog/open.injectable"; import { beforeFrameStartsSecondInjectionToken } from "../tokens"; diff --git a/packages/core/src/renderer/components/catalog/catalog.tsx b/packages/core/src/renderer/components/catalog/catalog.tsx index 9d6846d45c..769a387274 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/logger"; +import { loggerInjectable } from "@k8slens/logger"; import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable"; import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable"; import type { Navigate } from "../../navigation/navigate.injectable"; 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..3a0bd15e20 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/logger"; import getClusterByIdInjectable from "../../../features/cluster/storage/common/get-by-id.injectable"; import { ClusterFrameHandler } from "./cluster-frame-handler"; import emitClusterVisibilityInjectable from "./emit-cluster-visibility.injectable"; 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..f07a4ec2d2 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/logger"; 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/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 4fb03eec40..a01a990775 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/logger"; 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 251aa31e7c..79c9f724f4 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 } from "@k8slens/kube-object"; 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/logger"; 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/logger"; 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..ff662452fa 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/logger"; 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..0e1d009b45 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/logger"; 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 eb404b9745..88eda56510 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 "@k8slens/kube-object"; import { LimitPart, LimitRange, Resource } from "@k8slens/kube-object"; import { DrawerItem } from "../drawer/drawer-item"; import { Badge } from "../badge"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..47e6b2ebf7 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/logger"; 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 d4d65b179f..1341c91340 100644 --- a/packages/core/src/renderer/components/config-maps/config-map-details.tsx +++ b/packages/core/src/renderer/components/config-maps/config-map-details.tsx @@ -19,7 +19,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import configMapStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..de2ab0d536 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/logger"; 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..c912b6bc65 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/logger"; import mutatingWebhookConfigurationApiInjectable from "../../../common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable"; diff --git a/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx b/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx index ef0887141f..96f2590cd2 100644 --- a/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx +++ b/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx @@ -10,7 +10,7 @@ import { renderFor } from "../../test-utils/renderFor"; import { PodDisruptionBudgets } from "../pod-disruption-budgets"; import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable"; import selectedNamespacesStorageInjectable from "../../../../features/namespace-filtering/renderer/storage.injectable"; -import loggerInjectable from "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import maybeKubeApiInjectable from "../../../../common/k8s-api/maybe-kube-api.injectable"; import podDisruptionBudgetStoreInjectable from "../store.injectable"; import siblingTabsInjectable from "../../../routes/sibling-tabs.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..7f1e4f9371 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/logger"; 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..7b141d8f7f 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/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PriorityClassStore } from "./store"; 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 8c9463a660..902eaecdf0 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 "@k8slens/kube-object"; import { LineProgress } from "../line-progress"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..c20e847215 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/logger"; 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..e11066b7b8 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/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { RuntimeClassStore } from "./store"; 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 6db73c2339..be027ac6b0 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 "@k8slens/kube-object"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import type { SecretStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import secretStoreInjectable from "./store.injectable"; import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable"; import type { ShowCheckedErrorNotification } from "../notifications/show-checked-error.injectable"; 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..8f83f3b068 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/logger"; 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..5dc6b1640d 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/logger"; 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..5bffd1784c 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/logger"; import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; import verticalPodAutoscalerApiInjectable from "../../../common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; 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 51b703aa20..606fc052d9 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 "@k8slens/kube-object"; import type { PodUpdatePolicy, PodResourcePolicy, VerticalPodAutoscalerStatus } from "@k8slens/kube-object"; 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/logger"; +import type { Logger } from "@k8slens/logger"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; 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 2b2eed0198..f2c14d2ecd 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 e428e3e336..593838abaf 100644 --- a/packages/core/src/renderer/components/custom-resources/crd-resource-details.tsx +++ b/packages/core/src/renderer/components/custom-resources/crd-resource-details.tsx @@ -16,7 +16,7 @@ import type { AdditionalPrinterColumnsV1, KubeObjectMetadata, KubeObjectStatus } import { CustomResourceDefinition, KubeObject } from "@k8slens/kube-object"; import type { Logger } from "../../../common/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..24d0d63dd2 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/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { CustomResourceDefinitionStore } from "./definition.store"; 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..cf06c82320 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/logger"; 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 55c29b7642..d9fcb03c2a 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/logger"; 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/logger"; import type { ShowCheckedErrorNotification } from "../../notifications/show-checked-error.injectable"; import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable"; import showCheckedErrorNotificationInjectable from "../../notifications/show-checked-error.injectable"; 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 39a22cdc63..919c54fe3d 100644 --- a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts +++ b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { PodLogsQuery } from "@k8slens/kube-object"; import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api"; -import loggerInjectable from "../../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; import callForLogsInjectable from "./call-for-logs.injectable"; 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..954c94ee24 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/logger"; 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..881836bdf1 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/logger"; 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..ae440f31c7 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/logger"; import assert from "assert"; import { TerminalChannels } from "../../../../common/terminal/channels"; import { LinkProvider } from "xterm-link-provider"; diff --git a/packages/core/src/renderer/components/events/event-details.tsx b/packages/core/src/renderer/components/events/event-details.tsx index b6987d10f2..fdb21e9418 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 "@k8slens/kube-object"; 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/logger"; 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/logger"; 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 b9e552a23a..e07f8ef7fa 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/logger"; 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/logger"; 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 f829fa64d4..e04c04b503 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/logger"; 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..12169537d0 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/logger"; 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..1d54d852a8 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/logger"; import writeFileInjectable from "../../../../common/fs/write-file.injectable"; import joinPathsInjectable from "../../../../common/path/join-paths.injectable"; import tempDirectoryPathInjectable from "../../../../common/os/temp-directory-path.injectable"; 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..42a0ef8fda 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/logger"; 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..de9d56b132 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/logger"; import { defaultExtensionRegistryUrl } from "../../../../features/user-preferences/common/preferences-helpers"; import userPreferencesStateInjectable from "../../../../features/user-preferences/common/state.injectable"; import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable"; 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..825767d534 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/logger"; 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..dc961dd474 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/logger"; 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..28f921bbf3 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/logger"; 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..3d2f3e96a1 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/logger"; 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/icon/icon.test.tsx b/packages/core/src/renderer/components/icon/icon.test.tsx index f927caa7da..a0ac405ced 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/logger"; +import { loggerInjectable } from "@k8slens/logger"; 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..fecac2bd12 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..2dada4c947 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/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 d71344cbf3..ce8a17542e 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/logger"; 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/logger"; 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..fa66389f67 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/logger"; 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..1dc4d647e2 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/logger"; +import { loggerInjectable } from "@k8slens/logger"; import autoBindReact from "auto-bind/react"; import type { UserPreferencesState } from "../../../features/user-preferences/common/state.injectable"; import userPreferencesStateInjectable from "../../../features/user-preferences/common/state.injectable"; diff --git a/packages/core/src/renderer/components/namespaces/namespace-details.tsx b/packages/core/src/renderer/components/namespaces/namespace-details.tsx index e7f17c50c6..fe86504596 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/logger"; +import { loggerInjectable } from "@k8slens/logger"; 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..28dcb078b8 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/logger"; 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 14b95395a3..07f715245c 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 "@k8slens/kube-object"; import { EndpointSubsetList } from "./endpoint-subset-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..a4b1aa2018 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/logger"; 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..76d4a65711 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/logger"; 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 9180df159b..3b670acfc6 100644 --- a/packages/core/src/renderer/components/network-ingresses/ingress-details.tsx +++ b/packages/core/src/renderer/components/network-ingresses/ingress-details.tsx @@ -12,9 +12,9 @@ import type { ILoadBalancerIngress } from "@k8slens/kube-object"; import { Ingress, computeRuleDeclarations } from "@k8slens/kube-object"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..b88a5873ac 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/logger"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { IngressStore } from "./ingress-store"; 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 aa7ff83d8c..fc515b3dfb 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,10 +13,10 @@ 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/logger"; import { isEmpty } from "lodash"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..b421fa9bfd 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/logger"; 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 710ee9566f..b1238ecba9 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/logger"; import { Endpoints } from "@k8slens/kube-object"; import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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 78e68d17e2..88564c841f 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/logger"; 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/logger"; 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 a60e98fb4d..a18a6e38a1 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/logger"; 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/logger"; 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..6856aa1a82 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/logger"; 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 8f9c0dc8a4..6d848cce01 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 "@k8slens/kube-object"; 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/logger"; 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/logger"; 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..76ada5eeca 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/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { NodeStore } from "./store"; 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..116a647994 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/logger"; 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/pod-security-policies/pod-security-policy-details.tsx b/packages/core/src/renderer/components/pod-security-policies/pod-security-policy-details.tsx index d2be55d3f4..314b04d5c6 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 "@k8slens/kube-object"; import { Badge } from "../badge"; import { Table, TableCell, TableHead, TableRow } from "../table"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..c577c1e773 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/logger"; import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable"; import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; import { PodSecurityPolicyStore } from "./store"; 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..378240cfc8 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/logger"; +import type { Logger } from "@k8slens/logger"; const statusBarItemRegistratorInjectable = getInjectable({ id: "status-bar-item-registrator", 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 64948dd8ef..6a24dd9835 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 "@k8slens/kube-object"; 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/logger"; 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/logger"; 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 acfeee9b66..de6282f430 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-persistent-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/logger"; 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..218dd4fc83 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/logger"; 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 066c6dbfd3..2e7ef987b3 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 "@k8slens/kube-object"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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/logger"; 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..f4dd130e0a 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/logger"; 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 789cf0fad5..e52af19c60 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 "@k8slens/kube-object"; import type { KubeObjectDetailsProps } from "../kube-object-details"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; import { stopPropagation } from "@k8slens/utilities"; import { withInjectables } from "@ogre-tools/injectable-react"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; 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..907f5c2e35 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/logger"; 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..43eca5cef7 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/logger"; 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..71653016fc 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/logger"; 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..b4af40d459 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/logger"; 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..5defdd85d7 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/logger"; const serviceAccountStoreInjectable = getInjectable({ id: "service-account-store", 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 ec66e0f163..fbe1d7a004 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/logger"; 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 683c238532..6eca2c8f40 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 "@k8slens/kube-object"; import { PodDetailsList } from "../workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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/logger"; 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 e2844ec325..4ca47feb1b 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/logger"; 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 25a1e1f990..15b69df6df 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/logger"; 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/logger"; 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 16df331b82..76dc2de7b5 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/logger"; 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 b6be83cdbb..c7356d5f9f 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 "@k8slens/kube-object"; import { PodDetailsList } from "../workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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/logger"; 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 90647d8ae6..2a2d384f55 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/logger"; 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 063224d307..accd14674e 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/logger"; 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/logger"; 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 249a62534b..be31a4f258 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/logger"; 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/logger"; 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..c9aa214234 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/logger"; 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 6a244cd2b4..db6e71cf9f 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 "@k8slens/kube-object"; import { PodDetailsList } from "../workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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/logger"; 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 fdca455b52..13b28d4de7 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/logger"; const replicaSetStoreInjectable = getInjectable({ id: "replica-set-store", diff --git a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-store.injectable.ts b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-store.injectable.ts index 900ea8b605..65a9dadb01 100644 --- a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-store.injectable.ts +++ b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controller-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 "./replication-controller-store"; import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; -import loggerInjectable from "../../../common/logger.injectable"; +import { loggerInjectable } from "@k8slens/logger"; import replicationControllerApiInjectable from "../../../common/k8s-api/endpoints/replication-controller.api.injectable"; const replicationControllerStoreInjectable = getInjectable({ 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 565651034d..a4be23790a 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 "@k8slens/kube-object"; import { PodDetailsList } from "../workloads-pods/pod-details-list"; -import type { Logger } from "../../../common/logger"; +import type { Logger } from "@k8slens/logger"; 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/logger"; 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 dd3d939c0c..188903817c 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/logger"; 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/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..a852111ac4 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/logger"; 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..acc2868c50 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/logger"; interface Dependencies { hostedCluster: Cluster; diff --git a/packages/core/src/renderer/getDiForUnitTesting.tsx b/packages/core/src/renderer/getDiForUnitTesting.tsx index b5d1d4dff3..8eee494450 100644 --- a/packages/core/src/renderer/getDiForUnitTesting.tsx +++ b/packages/core/src/renderer/getDiForUnitTesting.tsx @@ -20,6 +20,7 @@ import { registerInjectableReact } from "@ogre-tools/injectable-react"; import { registerFeature } from "@k8slens/feature-core"; import { messagingFeature, testUtils as messagingTestUtils } from "@k8slens/messaging"; import { routingFeature } from "@k8slens/routing"; +import { loggerFeature } from "@k8slens/logger"; export const getDiForUnitTesting = () => { const environment = "renderer"; @@ -32,7 +33,11 @@ export const getDiForUnitTesting = () => { setLegacyGlobalDiForExtensionApi(di, environment); runInAction(() => { - registerFeature(di, messagingFeature, messagingTestUtils.messagingFeatureForUnitTesting, routingFeature); + registerFeature(di, + messagingFeature, + messagingTestUtils.messagingFeatureForUnitTesting, + routingFeature, + loggerFeature); }); di.preventSideEffects(); 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..db056e79b8 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/logger"; 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..56af7a9b11 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/logger"; 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..c6eba91b9d 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/logger"; 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 ba92110b62..ebc5d011f2 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/logger"; import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens"; import { observableHistoryInjectionToken } from "@k8slens/routing"; 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..17ff2e0932 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/logger"; import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable"; import showErrorNotificationInjectable from "../components/notifications/show-error-notification.injectable"; import type { ForwardedPort } from "./port-forward-item"; 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..938eeead58 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/logger"; 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/logger"; 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..891e93f08c 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/logger"; 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..500b3fdba3 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/logger"; 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..22611110b1 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/logger"; 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..d07dd889e2 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/logger"; import showErrorNotificationInjectable from "../../components/notifications/show-error-notification.injectable"; import showShortInfoNotificationInjectable from "../../components/notifications/show-short-info.injectable"; import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable"; 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..55910cd3c4 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/logger"; 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..b036462190 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/logger"; 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..4aa4016d63 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/logger"; 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..d798f5c1d9 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/logger"; export interface StorageChange { key: string; diff --git a/packages/logger/README.md b/packages/logger/README.md new file mode 100644 index 0000000000..67925153a4 --- /dev/null +++ b/packages/logger/README.md @@ -0,0 +1,19 @@ +# @k8slens/logger + +This package contains stuff related to creating Lens-applications. + +# Usage + +```bash +$ npm install @k8slens/logger +``` + +```typescript +import { loggerFeature } from "@k8slens/logger"; +import type { Logger } from "@k8slens/logger"; +import { loggerInjectable } from "@k8slens/logger"; +import { winstonLoggerInjectable } from "@k8slens/logger"; +import { prefixedLoggerInjectable } from "@k8slens/logger"; +``` + +## Extendability diff --git a/packages/logger/index.ts b/packages/logger/index.ts new file mode 100644 index 0000000000..952e6ee6dc --- /dev/null +++ b/packages/logger/index.ts @@ -0,0 +1,11 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +export type { Logger } from "./src/logger"; +export { loggerInjectable } from "./src/logger.injectable"; +export { prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; +export { loggerTransportInjectionToken } from "./src/transports"; +export { winstonLoggerInjectable } from "./src/winston-logger.injectable"; +export { loggerFeature } from "./src/feature"; diff --git a/packages/logger/jest.config.js b/packages/logger/jest.config.js new file mode 100644 index 0000000000..9499351d14 --- /dev/null +++ b/packages/logger/jest.config.js @@ -0,0 +1,4 @@ +const { configForReact } = + require("@k8slens/jest").monorepoPackageConfig(__dirname); + +module.exports = configForReact; diff --git a/packages/logger/package.json b/packages/logger/package.json new file mode 100644 index 0000000000..4b4a33c69e --- /dev/null +++ b/packages/logger/package.json @@ -0,0 +1,53 @@ +{ + "name": "@k8slens/logger", + "private": false, + "version": "1.0.0-alpha.5", + "description": "Highly extendable logger in the Lens.", + "type": "commonjs", + "files": [ + "dist" + ], + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "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", + "lint": "lens-lint", + "lint:fix": "lens-lint --fix" + }, + "peerDependencies": { + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", + "@ogre-tools/fp": "^15.3.1", + "@ogre-tools/injectable": "^15.3.1", + "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0", + "@ogre-tools/injectable-react": "^15.3.0", + "auto-bind": "^4.0.0", + "lodash": "^4.17.21", + "mobx": "^6.8.0", + "mobx-react": "^7.6.0", + "react": "^17", + "react-dom": "^17.0.2", + "winston": "^3.8.2" + }, + "devDependencies": { + "@async-fn/jest": "^1.6.4", + "@k8slens/eslint-config": "6.5.0-alpha.1", + "@k8slens/react-testing-library-discovery": "^1.0.0-alpha.3", + "@testing-library/react": "^12.1.5", + "@testing-library/user-event": "^13.5.0" + } +} diff --git a/packages/logger/src/feature.ts b/packages/logger/src/feature.ts new file mode 100644 index 0000000000..922a67005b --- /dev/null +++ b/packages/logger/src/feature.ts @@ -0,0 +1,17 @@ +import { getFeature } from "@k8slens/feature-core"; +import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; + +export const loggerFeature = getFeature({ + id: "logger-feature", + + register: (di) => { + autoRegister({ + di, + targetModule: module, + getRequireContexts: () => [ + require.context("./", true, /\.injectable\.(ts|tsx)$/), + ], + }); + }, + +}); diff --git a/packages/core/src/common/logger.injectable.ts b/packages/logger/src/logger.injectable.ts similarity index 84% rename from packages/core/src/common/logger.injectable.ts rename to packages/logger/src/logger.injectable.ts index e64978e44b..39828861f7 100644 --- a/packages/core/src/common/logger.injectable.ts +++ b/packages/logger/src/logger.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; -import winstonLoggerInjectable from "./winston-logger.injectable"; +import { winstonLoggerInjectable } from "./winston-logger.injectable"; -const loggerInjectable = getInjectable({ +export const loggerInjectable = getInjectable({ id: "logger", instantiate: (di): Logger => { const baseLogger = di.inject(winstonLoggerInjectable); @@ -22,5 +22,3 @@ const loggerInjectable = getInjectable({ decorable: false, }); - -export default loggerInjectable; diff --git a/packages/core/src/common/logger.ts b/packages/logger/src/logger.ts similarity index 100% rename from packages/core/src/common/logger.ts rename to packages/logger/src/logger.ts diff --git a/packages/core/src/common/logger/prefixed-logger.injectable.ts b/packages/logger/src/prefixed-logger.injectable.ts similarity index 84% rename from packages/core/src/common/logger/prefixed-logger.injectable.ts rename to packages/logger/src/prefixed-logger.injectable.ts index 36f86c532f..d0fe2e090b 100644 --- a/packages/core/src/common/logger/prefixed-logger.injectable.ts +++ b/packages/logger/src/prefixed-logger.injectable.ts @@ -3,10 +3,10 @@ * 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({ +export const prefixedLoggerInjectable = getInjectable({ id: "prefixed-logger", instantiate: (di, prefix): Logger => { const logger = di.inject(loggerInjectable); @@ -33,5 +33,3 @@ const prefixedLoggerInjectable = getInjectable({ getInstanceKey: (di, prefix: string) => prefix, }), }); - -export default prefixedLoggerInjectable; diff --git a/packages/core/src/common/logger/transports.ts b/packages/logger/src/transports.ts similarity index 100% rename from packages/core/src/common/logger/transports.ts rename to packages/logger/src/transports.ts diff --git a/packages/core/src/common/winston-logger.injectable.ts b/packages/logger/src/winston-logger.injectable.ts similarity index 74% rename from packages/core/src/common/winston-logger.injectable.ts rename to packages/logger/src/winston-logger.injectable.ts index 481d520fac..e7fbb764c3 100644 --- a/packages/core/src/common/winston-logger.injectable.ts +++ b/packages/logger/src/winston-logger.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { createLogger, format } from "winston"; -import { loggerTransportInjectionToken } from "./logger/transports"; +import { loggerTransportInjectionToken } from "./transports"; -const winstonLoggerInjectable = getInjectable({ +export const winstonLoggerInjectable = getInjectable({ id: "winston-logger", instantiate: (di) => createLogger({ @@ -14,5 +14,3 @@ const winstonLoggerInjectable = getInjectable({ transports: di.injectMany(loggerTransportInjectionToken), }), }); - -export default winstonLoggerInjectable; diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json new file mode 100644 index 0000000000..9e140d79da --- /dev/null +++ b/packages/logger/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "@k8slens/typescript/config/base.json", + "include": ["**/*.ts", "**/*.tsx"], +} diff --git a/packages/logger/webpack.config.js b/packages/logger/webpack.config.js new file mode 100644 index 0000000000..1cda407f5a --- /dev/null +++ b/packages/logger/webpack.config.js @@ -0,0 +1 @@ +module.exports = require("@k8slens/webpack").configForReact; diff --git a/packages/open-lens/src/main/index.ts b/packages/open-lens/src/main/index.ts index 21d668392f..190fbe7201 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 { loggerFeature } from "@k8slens/logger"; const environment = "main"; @@ -23,7 +24,15 @@ registerMobX(di); runInAction(() => { registerLensCore(di, environment); - registerFeature(di, applicationFeature, applicationFeatureForElectronMain, messagingFeatureForMain); + registerFeature(di, + loggerFeature, + ); + + registerFeature(di, + applicationFeature, + applicationFeatureForElectronMain, + messagingFeatureForMain, + ); try { autoRegister({ diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts index 913cd56b90..7b12c69696 100644 --- a/packages/open-lens/src/renderer/index.ts +++ b/packages/open-lens/src/renderer/index.ts @@ -22,6 +22,7 @@ import { messagingFeatureForRenderer } from "@k8slens/messaging-for-renderer"; import { keyboardShortcutsFeature } from "@k8slens/keyboard-shortcuts"; import { reactApplicationFeature } from "@k8slens/react-application"; import { routingFeature } from "@k8slens/routing"; +import { loggerFeature } from "@k8slens/logger"; const environment = "renderer"; @@ -34,6 +35,11 @@ runInAction(() => { registerInjectableReact(di); registerLensCore(di, environment); + registerFeature( + di, + loggerFeature, + ); + registerFeature( di, applicationFeature, diff --git a/packages/technical-features/application/agnostic/package.json b/packages/technical-features/application/agnostic/package.json index 5628da958a..17fc70d70e 100644 --- a/packages/technical-features/application/agnostic/package.json +++ b/packages/technical-features/application/agnostic/package.json @@ -32,6 +32,7 @@ }, "peerDependencies": { "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/logger": "^1.0.0-alpha.5", "@k8slens/run-many": "^1.0.0-alpha.1", "@ogre-tools/fp": "^15.8.1", "@ogre-tools/injectable": "^15.8.1",