From fe1105b60b6cde701bdcc1ddc66fb676bcfb9c66 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 24 Aug 2021 10:09:50 -0400 Subject: [PATCH] some cleanup Signed-off-by: Sebastian Malton --- extensions/kube-object-event-status/package-lock.json | 2 +- extensions/kube-object-event-status/package.json | 2 +- extensions/metrics-cluster-feature/package-lock.json | 2 +- extensions/metrics-cluster-feature/package.json | 2 +- extensions/node-menu/package-lock.json | 2 +- extensions/node-menu/package.json | 2 +- extensions/pod-menu/package-lock.json | 2 +- extensions/pod-menu/package.json | 2 +- package.json | 2 +- src/common/ipc/ipc.ts | 1 - src/common/logger.ts | 5 +++-- src/common/utils/getPath.ts | 1 - src/common/utils/local-kubeconfig.ts | 4 ++-- src/main/exit-app.ts | 5 ----- src/renderer/utils/createStorage.ts | 2 +- 15 files changed, 15 insertions(+), 21 deletions(-) diff --git a/extensions/kube-object-event-status/package-lock.json b/extensions/kube-object-event-status/package-lock.json index 9dc7b55d28..86b8a3c6ce 100644 --- a/extensions/kube-object-event-status/package-lock.json +++ b/extensions/kube-object-event-status/package-lock.json @@ -1,6 +1,6 @@ { "name": "kube-object-event-status", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/extensions/kube-object-event-status/package.json b/extensions/kube-object-event-status/package.json index e8dfe38379..bfcc6cc3fb 100644 --- a/extensions/kube-object-event-status/package.json +++ b/extensions/kube-object-event-status/package.json @@ -1,6 +1,6 @@ { "name": "kube-object-event-status", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "description": "Adds kube object status from events", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/metrics-cluster-feature/package-lock.json b/extensions/metrics-cluster-feature/package-lock.json index d7862b705f..c8ac179568 100644 --- a/extensions/metrics-cluster-feature/package-lock.json +++ b/extensions/metrics-cluster-feature/package-lock.json @@ -1,6 +1,6 @@ { "name": "lens-metrics-cluster-feature", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/extensions/metrics-cluster-feature/package.json b/extensions/metrics-cluster-feature/package.json index 8683b75737..c052ef9e14 100644 --- a/extensions/metrics-cluster-feature/package.json +++ b/extensions/metrics-cluster-feature/package.json @@ -1,6 +1,6 @@ { "name": "lens-metrics-cluster-feature", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "description": "Lens metrics cluster feature", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/node-menu/package-lock.json b/extensions/node-menu/package-lock.json index 02d953b830..ae04ef0dd2 100644 --- a/extensions/node-menu/package-lock.json +++ b/extensions/node-menu/package-lock.json @@ -1,6 +1,6 @@ { "name": "lens-node-menu", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/extensions/node-menu/package.json b/extensions/node-menu/package.json index fdaaee3ae1..9eb348494a 100644 --- a/extensions/node-menu/package.json +++ b/extensions/node-menu/package.json @@ -1,6 +1,6 @@ { "name": "lens-node-menu", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "description": "Lens node menu", "renderer": "dist/renderer.js", "lens": { diff --git a/extensions/pod-menu/package-lock.json b/extensions/pod-menu/package-lock.json index 3abe5a107f..f5cda1e519 100644 --- a/extensions/pod-menu/package-lock.json +++ b/extensions/pod-menu/package-lock.json @@ -1,6 +1,6 @@ { "name": "lens-pod-menu", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/extensions/pod-menu/package.json b/extensions/pod-menu/package.json index 959059e5a2..03dc5702e4 100644 --- a/extensions/pod-menu/package.json +++ b/extensions/pod-menu/package.json @@ -1,6 +1,6 @@ { "name": "lens-pod-menu", - "version": "0.0.1", + "version": "5.2.0-beta.2.1629813675276", "description": "Lens pod menu", "renderer": "dist/renderer.js", "lens": { diff --git a/package.json b/package.json index 55a2c36891..4dd85c0b67 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "5.2.0-beta.2", + "version": "5.2.0-beta.2.1629813675276", "main": "static/build/main.js", "copyright": "© 2021 OpenLens Authors", "license": "MIT", diff --git a/src/common/ipc/ipc.ts b/src/common/ipc/ipc.ts index cb26e68426..f93a9486aa 100644 --- a/src/common/ipc/ipc.ts +++ b/src/common/ipc/ipc.ts @@ -48,7 +48,6 @@ function getSubFrames(): ClusterFrameInfo[] { } export function broadcastMessage(channel: string, ...args: any[]) { - // eslint-disable-next-line @typescript-eslint/no-var-requires const views = (webContents || remote?.webContents)?.getAllWebContents(); if (!views) return; diff --git a/src/common/logger.ts b/src/common/logger.ts index 723d43f70c..ed1bb0c011 100644 --- a/src/common/logger.ts +++ b/src/common/logger.ts @@ -19,13 +19,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { app, ipcMain, remote } from "electron"; +import { ipcMain } from "electron"; import winston, { format } from "winston"; import type Transport from "winston-transport"; import { consoleFormat } from "winston-console-format"; import { isDebugging, isTestEnv } from "./vars"; import BrowserConsole from "winston-transport-browserconsole"; import { SentryTransport } from "./logger-transports"; +import { getPath } from "./utils/getPath"; const logLevel = process.env.LOG_LEVEL ? process.env.LOG_LEVEL @@ -69,7 +70,7 @@ if (!isTestEnv) { handleExceptions: false, level: logLevel, filename: "lens.log", - dirname: (app ?? remote?.app)?.getPath("logs"), + dirname: getPath("logs"), maxsize: 16 * 1024, maxFiles: 16, tailable: true, diff --git a/src/common/utils/getPath.ts b/src/common/utils/getPath.ts index 863918ba0b..01df73975b 100644 --- a/src/common/utils/getPath.ts +++ b/src/common/utils/getPath.ts @@ -33,6 +33,5 @@ export function getPath(name: Parameters[0]): string { return app.getPath(name); } - // eslint-disable-next-line @typescript-eslint/no-var-requires return remote.app.getPath(name); } diff --git a/src/common/utils/local-kubeconfig.ts b/src/common/utils/local-kubeconfig.ts index 04ab27bfa4..8af595e5ec 100644 --- a/src/common/utils/local-kubeconfig.ts +++ b/src/common/utils/local-kubeconfig.ts @@ -19,13 +19,13 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { app, remote } from "electron"; import path from "path"; import * as uuid from "uuid"; import type { ClusterId } from "../cluster-types"; +import { getPath } from "./getPath"; export function storedKubeConfigFolder(): string { - return path.resolve((app || remote.app).getPath("userData"), "kubeconfigs"); + return path.resolve(getPath("userData"), "kubeconfigs"); } export function getCustomKubeConfigPath(clusterId: ClusterId = uuid.v4()): string { diff --git a/src/main/exit-app.ts b/src/main/exit-app.ts index 2f9e3b00c7..8f9f85d2a4 100644 --- a/src/main/exit-app.ts +++ b/src/main/exit-app.ts @@ -26,14 +26,9 @@ import { ClusterManager } from "./cluster-manager"; import logger from "./logger"; export function exitApp() { - console.log("before windowManager"); const windowManager = WindowManager.getInstance(false); - - console.log("before clusterManager"); const clusterManager = ClusterManager.getInstance(false); - console.log("after clusterManager"); - appEventBus.emit({ name: "service", action: "close" }); windowManager?.hide(); clusterManager?.stop(); diff --git a/src/renderer/utils/createStorage.ts b/src/renderer/utils/createStorage.ts index df68e17b65..9f1e34ff3b 100755 --- a/src/renderer/utils/createStorage.ts +++ b/src/renderer/utils/createStorage.ts @@ -65,7 +65,7 @@ export function createAppStorage(key: string, defaultValue: T, clusterId?: st // bind auto-saving data changes to %storage-file.json reaction( () => toJS(storage.data), - async (state: Record = {}) => { + async state => { logger.info(`${logPrefix} saving ${filePath}`); try {