diff --git a/src/main/lens-proxy/lens-proxy.injectable.ts b/src/main/lens-proxy/lens-proxy.injectable.ts index 47ea180d18..f1b8dbe42d 100644 --- a/src/main/lens-proxy/lens-proxy.injectable.ts +++ b/src/main/lens-proxy/lens-proxy.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { LensProxy } from "./lens-proxy"; import { kubeApiUpgradeRequest } from "./proxy-functions"; -import routeRequestInjectable from "../router/router.injectable"; +import routeRequestInjectable from "../router/route-request.injectable"; import httpProxy from "http-proxy"; import clusterManagerInjectable from "../cluster/manager.injectable"; import shellApiRequestInjectable from "./proxy-functions/shell-api-request/shell-api-request.injectable"; diff --git a/src/main/lens-proxy/lens-proxy.ts b/src/main/lens-proxy/lens-proxy.ts index 019c432c67..6f38b67bd8 100644 --- a/src/main/lens-proxy/lens-proxy.ts +++ b/src/main/lens-proxy/lens-proxy.ts @@ -15,7 +15,7 @@ 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 { RouteRequest } from "../router/router.injectable"; +import type { RouteRequest } from "../router/route-request.injectable"; import { lensAuthenticationHeader } from "../../common/vars/auth-header"; import { contentTypes } from "../router/router-content-types"; import { writeServerResponseFor } from "../router/write-server-response"; diff --git a/src/main/router/router.injectable.ts b/src/main/router/route-request.injectable.ts similarity index 100% rename from src/main/router/router.injectable.ts rename to src/main/router/route-request.injectable.ts diff --git a/src/main/router/router.test.ts b/src/main/router/router.test.ts index 3ae090a71b..62d3ea97c2 100644 --- a/src/main/router/router.test.ts +++ b/src/main/router/router.test.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { RouteRequest } from "./router.injectable"; -import routeRequestInjectable, { routeInjectionToken } from "./router.injectable"; +import type { RouteRequest } from "./route-request.injectable"; +import routeRequestInjectable, { routeInjectionToken } from "./route-request.injectable"; import { getDiForUnitTesting } from "../getDiForUnitTesting"; import type { Cluster } from "../../common/cluster/cluster"; import { Request } from "mock-http"; diff --git a/src/main/routes/files/static-file-route.injectable.ts b/src/main/routes/files/static-file-route.injectable.ts index 39b2c79412..395b22fd32 100644 --- a/src/main/routes/files/static-file-route.injectable.ts +++ b/src/main/routes/files/static-file-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import isDevelopmentInjectable from "../../../common/vars/is-development.injectable"; import { route } from "../../router/route"; import prodStaticFileRouteHandlerInjectable from "./production.injectable"; diff --git a/src/main/routes/helm/charts/get-readme-route.injectable.ts b/src/main/routes/helm/charts/get-readme-route.injectable.ts index f3b52073c2..c72fdd7193 100644 --- a/src/main/routes/helm/charts/get-readme-route.injectable.ts +++ b/src/main/routes/helm/charts/get-readme-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { apiPrefix } from "../../../../common/vars"; import { route } from "../../../router/route"; import getHelmChartReadmeInjectable from "../../../helm/helm-service/get-helm-chart-readme.injectable"; diff --git a/src/main/routes/helm/charts/get-values-route.injectable.ts b/src/main/routes/helm/charts/get-values-route.injectable.ts index 49efe5fb0c..b997766c7b 100644 --- a/src/main/routes/helm/charts/get-values-route.injectable.ts +++ b/src/main/routes/helm/charts/get-values-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { apiPrefix } from "../../../../common/vars"; import { route } from "../../../router/route"; import getHelmChartValuesInjectable from "../../../helm/helm-service/get-helm-chart-values.injectable"; diff --git a/src/main/routes/helm/charts/get-versions-route.injectable.ts b/src/main/routes/helm/charts/get-versions-route.injectable.ts index 933d94743b..a0689f2c22 100644 --- a/src/main/routes/helm/charts/get-versions-route.injectable.ts +++ b/src/main/routes/helm/charts/get-versions-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { apiPrefix } from "../../../../common/vars"; import { route } from "../../../router/route"; import getHelmChartVersionsInjectable from "../../../helm/helm-service/get-helm-chart-versions.injectable"; diff --git a/src/main/routes/helm/charts/list-route.injectable.ts b/src/main/routes/helm/charts/list-route.injectable.ts index 402a3d7cd1..7dbcc1f522 100644 --- a/src/main/routes/helm/charts/list-route.injectable.ts +++ b/src/main/routes/helm/charts/list-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { apiPrefix } from "../../../../common/vars"; import { route } from "../../../router/route"; import listHelmChartsInjectable from "../../../helm/helm-service/list-helm-charts.injectable"; diff --git a/src/main/routes/helm/releases/delete-release-route.injectable.ts b/src/main/routes/helm/releases/delete-release-route.injectable.ts index 2da28fd591..d5b96b4b11 100644 --- a/src/main/routes/helm/releases/delete-release-route.injectable.ts +++ b/src/main/routes/helm/releases/delete-release-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { clusterRoute } from "../../../router/route"; import deleteHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable"; diff --git a/src/main/routes/helm/releases/get-release-history-route.injectable.ts b/src/main/routes/helm/releases/get-release-history-route.injectable.ts index 142adfc0d5..ea9c453c1f 100644 --- a/src/main/routes/helm/releases/get-release-history-route.injectable.ts +++ b/src/main/routes/helm/releases/get-release-history-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { clusterRoute } from "../../../router/route"; import getHelmReleaseHistoryInjectable from "../../../helm/helm-service/get-helm-release-history.injectable"; diff --git a/src/main/routes/helm/releases/get-release-route.injectable.ts b/src/main/routes/helm/releases/get-release-route.injectable.ts index 7b264b4fe9..4c6b289ec0 100644 --- a/src/main/routes/helm/releases/get-release-route.injectable.ts +++ b/src/main/routes/helm/releases/get-release-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { clusterRoute } from "../../../router/route"; import getHelmReleaseInjectable from "../../../helm/helm-service/get-helm-release.injectable"; diff --git a/src/main/routes/helm/releases/get-release-values-route.injectable.ts b/src/main/routes/helm/releases/get-release-values-route.injectable.ts index d68e5c53d1..704e4f5dca 100644 --- a/src/main/routes/helm/releases/get-release-values-route.injectable.ts +++ b/src/main/routes/helm/releases/get-release-values-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { getBoolean } from "../../../utils/parse-query"; import { contentTypes } from "../../../router/router-content-types"; import { clusterRoute } from "../../../router/route"; diff --git a/src/main/routes/helm/releases/install-chart-route.injectable.ts b/src/main/routes/helm/releases/install-chart-route.injectable.ts index 75969c4a2f..fdd727ca6b 100644 --- a/src/main/routes/helm/releases/install-chart-route.injectable.ts +++ b/src/main/routes/helm/releases/install-chart-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import Joi from "joi"; import { payloadValidatedClusterRoute } from "../../../router/route"; import type { InstallChartArgs } from "../../../helm/helm-service/install-helm-chart.injectable"; diff --git a/src/main/routes/helm/releases/list-releases-route.injectable.ts b/src/main/routes/helm/releases/list-releases-route.injectable.ts index 8e9ea1e305..623ecf6cfa 100644 --- a/src/main/routes/helm/releases/list-releases-route.injectable.ts +++ b/src/main/routes/helm/releases/list-releases-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { clusterRoute } from "../../../router/route"; import listHelmReleasesInjectable from "../../../helm/helm-service/list-helm-releases.injectable"; diff --git a/src/main/routes/helm/releases/rollback-release-route.injectable.ts b/src/main/routes/helm/releases/rollback-release-route.injectable.ts index eb27b675c4..242f6ca070 100644 --- a/src/main/routes/helm/releases/rollback-release-route.injectable.ts +++ b/src/main/routes/helm/releases/rollback-release-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import Joi from "joi"; import { payloadValidatedClusterRoute } from "../../../router/route"; import rollbackHelmReleaseInjectable from "../../../helm/helm-service/rollback-helm-release.injectable"; diff --git a/src/main/routes/helm/releases/update-release-route.injectable.ts b/src/main/routes/helm/releases/update-release-route.injectable.ts index 5993d7922d..1b062cf439 100644 --- a/src/main/routes/helm/releases/update-release-route.injectable.ts +++ b/src/main/routes/helm/releases/update-release-route.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiPrefix } from "../../../../common/vars"; -import { getRouteInjectable } from "../../../router/router.injectable"; +import { getRouteInjectable } from "../../../router/route-request.injectable"; import { payloadValidatedClusterRoute } from "../../../router/route"; import Joi from "joi"; import type { UpdateChartArgs } from "../../../helm/helm-service/update-helm-release.injectable"; diff --git a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts index ea7da0b45b..f3dc9ae365 100644 --- a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts +++ b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts @@ -4,7 +4,7 @@ */ import { apiPrefix } from "../../../common/vars"; -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import type { Cluster } from "../../../common/cluster/cluster"; import type { V1Secret } from "@kubernetes/client-node"; import { CoreV1Api } from "@kubernetes/client-node"; diff --git a/src/main/routes/metrics/add-metrics-route.injectable.ts b/src/main/routes/metrics/add-metrics-route.injectable.ts index f47f80397a..301b4d9ccc 100644 --- a/src/main/routes/metrics/add-metrics-route.injectable.ts +++ b/src/main/routes/metrics/add-metrics-route.injectable.ts @@ -4,7 +4,7 @@ */ import { apiPrefix } from "../../../common/vars"; -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import type { ClusterPrometheusMetadata } from "../../../common/cluster-types"; import { ClusterMetadataKey } from "../../../common/cluster-types"; import type { Cluster } from "../../../common/cluster/cluster"; diff --git a/src/main/routes/metrics/get-metric-providers-route.injectable.ts b/src/main/routes/metrics/get-metric-providers-route.injectable.ts index 54dfd9bb95..909b368411 100644 --- a/src/main/routes/metrics/get-metric-providers-route.injectable.ts +++ b/src/main/routes/metrics/get-metric-providers-route.injectable.ts @@ -4,7 +4,7 @@ */ import { apiPrefix } from "../../../common/vars"; -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { route } from "../../router/route"; import prometheusProvidersInjectable from "../../prometheus/providers.injectable"; diff --git a/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts b/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts index 769046c804..46c2db3f11 100644 --- a/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts +++ b/src/main/routes/port-forward/get-current-port-forward-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { apiPrefix } from "../../../common/vars"; import { PortForward } from "./functionality/port-forward"; import { clusterRoute } from "../../router/route"; diff --git a/src/main/routes/port-forward/start-port-forward-route.injectable.ts b/src/main/routes/port-forward/start-port-forward-route.injectable.ts index 0716b81a2f..e0aec149f1 100644 --- a/src/main/routes/port-forward/start-port-forward-route.injectable.ts +++ b/src/main/routes/port-forward/start-port-forward-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { apiPrefix } from "../../../common/vars"; import { PortForward } from "./functionality/port-forward"; import createPortForwardInjectable from "./functionality/create-port-forward.injectable"; diff --git a/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts b/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts index 1fc76e9b72..98dab3b995 100644 --- a/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts +++ b/src/main/routes/port-forward/stop-current-port-forward-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { apiPrefix } from "../../../common/vars"; import { PortForward } from "./functionality/port-forward"; import { clusterRoute } from "../../router/route"; diff --git a/src/main/routes/resource-applier/create-resource-route.injectable.ts b/src/main/routes/resource-applier/create-resource-route.injectable.ts index 3b68201e9d..079f1dc147 100644 --- a/src/main/routes/resource-applier/create-resource-route.injectable.ts +++ b/src/main/routes/resource-applier/create-resource-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { apiPrefix } from "../../../common/vars"; import { payloadValidatedClusterRoute } from "../../router/route"; import Joi from "joi"; diff --git a/src/main/routes/resource-applier/patch-resource-route.injectable.ts b/src/main/routes/resource-applier/patch-resource-route.injectable.ts index e962c18607..8773e11e09 100644 --- a/src/main/routes/resource-applier/patch-resource-route.injectable.ts +++ b/src/main/routes/resource-applier/patch-resource-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { apiPrefix } from "../../../common/vars"; import { payloadValidatedClusterRoute } from "../../router/route"; import Joi from "joi"; diff --git a/src/main/routes/versions/get-version-route.injectable.ts b/src/main/routes/versions/get-version-route.injectable.ts index d132e242d6..c3a8f9304a 100644 --- a/src/main/routes/versions/get-version-route.injectable.ts +++ b/src/main/routes/versions/get-version-route.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getRouteInjectable } from "../../router/router.injectable"; +import { getRouteInjectable } from "../../router/route-request.injectable"; import { route } from "../../router/route"; import buildVersionInjectable from "../../vars/build-version/build-version.injectable";