chore: loggerInjectionToken

Signed-off-by: Gabriel <gaccettola@mirantis.com>
This commit is contained in:
Gabriel authored and Sebastian Malton committed 2023-05-03 14:24:14 -07:00
1 parent 66f28046b9
commit 908d6b381d
244 files changed
+533 -487

No files matched your search

@@ -8,7 +8,7 @@ import { Cluster } from "../../common/cluster/cluster";
import kubeconfigManagerInjectable from "../kubeconfig-manager/kubeconfig-manager.injectable";
import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
import type { DiContainer } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { Logger } from "@k8slens/logger";
import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
@@ -73,7 +73,7 @@ describe("kubeconfig manager tests", () => {
silly: jest.fn(),
};
di.override(loggerInjectable, () => loggerMock);
di.override(loggerInjectionToken, () => loggerMock);
ensureServerMock = asyncFn();
@@ -4,12 +4,12 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { persistStateToConfigInjectionToken } from "../../common/persistent-storage/save-to-file";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
const persistStateToConfigInjectable = getInjectable({
id: "persist-state-to-config",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return (config, state) => {
logger.info(`[BASE-STORE]: saving ${config.path}...`);
@@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import type { KubeAuthUpdate } from "../../common/cluster-types";
import type { Cluster } from "../../common/cluster/cluster";
import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
export type BroadcastConnectionUpdate = (update: KubeAuthUpdate) => void;
@@ -14,7 +14,7 @@ const broadcastConnectionUpdateInjectable = getInjectable({
id: "broadcast-connection-update",
instantiate: (di, cluster): BroadcastConnectionUpdate => {
const broadcastMessage = di.inject(broadcastMessageInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return (update) => {
logger.debug(`[CLUSTER]: broadcasting connection update`, { ...update, meta: cluster.getMeta() });
@@ -25,7 +25,7 @@ import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injec
import createListNamespacesInjectable from "../../common/cluster/list-namespaces.injectable";
import kubeAuthProxyServerInjectable from "./kube-auth-proxy-server.injectable";
import loadProxyKubeconfigInjectable from "./load-proxy-kubeconfig.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import prometheusHandlerInjectable from "./prometheus-handler/prometheus-handler.injectable";
import removeProxyKubeconfigInjectable from "./remove-proxy-kubeconfig.injectable";
import requestApiResourcesInjectable from "./request-api-resources.injectable";
@@ -407,7 +407,7 @@ const clusterConnectionInjectable = getInjectable({
{
clusterVersionDetector: di.inject(clusterVersionDetectorInjectable),
kubeAuthProxyServer: di.inject(kubeAuthProxyServerInjectable, cluster),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
prometheusHandler: di.inject(prometheusHandlerInjectable, cluster),
broadcastConnectionUpdate: di.inject(broadcastConnectionUpdateInjectable, cluster),
broadcastMessage: di.inject(broadcastMessageInjectable),
@@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import addClusterInjectable from "../../features/cluster/storage/common/add.injectable";
import clustersInjectable from "../../features/cluster/storage/common/clusters.injectable";
import getClusterByIdInjectable from "../../features/cluster/storage/common/get-by-id.injectable";
@@ -22,7 +22,7 @@ const clusterManagerInjectable = getInjectable({
catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
clustersThatAreBeingDeleted: di.inject(clustersThatAreBeingDeletedInjectable),
visibleCluster: di.inject(visibleClusterInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
addCluster: di.inject(addClusterInjectable),
clusters: di.inject(clustersInjectable),
getClusterById: di.inject(getClusterByIdInjectable),
@@ -7,7 +7,7 @@ import type { Cluster } from "../../../common/cluster/cluster";
import { createClusterPrometheusHandler } from "./prometheus-handler";
import getPrometheusProviderByKindInjectable from "../../prometheus/get-by-kind.injectable";
import prometheusProvidersInjectable from "../../prometheus/providers.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import loadProxyKubeconfigInjectable from "../load-proxy-kubeconfig.injectable";
const prometheusHandlerInjectable = getInjectable({
@@ -17,7 +17,7 @@ const prometheusHandlerInjectable = getInjectable({
{
getPrometheusProviderByKind: di.inject(getPrometheusProviderByKindInjectable),
prometheusProviders: di.inject(prometheusProvidersInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
loadProxyKubeconfig: di.inject(loadProxyKubeconfigInjectable, cluster),
},
cluster,
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { KubeApiResource } from "../../common/rbac";
import type { Cluster } from "../../common/cluster/cluster";
import { apiVersionsRequesterInjectionToken } from "./api-versions-requester";
@@ -24,7 +24,7 @@ export interface KubeResourceListGroup {
const requestApiResourcesInjectable = getInjectable({
id: "request-api-resources",
instantiate: (di): RequestApiResources => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const apiVersionRequesters = di.injectMany(apiVersionsRequesterInjectionToken)
.sort(byOrderNumber);
const requestKubeApiResourcesFor = di.inject(requestKubeApiResourcesForInjectable);
@@ -20,7 +20,7 @@ interface Pre360ClusterModel extends ClusterModel {
import { getInjectable } from "@ogre-tools/injectable";
import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token";
import readFileBufferSyncInjectable from "../../../common/fs/read-file-buffer-sync.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import writeFileSyncInjectable from "../../../common/fs/write-file-sync.injectable";
const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
@@ -31,7 +31,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
const readFileSync = di.inject(readFileSyncInjectable);
const readFileBufferSync = di.inject(readFileBufferSyncInjectable);
const joinPaths = di.inject(joinPathsInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const writeFileSync = di.inject(writeFileSyncInjectable);
return {
@@ -9,7 +9,7 @@ import directoryForUserDataInjectable from "../../../common/app-paths/directory-
import { isDefined } from "@k8slens/utilities";
import joinPathsInjectable from "../../../common/path/join-paths.injectable";
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token";
import { generateNewIdFor } from "../../../common/utils/generate-new-id-for";
@@ -77,7 +77,7 @@ const v500Beta13ClusterStoreMigrationInjectable = getInjectable({
instantiate: (di) => {
const userDataPath = di.inject(directoryForUserDataInjectable);
const joinPaths = di.inject(joinPathsInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const moveStorageFolder = ({ folder, newId, oldId }: { folder: string; newId: string; oldId: string }): void => {
const oldPath = joinPaths(folder, `${oldId}.json`);
@@ -7,7 +7,7 @@
import { getInjectable } from "@ogre-tools/injectable";
import { clusterStoreMigrationInjectionToken } from "../../../features/cluster/storage/common/migration-token";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";
import type { ClusterModel } from "../../../common/cluster-types";
import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.injectable";
@@ -17,7 +17,7 @@ const clusterStoreSnapMigrationInjectable = getInjectable({
id: "cluster-store-snap-migration",
instantiate: (di) => {
const { version } = di.inject(applicationInformationToken);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const isSnapPackage = di.inject(isSnapPackageInjectable);
const pathExistsSync = di.inject(pathExistsSyncInjectable);
@@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable";
import electronAppInjectable from "../electron-app.injectable";
import openDeepLinkInjectable from "../../protocol-handler/lens-protocol-router-main/open-deep-link-for-url/open-deep-link.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable";
import { startsWith, toLower } from "lodash/fp";
import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
@@ -17,7 +17,7 @@ const setupDeepLinkingInjectable = getInjectable({
instantiate: (di) => ({
run: async () => {
const app = di.inject(electronAppInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const openDeepLinkForUrl = di.inject(openDeepLinkInjectable);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const firstInstanceCommandLineArguments = di.inject(commandLineArgumentsInjectable);
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { nodeEnvInjectionToken } from "../../../common/vars/node-env-injection-token";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({
@@ -12,7 +12,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({
instantiate: (di) => ({
run: () => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const nodeEnv = di.inject(nodeEnvInjectionToken);
if (nodeEnv !== "development") {
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { setupIpcMainHandlers } from "./setup-ipc-main-handlers";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
import applicationMenuItemCompositeInjectable from "../../../../features/application-menu/main/application-menu-item-composite.injectable";
import pushCatalogToRendererInjectable from "../../../catalog-sync-to-renderer/push-catalog-to-renderer.injectable";
@@ -17,7 +17,7 @@ const setupIpcMainHandlersInjectable = getInjectable({
instantiate: (di) => ({
run: () => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
logger.debug("[APP-MAIN] initializing ipc main handlers");
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import electronAppInjectable from "../electron-app.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
@@ -15,7 +15,7 @@ const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({
run: () => {
const app = di.inject(electronAppInjectable);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
app.on("activate", (_, windowIsVisible) => {
logger.info("APP:ACTIVATE", { hasVisibleWindows: windowIsVisible });
@@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import type { HelmRepo } from "../../common/helm/helm-repo";
import { HelmChartManager } from "./helm-chart-manager";
import helmChartManagerCacheInjectable from "./helm-chart-manager-cache.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import execHelmInjectable from "./exec-helm/exec-helm.injectable";
import readFileInjectable from "../../common/fs/read-file.injectable";
import statInjectable from "../../common/fs/stat.injectable";
@@ -16,7 +16,7 @@ const helmChartManagerInjectable = getInjectable({
instantiate: (di, repo: HelmRepo) => new HelmChartManager({
cache: di.inject(helmChartManagerCacheInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
execHelm: di.inject(execHelmInjectable),
readFile: di.inject(readFileInjectable),
stat: di.inject(statInjectable),
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import type { DeleteHelmReleaseData } from "../delete-helm-release.injectable";
import deleteHelmReleaseInjectable from "../delete-helm-release.injectable";
@@ -13,7 +13,7 @@ const deleteClusterHelmReleaseInjectable = getInjectable({
id: "delete-cluster-helm-release",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable);
return async (cluster: Cluster, data: DeleteHelmReleaseData) => {
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import type { GetHelmReleaseHistoryData } from "../get-helm-release-history.injectable";
import getHelmReleaseHistoryInjectable from "../get-helm-release-history.injectable";
@@ -13,7 +13,7 @@ const getClusterHelmReleaseHistoryInjectable = getInjectable({
id: "get-cluster-helm-release-history",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const getHelmReleaseHistory = di.inject(getHelmReleaseHistoryInjectable);
return async (cluster: Cluster, data: GetHelmReleaseHistoryData) => {
@@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { Cluster } from "../../../common/cluster/cluster";
import type { GetHelmReleaseValuesData } from "../get-helm-release-values.injectable";
import getHelmReleaseValuesInjectable from "../get-helm-release-values.injectable";
@@ -13,7 +13,7 @@ const getClusterHelmReleaseValuesInjectable = getInjectable({
id: "get-cluster-helm-release-values",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const getHelmReleaseValues = di.inject(getHelmReleaseValuesInjectable);
return async (cluster: Cluster, data: GetHelmReleaseValuesData) => {
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import { isObject, json } from "@k8slens/utilities";
import execHelmInjectable from "../exec-helm/exec-helm.injectable";
@@ -14,7 +14,7 @@ const getHelmReleaseInjectable = getInjectable({
id: "get-helm-release",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const execHelm = di.inject(execHelmInjectable);
const getHelmReleaseResources = di.inject(getHelmReleaseResourcesInjectable);
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import listHelmReleasesInjectable from "../list-helm-releases.injectable";
@@ -12,7 +12,7 @@ const listClusterHelmReleasesInjectable = getInjectable({
id: "list-cluster-helm-releases",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const listHelmReleases = di.inject(listHelmReleasesInjectable);
return async (cluster: Cluster, namespace?: string) => {
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import type { RollbackHelmReleaseData } from "../rollback-helm-release.injectable";
import rollbackHelmReleaseInjectable from "../rollback-helm-release.injectable";
@@ -13,7 +13,7 @@ const rollbackClusterHelmReleaseInjectable = getInjectable({
id: "rollback-cluster-helm-release",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const rollbackHelmRelease = di.inject(rollbackHelmReleaseInjectable);
return async (cluster: Cluster, data: RollbackHelmReleaseData) => {
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import tempy from "tempy";
import getHelmReleaseInjectable from "./get-helm-release.injectable";
import writeFileInjectable from "../../../common/fs/write-file.injectable";
@@ -22,7 +22,7 @@ const updateHelmReleaseInjectable = getInjectable({
id: "update-helm-release",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const getHelmRelease = di.inject(getHelmReleaseInjectable);
const writeFile = di.inject(writeFileInjectable);
const removePath = di.inject(removePathInjectable);
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { HelmRepo } from "../../../../common/helm/helm-repo";
const addHelmRepositoryInjectable = getInjectable({
@@ -12,7 +12,7 @@ const addHelmRepositoryInjectable = getInjectable({
instantiate: (di) => {
const execHelm = di.inject(execHelmInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return async (repo: HelmRepo) => {
const {
@@ -8,7 +8,7 @@ import type { ReadYamlFile } from "../../../../common/fs/read-yaml-file.injectab
import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injectable";
import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable";
import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { AsyncResult } from "@k8slens/utilities";
interface HelmRepositoryFromYaml {
@@ -34,7 +34,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
const readYamlFile = di.inject(readYamlFileInjectable);
const execHelm = di.inject(execHelmInjectable);
const getHelmEnv = di.inject(getHelmEnvInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const getRepositories = getRepositoriesFor(readYamlFile);
@@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable";
import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
import type { HelmRepo } from "../../../../common/helm/helm-repo";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type { AsyncResult } from "@k8slens/utilities";
const removeHelmRepositoryInjectable = getInjectable({
@@ -13,7 +13,7 @@ const removeHelmRepositoryInjectable = getInjectable({
instantiate: (di) => {
const execHelm = di.inject(execHelmInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return async (repo: HelmRepo): AsyncResult<void, string> => {
logger.info(`[HELM]: removing repo ${repo.name} (${repo.url})`);
@@ -5,7 +5,7 @@
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import type { Cluster } from "../../common/cluster/cluster";
import spawnInjectable from "../child-process/spawn.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable";
import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable";
@@ -39,7 +39,7 @@ const createKubeAuthProxyInjectable = getInjectable({
instantiate: (di, cluster): CreateKubeAuthProxy => {
const lensK8sProxyPath = di.inject(lensK8sProxyPathInjectable);
const spawn = di.inject(spawnInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const waitUntilPortIsUsed = di.inject(waitUntilPortIsUsedInjectable);
const getPortFromStream = di.inject(getPortFromStreamInjectable);
const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
@@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import type { Cluster } from "../../common/cluster/cluster";
import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
import { KubeconfigManager } from "./kubeconfig-manager";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import joinPathsInjectable from "../../common/path/join-paths.injectable";
import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
import pathExistsInjectable from "../../common/fs/path-exists.injectable";
@@ -23,7 +23,7 @@ const kubeconfigManagerInjectable = getInjectable({
instantiate: (di, cluster) => new KubeconfigManager(
{
directoryForTemp: di.inject(directoryForTempInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
joinPaths: di.inject(joinPathsInjectable),
getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
removePath: di.inject(removePathInjectable),
@@ -16,7 +16,7 @@ import kubectlVersionMapInjectable from "./version-map.injectable";
import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
import joinPathsInjectable from "../../common/path/join-paths.injectable";
import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import execFileInjectable from "../../common/fs/exec-file.injectable";
import unlinkInjectable from "../../common/fs/unlink.injectable";
import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable";
@@ -37,7 +37,7 @@ const createKubectlInjectable = getInjectable({
baseBundledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable),
bundledKubectlVersion: di.inject(bundledKubectlVersionInjectable),
kubectlVersionMap: di.inject(kubectlVersionMapInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
joinPaths: di.inject(joinPathsInjectable),
getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
@@ -10,7 +10,7 @@ import shellApiRequestInjectable from "./proxy-functions/shell-api-request.injec
import lensProxyPortInjectable from "./lens-proxy-port.injectable";
import contentSecurityPolicyInjectable from "../../common/vars/content-security-policy.injectable";
import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";
import getClusterForRequestInjectable from "./get-cluster-for-request.injectable";
import kubeAuthProxyServerInjectable from "../cluster/kube-auth-proxy-server.injectable";
@@ -28,7 +28,7 @@ const lensProxyInjectable = getInjectable({
lensProxyPort: di.inject(lensProxyPortInjectable),
contentSecurityPolicy: di.inject(contentSecurityPolicyInjectable),
emitAppEvent: di.inject(emitAppEventInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
certificate: di.inject(lensProxyCertificateInjectable).get(),
getKubeAuthProxyServer: (cluster) => di.inject(kubeAuthProxyServerInjectable, cluster),
}),
@@ -8,7 +8,7 @@ import openShellSessionInjectable from "../../shell-session/create-shell-session
import type { LensProxyApiRequest } from "../lens-proxy";
import URLParse from "url-parse";
import { Server as WebSocketServer } from "ws";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import getClusterForRequestInjectable from "../get-cluster-for-request.injectable";
const shellApiRequestInjectable = getInjectable({
@@ -18,7 +18,7 @@ const shellApiRequestInjectable = getInjectable({
const openShellSession = di.inject(openShellSessionInjectable);
const authenticateRequest = di.inject(shellRequestAuthenticatorInjectable).authenticate;
const getClusterForRequest = di.inject(getClusterForRequestInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return ({ req, socket, head }) => {
const cluster = getClusterForRequest(req);
@@ -3,14 +3,14 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { onQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/phases";
const logOnQuitOfBackendInjectable = getInjectable({
id: "log-on-quit-of-backend",
instantiate: (di) => ({
run: () => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
logger.info("Quitting application ...");
},
@@ -4,7 +4,7 @@
*/
import { beforeApplicationIsLoadingInjectionToken } from "@k8slens/application";
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import appNameInjectable from "../../common/vars/app-name.injectable";
import { buildVersionInitializable } from "../../features/vars/build-version/common/token";
import { buildVersionInitializationInjectable } from "../../features/vars/build-version/main/init.injectable";
@@ -13,7 +13,7 @@ const logVersionOnStartInjectable = getInjectable({
id: "log-version-on-start",
instantiate: (di) => ({
run: () => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const buildVersion = di.inject(buildVersionInitializable.stateToken);
const appName = di.inject(appNameInjectable);
@@ -7,7 +7,7 @@ import extensionLoaderInjectable from "../../../extensions/extension-loader/exte
import { LensProtocolRouterMain } from "./lens-protocol-router-main";
import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
import broadcastMessageInjectable from "../../../common/ipc/broadcast-message.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import isExtensionEnabledInjectable from "../../../features/extensions/enabled/common/is-enabled.injectable";
const lensProtocolRouterMainInjectable = getInjectable({
@@ -18,7 +18,7 @@ const lensProtocolRouterMainInjectable = getInjectable({
isExtensionEnabled: di.inject(isExtensionEnabledInjectable),
showApplicationWindow: di.inject(showApplicationWindowInjectable),
broadcastMessage: di.inject(broadcastMessageInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
}),
});
@@ -7,7 +7,7 @@ import emitAppEventInjectable from "../../common/app-event-bus/emit-event.inject
import removePathInjectable from "../../common/fs/remove.injectable";
import execFileInjectable from "../../common/fs/exec-file.injectable";
import writeFileInjectable from "../../common/fs/write-file.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import joinPathsInjectable from "../../common/path/join-paths.injectable";
import { ResourceApplier } from "./resource-applier";
import createKubectlInjectable from "../kubectl/create-kubectl.injectable";
@@ -22,7 +22,7 @@ const resourceApplierInjectable = getInjectable({
emitAppEvent: di.inject(emitAppEventInjectable),
execFile: di.inject(execFileInjectable),
joinPaths: di.inject(joinPathsInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
writeFile: di.inject(writeFileInjectable),
createKubectl: di.inject(createKubectlInjectable),
proxyKubeconfigManager: di.inject(kubeconfigManagerInjectable, cluster),
@@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { ServerResponse } from "http";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { object } from "@k8slens/utilities";
import type { LensApiRequest, Route } from "./route";
import { contentTypes } from "./router-content-types";
@@ -44,7 +44,7 @@ const writeServerResponseFor = (serverResponse: ServerResponse) => ({
const createHandlerForRouteInjectable = getInjectable({
id: "create-handler-for-route",
instantiate: (di): CreateHandlerForRoute => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return (route) => async (request, response) => {
const writeServerResponse = writeServerResponseFor(response);
@@ -10,7 +10,7 @@ import type { LensApiRequest } from "../../router/route";
import path from "path";
import type { SupportedFileExtension } from "../../router/router-content-types";
import { contentTypes } from "../../router/router-content-types";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { publicPath } from "../../../common/vars";
const prodStaticFileRouteHandlerInjectable = getInjectable({
@@ -19,7 +19,7 @@ const prodStaticFileRouteHandlerInjectable = getInjectable({
const readFileBuffer = di.inject(readFileBufferInjectable);
const joinPaths = di.inject(joinPathsInjectable);
const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return async ({ params }: LensApiRequest<"/{path*}">) => {
let filePath = params.path;
@@ -13,7 +13,7 @@ import { isObject } from "lodash";
import { isRequestError, object } from "@k8slens/utilities";
import type { GetMetrics } from "../../get-metrics.injectable";
import getMetricsInjectable from "../../get-metrics.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import prometheusHandlerInjectable from "../../cluster/prometheus-handler/prometheus-handler.injectable";
import { runInAction } from "mobx";
@@ -60,7 +60,7 @@ const addMetricsRouteInjectable = getRouteInjectable({
instantiate: (di) => {
const getMetrics = di.inject(getMetricsInjectable);
const loadMetrics = loadMetricsFor(getMetrics);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return clusterRoute({
method: "post",
@@ -7,7 +7,7 @@ import type { PortForwardArgs, PortForwardDependencies } from "./port-forward";
import { PortForward } from "./port-forward";
import bundledKubectlInjectable from "../../../kubectl/bundled-kubectl.injectable";
import getPortFromStreamInjectable from "../../../utils/get-port-from-stream.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
export type CreatePortForward = (pathToKubeConfig: string, args: PortForwardArgs) => PortForward;
@@ -18,7 +18,7 @@ const createPortForwardInjectable = getInjectable({
const dependencies: PortForwardDependencies = {
getKubectlBinPath: di.inject(bundledKubectlInjectable).getPath,
getPortFromStream: di.inject(getPortFromStreamInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
};
return (pathToKubeConfig, args) => new PortForward(dependencies, pathToKubeConfig, args);
@@ -7,7 +7,7 @@ import { apiPrefix } from "../../../common/vars";
import { PortForward } from "./functionality/port-forward";
import createPortForwardInjectable from "./functionality/create-port-forward.injectable";
import { clusterRoute } from "../../router/route";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
const startPortForwardRouteInjectable = getRouteInjectable({
@@ -15,7 +15,7 @@ const startPortForwardRouteInjectable = getRouteInjectable({
instantiate: (di) => {
const createPortForward = di.inject(createPortForwardInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return clusterRoute({
method: "post",
@@ -6,13 +6,13 @@ import { getRouteInjectable } from "../../router/router.injectable";
import { apiPrefix } from "../../../common/vars";
import { PortForward } from "./functionality/port-forward";
import { clusterRoute } from "../../router/route";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
const stopCurrentPortForwardRouteInjectable = getRouteInjectable({
id: "stop-current-port-forward-route",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return clusterRoute({
method: "delete",
@@ -11,7 +11,7 @@ import directoryForBinariesInjectable from "../../../common/app-paths/directory-
import isMacInjectable from "../../../common/vars/is-mac.injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import type WebSocket from "ws";
import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable";
import joinPathsInjectable from "../../../common/path/join-paths.injectable";
@@ -45,7 +45,7 @@ const openLocalShellSessionInjectable = getInjectable({
directoryForBinaries: di.inject(directoryForBinariesInjectable),
isMac: di.inject(isMacInjectable),
isWindows: di.inject(isWindowsInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
state: di.inject(userPreferencesStateInjectable),
userShellSetting: di.inject(userShellSettingInjectable),
appName: di.inject(appNameInjectable),
@@ -10,7 +10,7 @@ import type { NodeShellSessionDependencies } from "./node-shell-session";
import { NodeShellSession } from "./node-shell-session";
import isMacInjectable from "../../../common/vars/is-mac.injectable";
import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable";
import spawnPtyInjectable from "../spawn-pty.injectable";
@@ -41,7 +41,7 @@ const openNodeShellSessionInjectable = getInjectable({
const dependencies: Omit<NodeShellSessionDependencies, "proxyKubeconfigPath" | "loadProxyKubeconfig" | "directoryContainingKubectl"> = {
isMac: di.inject(isMacInjectable),
isWindows: di.inject(isWindowsInjectable),
logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectionToken),
userShellSetting: di.inject(userShellSettingInjectable),
appName: di.inject(appNameInjectable),
buildVersion: di.inject(buildVersionInitializable.stateToken),
@@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import applicationWindowStateInjectable from "./application-window-state.injectable";
import { BrowserWindow } from "electron";
import type { ElectronWindow } from "./create-lens-window.injectable";
@@ -49,7 +49,7 @@ const createElectronWindowInjectable = getInjectable({
id: "create-electron-window",
instantiate: (di): CreateElectronWindow => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
const getAbsolutePath = di.inject(getAbsolutePathInjectable);
const lensResourcesDir = di.inject(lensResourcesDirInjectable);
@@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable";
import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
@@ -15,7 +15,7 @@ const initializeExtensionsInjectable = getInjectable({
instantiate: (di) => ({
run: async () => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
const extensionLoader = di.inject(extensionLoaderInjectable);
const showErrorPopup = di.inject(showErrorPopupInjectable);
@@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable";
import forceAppExitInjectable from "../../electron-app/features/force-app-exit.injectable";
import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable";
import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
@@ -23,7 +23,7 @@ const setupLensProxyInjectable = getInjectable({
run: async () => {
const lensProxy = di.inject(lensProxyInjectable);
const forceAppExit = di.inject(forceAppExitInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const lensProxyPort = di.inject(lensProxyPortInjectable);
const isWindows = di.inject(isWindowsInjectable);
const showErrorPopup = di.inject(showErrorPopupInjectable);
@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
import { Menu, Tray } from "electron";
import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters";
import trayIconInjectable from "../menu-icon/tray-icon.injectable";
import applicationDescriptionInjectable from "../../../common/vars/application-description.injectable";
@@ -37,7 +37,7 @@ const electronTrayInjectable = getInjectable({
const applicationDescription = di.inject(applicationDescriptionInjectable);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const isWindows = di.inject(isWindowsInjectable);
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
const trayIcon = di.inject(trayIconInjectable);
let tray: Tray;
@@ -6,7 +6,7 @@
import type { Readable } from "stream";
import URLParse from "url-parse";
import { getInjectable } from "@ogre-tools/injectable";
import { loggerInjectable } from "@k8slens/logger";
import { loggerInjectionToken } from "@k8slens/logger";
export interface GetPortFromStreamArgs {
/**
@@ -39,7 +39,7 @@ export type GetPortFromStream = (stream: Readable, args: GetPortFromStreamArgs)
const getPortFromStreamInjectable = getInjectable({
id: "get-port-from-stream",
instantiate: (di): GetPortFromStream => {
const logger = di.inject(loggerInjectable);
const logger = di.inject(loggerInjectionToken);
return (stream, args) => {
const logLines: string[] = [];