mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Override lensFetchInjectable in ApplicationBuilder
- So that we can request from the backend routes Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
bd1c104f68
commit
79c06a0fd4
31 files changed
+252
-176
No files matched your search
@@ -10,7 +10,6 @@ import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as
|
||||
import spawnInjectable from "./child-process/spawn.injectable";
|
||||
import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable";
|
||||
import setupIpcMainHandlersInjectable from "./electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable";
|
||||
import setupLensProxyInjectable from "./start-main-application/runnables/setup-lens-proxy.injectable";
|
||||
import setupSyncingOfWeblinksInjectable from "./start-main-application/runnables/setup-syncing-of-weblinks.injectable";
|
||||
import setupDeepLinkingInjectable from "./electron-app/runnables/setup-deep-linking.injectable";
|
||||
import setupMainWindowVisibilityAfterActivationInjectable from "./electron-app/runnables/setup-main-window-visibility-after-activation.injectable";
|
||||
@@ -103,7 +102,6 @@ const overrideRunnablesHavingSideEffects = (di: DiContainer) => {
|
||||
initializeExtensionsInjectable,
|
||||
initializeClusterManagerInjectable,
|
||||
setupIpcMainHandlersInjectable,
|
||||
setupLensProxyInjectable,
|
||||
setupSyncingOfWeblinksInjectable,
|
||||
].forEach((injectable) => {
|
||||
di.override(injectable, () => ({
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import assert from "assert";
|
||||
import type { IncomingMessage } from "http";
|
||||
import HttpProxyServer from "http-proxy";
|
||||
import { Socket } from "net";
|
||||
import loggerInjectable from "../../common/logger.injectable";
|
||||
import type { HandleRequest } from "./handle-request-for.injectable";
|
||||
import handleRequestForInjectable from "./handle-request-for.injectable";
|
||||
|
||||
const getRequestId = (req: IncomingMessage) => {
|
||||
assert(req.headers.host);
|
||||
|
||||
return req.headers.host + req.url;
|
||||
};
|
||||
|
||||
export interface HandleLensRequest {
|
||||
handle: HandleRequest;
|
||||
stopHandling: () => void;
|
||||
}
|
||||
|
||||
const handleLensRequestInjectable = getInjectable({
|
||||
id: "handle-lens-request",
|
||||
instantiate: (di): HandleLensRequest => {
|
||||
const logger = di.inject(loggerInjectable);
|
||||
const handleRequestFor = di.inject(handleRequestForInjectable);
|
||||
|
||||
const retryCounters = new Map<string, number>();
|
||||
let closed = false;
|
||||
|
||||
const proxy = HttpProxyServer.createProxy()
|
||||
.on("proxyRes", (proxyRes, req, res) => {
|
||||
retryCounters.delete(getRequestId(req));
|
||||
|
||||
proxyRes.on("aborted", () => { // happens when proxy target aborts connection
|
||||
res.end();
|
||||
});
|
||||
})
|
||||
.on("error", (error, req, res, target) => {
|
||||
if (closed || res instanceof Socket) {
|
||||
return;
|
||||
}
|
||||
|
||||
logger.error(`[LENS-PROXY]: http proxy errored for cluster: ${error}`, { url: req.url });
|
||||
|
||||
if (target) {
|
||||
logger.debug(`Failed proxy to target: ${JSON.stringify(target, null, 2)}`);
|
||||
|
||||
if (req.method === "GET" && (!res.statusCode || res.statusCode >= 500)) {
|
||||
const reqId = getRequestId(req);
|
||||
const retryCount = retryCounters.get(reqId) || 0;
|
||||
const timeoutMs = retryCount * 250;
|
||||
|
||||
if (retryCount < 20) {
|
||||
logger.debug(`Retrying proxy request to url: ${reqId}`);
|
||||
setTimeout(() => {
|
||||
retryCounters.set(reqId, retryCount + 1);
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
await handleRequest(req, res);
|
||||
} catch (error) {
|
||||
logger.error(`[LENS-PROXY]: failed to handle request on proxy error: ${error}`);
|
||||
}
|
||||
})();
|
||||
}, timeoutMs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
res.writeHead(500).end(`Oops, something went wrong.\n${error}`);
|
||||
} catch (e) {
|
||||
logger.error(`[LENS-PROXY]: Failed to write headers: `, e);
|
||||
}
|
||||
});
|
||||
|
||||
const handleRequest = handleRequestFor(proxy);
|
||||
|
||||
return {
|
||||
handle: handleRequest,
|
||||
stopHandling: () => closed = true,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export default handleLensRequestInjectable;
|
||||
@@ -0,0 +1,62 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { ServerResponse, IncomingMessage } from "http";
|
||||
import { apiKubePrefix } from "../../common/vars";
|
||||
import contentSecurityPolicyInjectable from "../../common/vars/content-security-policy.injectable";
|
||||
import type { ClusterContextHandler } from "../context-handler/context-handler";
|
||||
import routeRequestInjectable from "../router/route-request.injectable";
|
||||
import { getBoolean } from "../utils/parse-query";
|
||||
import getClusterForRequestInjectable from "./get-cluster-for-request.injectable";
|
||||
import type HttpProxyServer from "http-proxy";
|
||||
|
||||
const watchParam = "watch";
|
||||
const followParam = "follow";
|
||||
|
||||
const isLongRunningRequest = (reqUrl: string) => {
|
||||
const url = new URL(reqUrl, "http://localhost");
|
||||
|
||||
return getBoolean(url.searchParams, watchParam) || getBoolean(url.searchParams, followParam);
|
||||
};
|
||||
|
||||
export type HandleRequest = (req: IncomingMessage, res: ServerResponse) => Promise<void>;
|
||||
export type HandleRequestFor = (proxy: HttpProxyServer) => HandleRequest;
|
||||
|
||||
const handleRequestForInjectable = getInjectable({
|
||||
id: "handle-request-for",
|
||||
instantiate: (di): HandleRequestFor => {
|
||||
const getClusterForRequest = di.inject(getClusterForRequestInjectable);
|
||||
const contentSecurityPolicy = di.inject(contentSecurityPolicyInjectable);
|
||||
const routeRequest = di.inject(routeRequestInjectable);
|
||||
|
||||
const getProxyTarget = async (req: IncomingMessage, contextHandler: ClusterContextHandler) => {
|
||||
if (req.url?.startsWith(apiKubePrefix)) {
|
||||
delete req.headers.authorization;
|
||||
req.url = req.url.replace(apiKubePrefix, "");
|
||||
|
||||
return contextHandler.getApiTarget(isLongRunningRequest(req.url));
|
||||
}
|
||||
|
||||
return undefined;
|
||||
};
|
||||
|
||||
return (proxy) => async (req, res) => {
|
||||
const cluster = getClusterForRequest(req);
|
||||
|
||||
if (cluster) {
|
||||
const proxyTarget = await getProxyTarget(req, cluster.contextHandler);
|
||||
|
||||
if (proxyTarget) {
|
||||
return proxy.web(req, res, proxyTarget);
|
||||
}
|
||||
}
|
||||
|
||||
res.setHeader("Content-Security-Policy", contentSecurityPolicy);
|
||||
await routeRequest(cluster, req, res);
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export default handleRequestForInjectable;
|
||||
@@ -5,23 +5,18 @@
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { ProxyApiRequestArgs } from "./proxy-functions";
|
||||
import { kubeApiUpgradeRequest } from "./proxy-functions";
|
||||
import httpProxy from "http-proxy";
|
||||
import shellApiRequestInjectable from "./proxy-functions/shell-api-request.injectable";
|
||||
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 lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";
|
||||
import getClusterForRequestInjectable from "./get-cluster-for-request.injectable";
|
||||
import routeRequestInjectable from "../router/route-request.injectable";
|
||||
import type { IncomingMessage, ServerResponse } from "http";
|
||||
import assert from "assert";
|
||||
import net from "net";
|
||||
import type { IncomingMessage } from "http";
|
||||
import type net from "net";
|
||||
import type { Cluster } from "../../common/cluster/cluster";
|
||||
import { getBoolean } from "../utils/parse-query";
|
||||
import type { ClusterContextHandler } from "../context-handler/context-handler";
|
||||
import { apiKubePrefix, apiPrefix } from "../../common/vars";
|
||||
import { apiPrefix } from "../../common/vars";
|
||||
import { createServer } from "https";
|
||||
import handleLensRequestInjectable from "./handle-lens-request.injectable";
|
||||
|
||||
export type GetClusterForRequest = (req: IncomingMessage) => Cluster | undefined;
|
||||
export type LensProxyApiRequest = (args: ProxyApiRequestArgs) => void | Promise<void>;
|
||||
@@ -31,21 +26,6 @@ export interface LensProxy {
|
||||
close: () => void;
|
||||
}
|
||||
|
||||
const getRequestId = (req: IncomingMessage) => {
|
||||
assert(req.headers.host);
|
||||
|
||||
return req.headers.host + req.url;
|
||||
};
|
||||
|
||||
const watchParam = "watch";
|
||||
const followParam = "follow";
|
||||
|
||||
const isLongRunningRequest = (reqUrl: string) => {
|
||||
const url = new URL(reqUrl, "http://localhost");
|
||||
|
||||
return getBoolean(url.searchParams, watchParam) || getBoolean(url.searchParams, followParam);
|
||||
};
|
||||
|
||||
/**
|
||||
* This is the list of ports that chrome considers unsafe to allow HTTP
|
||||
* conntections to. Because they are the standard ports for processes that are
|
||||
@@ -68,97 +48,20 @@ const lensProxyInjectable = getInjectable({
|
||||
id: "lens-proxy",
|
||||
|
||||
instantiate: (di): LensProxy => {
|
||||
const routeRequest = di.inject(routeRequestInjectable);
|
||||
const shellApiRequest = di.inject(shellApiRequestInjectable);
|
||||
const getClusterForRequest = di.inject(getClusterForRequestInjectable);
|
||||
const lensProxyPort = di.inject(lensProxyPortInjectable);
|
||||
const contentSecurityPolicy = di.inject(contentSecurityPolicyInjectable);
|
||||
const emitAppEvent = di.inject(emitAppEventInjectable);
|
||||
const logger = di.inject(loggerInjectable);
|
||||
const certificate = di.inject(lensProxyCertificateInjectable).get();
|
||||
|
||||
const retryCounters = new Map<string, number>();
|
||||
let closed = false;
|
||||
|
||||
const proxy = httpProxy.createProxy()
|
||||
.on("proxyRes", (proxyRes, req, res) => {
|
||||
retryCounters.delete(getRequestId(req));
|
||||
|
||||
proxyRes.on("aborted", () => { // happens when proxy target aborts connection
|
||||
res.end();
|
||||
});
|
||||
})
|
||||
.on("error", (error, req, res, target) => {
|
||||
if (closed || res instanceof net.Socket) {
|
||||
return;
|
||||
}
|
||||
|
||||
logger.error(`[LENS-PROXY]: http proxy errored for cluster: ${error}`, { url: req.url });
|
||||
|
||||
if (target) {
|
||||
logger.debug(`Failed proxy to target: ${JSON.stringify(target, null, 2)}`);
|
||||
|
||||
if (req.method === "GET" && (!res.statusCode || res.statusCode >= 500)) {
|
||||
const reqId = getRequestId(req);
|
||||
const retryCount = retryCounters.get(reqId) || 0;
|
||||
const timeoutMs = retryCount * 250;
|
||||
|
||||
if (retryCount < 20) {
|
||||
logger.debug(`Retrying proxy request to url: ${reqId}`);
|
||||
setTimeout(() => {
|
||||
retryCounters.set(reqId, retryCount + 1);
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
await handleRequest(req, res);
|
||||
} catch (error) {
|
||||
logger.error(`[LENS-PROXY]: failed to handle request on proxy error: ${error}`);
|
||||
}
|
||||
})();
|
||||
}, timeoutMs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
res.writeHead(500).end(`Oops, something went wrong.\n${error}`);
|
||||
} catch (e) {
|
||||
logger.error(`[LENS-PROXY]: Failed to write headers: `, e);
|
||||
}
|
||||
});
|
||||
|
||||
const getProxyTarget = async (req: IncomingMessage, contextHandler: ClusterContextHandler) => {
|
||||
if (req.url?.startsWith(apiKubePrefix)) {
|
||||
delete req.headers.authorization;
|
||||
req.url = req.url.replace(apiKubePrefix, "");
|
||||
|
||||
return contextHandler.getApiTarget(isLongRunningRequest(req.url));
|
||||
}
|
||||
|
||||
return undefined;
|
||||
};
|
||||
|
||||
const handleRequest = async (req: IncomingMessage, res: ServerResponse) => {
|
||||
const cluster = getClusterForRequest(req);
|
||||
|
||||
if (cluster) {
|
||||
const proxyTarget = await getProxyTarget(req, cluster.contextHandler);
|
||||
|
||||
if (proxyTarget) {
|
||||
return proxy.web(req, res, proxyTarget);
|
||||
}
|
||||
}
|
||||
|
||||
res.setHeader("Content-Security-Policy", contentSecurityPolicy);
|
||||
await routeRequest(cluster, req, res);
|
||||
};
|
||||
const handleLensRequest = di.inject(handleLensRequestInjectable);
|
||||
|
||||
const proxyServer = createServer(
|
||||
{
|
||||
key: certificate.private,
|
||||
cert: certificate.cert,
|
||||
},
|
||||
handleRequest,
|
||||
handleLensRequest.handle,
|
||||
)
|
||||
.on("upgrade", (req, socket, head) => {
|
||||
const cluster = getClusterForRequest(req);
|
||||
@@ -238,7 +141,7 @@ const lensProxyInjectable = getInjectable({
|
||||
logger.info("[LENS-PROXY]: Closing server");
|
||||
|
||||
proxyServer.close();
|
||||
closed = true;
|
||||
handleLensRequest.stopHandling();
|
||||
};
|
||||
|
||||
return { close, listen };
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { ServerResponse } from "http";
|
||||
import loggerInjectable from "../../common/logger.injectable";
|
||||
import { lensAuthenticationHeader } from "../../common/vars/auth-header";
|
||||
import authHeaderValueInjectable from "../lens-proxy/auth-header-value.injectable";
|
||||
import type { LensApiRequest, Route } from "./route";
|
||||
import { contentTypes } from "./router-content-types";
|
||||
import { writeServerResponseFor } from "./write-server-response";
|
||||
@@ -18,24 +16,10 @@ const createHandlerForRouteInjectable = getInjectable({
|
||||
id: "create-handler-for-route",
|
||||
instantiate: (di): CreateHandlerForRoute => {
|
||||
const logger = di.inject(loggerInjectable);
|
||||
const authHeaderValue = `Bearer ${di.inject(authHeaderValueInjectable)}`;
|
||||
|
||||
return (route) => async (request, response) => {
|
||||
const writeServerResponse = writeServerResponseFor(response);
|
||||
|
||||
if (route.requireAuthentication) {
|
||||
const authHeader = request.getHeader(lensAuthenticationHeader);
|
||||
|
||||
if (authHeader !== authHeaderValue) {
|
||||
writeServerResponse(contentTypes.txt.resultMapper({
|
||||
statusCode: 401,
|
||||
response: "Missing authorization",
|
||||
}));
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await route.handler(request);
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 deleteClusterHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable";
|
||||
|
||||
|
||||
@@ -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 getClusterHelmReleaseHistoryInjectable from "../../../helm/helm-service/get-helm-release-history.injectable";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 listClusterHelmReleasesInjectable from "../../../helm/helm-service/list-helm-releases.injectable";
|
||||
|
||||
|
||||
@@ -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 rollbackClusterHelmReleaseInjectable from "../../../helm/helm-service/rollback-helm-release.injectable";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -6,15 +6,12 @@ import { getInjectable } from "@ogre-tools/injectable";
|
||||
import exitAppInjectable from "../../electron-app/features/exit-app.injectable";
|
||||
import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable";
|
||||
import loggerInjectable from "../../../common/logger.injectable";
|
||||
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";
|
||||
import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
|
||||
import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
|
||||
import initializeBuildVersionInjectable from "../../vars/build-version/init.injectable";
|
||||
import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable";
|
||||
import fetchInjectable from "../../../common/fetch/fetch.injectable";
|
||||
import { Agent } from "https";
|
||||
import lensFetchInjectable from "../../../common/fetch/lens-fetch.injectable";
|
||||
|
||||
const setupLensProxyInjectable = getInjectable({
|
||||
id: "setup-lens-proxy",
|
||||
@@ -23,12 +20,10 @@ const setupLensProxyInjectable = getInjectable({
|
||||
const lensProxy = di.inject(lensProxyInjectable);
|
||||
const exitApp = di.inject(exitAppInjectable);
|
||||
const logger = di.inject(loggerInjectable);
|
||||
const lensProxyPort = di.inject(lensProxyPortInjectable);
|
||||
const isWindows = di.inject(isWindowsInjectable);
|
||||
const showErrorPopup = di.inject(showErrorPopupInjectable);
|
||||
const buildVersion = di.inject(buildVersionInjectable);
|
||||
const lensProxyCertificate = di.inject(lensProxyCertificateInjectable);
|
||||
const fetch = di.inject(fetchInjectable);
|
||||
const lensFetch = di.inject(lensFetchInjectable);
|
||||
|
||||
return {
|
||||
id: "setup-lens-proxy",
|
||||
@@ -45,11 +40,7 @@ const setupLensProxyInjectable = getInjectable({
|
||||
// test proxy connection
|
||||
try {
|
||||
logger.info("🔎 Testing LensProxy connection ...");
|
||||
const versionResponse = await fetch(`https://127.0.0.1:${lensProxyPort.get()}/version`, {
|
||||
agent: new Agent({
|
||||
ca: lensProxyCertificate.get()?.cert,
|
||||
}),
|
||||
});
|
||||
const versionResponse = await lensFetch("/version");
|
||||
|
||||
const { version: versionFromProxy } = await versionResponse.json() as { version: string };
|
||||
|
||||
@@ -81,9 +72,6 @@ const setupLensProxyInjectable = getInjectable({
|
||||
runAfter: di.inject(initializeBuildVersionInjectable),
|
||||
};
|
||||
},
|
||||
|
||||
causesSideEffects: true,
|
||||
|
||||
injectionToken: beforeApplicationIsLoadingInjectionToken,
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user