Merge branch 'master' into enhancement-ability-to-remove-subnamespaces

packages/core/.yarnrc

@@ -1,3 +0,0 @@
-disturl "https://electronjs.org/headers"
-target "19.0.4"
-runtime "electron"

packages/core/package.json

@@ -50,14 +50,14 @@
   "license": "MIT",
   "author": "OpenLens Authors <info@k8slens.dev>",
   "scripts": {
-    "build": "cross-env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts --progress",
+    "build": "cross-env NODE_ENV=production webpack --config webpack/library-bundle.ts --progress",
     "clean": "rimraf dist static/build",
-    "prepare:dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --progress",
-    "dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --watch",
+    "prepare:dev": "cross-env NODE_ENV=development webpack --config webpack/library-bundle.ts --progress",
+    "dev": "cross-env NODE_ENV=development webpack --config webpack/library-bundle.ts --watch",
     "test:unit": "jest --testPathIgnorePatterns integration",
     "test:watch": "func() { jest ${1} --watch --testPathIgnorePatterns integration; }; func",
-    "lint": "PROD=true yarn run eslint --ext js,ts,tsx --max-warnings=0 .",
-    "lint:fix": "yarn run lint --fix"
+    "lint": "PROD=true eslint --ext js,ts,tsx --max-warnings=0 .",
+    "lint:fix": "npm run lint --fix"
   },
   "config": {
     "k8sProxyVersion": "0.3.0",

packages/core/src/common/utils/random-bytes.global-override-for-injectable.ts

@@ -6,7 +6,7 @@
 import { getGlobalOverride } from "../test-utils/get-global-override";
 import randomBytesInjectable from "./random-bytes.injectable";
 
-export default getGlobalOverride(randomBytesInjectable, () => async (size) => {
+export default getGlobalOverride(randomBytesInjectable, () => (size) => {
   const res = Buffer.alloc(size);
 
   for (let i = 0; i < size; i += 1) {

packages/core/src/common/utils/random-bytes.injectable.ts

@@ -4,13 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { randomBytes } from "crypto";
-import { promisify } from "util";
 
-export type RandomBytes = (size: number) => Promise<Buffer>;
+export type RandomBytes = (size: number) => Buffer;
 
 const randomBytesInjectable = getInjectable({
   id: "random-bytes",
-  instantiate: (): RandomBytes => promisify(randomBytes),
+  instantiate: (): RandomBytes => randomBytes,
   causesSideEffects: true,
 });
 

packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.injectable.ts

@@ -3,17 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { ObservableMap } from "mobx";
 import { getInjectable } from "@ogre-tools/injectable";
 
-import { getOrInsertWithAsync } from "../../../common/utils";
+import { getOrInsert } from "../../../common/utils";
 import randomBytesInjectable from "../../../common/utils/random-bytes.injectable";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 import directoryForExtensionDataInjectable from "./directory-for-extension-data.injectable";
 import ensureDirInjectable from "../../../common/fs/ensure-dir.injectable";
 import getHashInjectable from "./get-hash.injectable";
+import getPathToLegacyPackageJsonInjectable from "./get-path-to-legacy-package-json.injectable";
+import { registeredExtensionsInjectable } from "./registered-extensions.injectable";
 
-export type EnsureHashedDirectoryForExtension = (extensionName: string, registeredExtensions: ObservableMap<string, string>) => Promise<string>;
+export type EnsureHashedDirectoryForExtension = (extensionName: string) => Promise<string>;
 
 const ensureHashedDirectoryForExtensionInjectable = getInjectable({
   id: "ensure-hashed-directory-for-extension",
@@ -24,14 +25,27 @@ const ensureHashedDirectoryForExtensionInjectable = getInjectable({
     const directoryForExtensionData = di.inject(directoryForExtensionDataInjectable);
     const ensureDirectory = di.inject(ensureDirInjectable);
     const getHash = di.inject(getHashInjectable);
+    const getPathToLegacyPackageJson = di.inject(getPathToLegacyPackageJsonInjectable);
+    const registeredExtensions = di.inject(registeredExtensionsInjectable);
 
-    return async (extensionName, registeredExtensions) => {
-      const dirPath = await getOrInsertWithAsync(registeredExtensions, extensionName, async () => {
-        const salt = (await randomBytes(32)).toString("hex");
+    return async (extensionName) => {
+      let dirPath: string;
+
+      const legacyDirPath = getPathToLegacyPackageJson(extensionName);
+      const hashedDirectoryForLegacyDirPath = registeredExtensions.get(legacyDirPath);
+
+      if (hashedDirectoryForLegacyDirPath) {
+        registeredExtensions.set(extensionName, hashedDirectoryForLegacyDirPath);
+        registeredExtensions.delete(legacyDirPath);
+        dirPath = hashedDirectoryForLegacyDirPath;
+      } else {
+        const salt = randomBytes(32).toString("hex");
         const hashedName = getHash(`${extensionName}/${salt}`);
 
-        return joinPaths(directoryForExtensionData, hashedName);
-      });
+        const hashedExtensionDirectory = joinPaths(directoryForExtensionData, hashedName);
+
+        dirPath = getOrInsert(registeredExtensions, extensionName, hashedExtensionDirectory);
+      }
 
       await ensureDirectory(dirPath);
 

packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.test.ts

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ObservableMap } from "mobx";
+import { runInAction } from "mobx";
+import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
+import type { EnsureHashedDirectoryForExtension } from "./ensure-hashed-directory-for-extension.injectable";
+import ensureHashedDirectoryForExtensionInjectable from "./ensure-hashed-directory-for-extension.injectable";
+import ensureDirInjectable from "../../../common/fs/ensure-dir.injectable";
+import directoryForExtensionDataInjectable from "./directory-for-extension-data.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import { registeredExtensionsInjectable } from "./registered-extensions.injectable";
+
+describe("ensure-hashed-directory-for-extension", () => {
+  let ensureHashedDirectoryForExtension: EnsureHashedDirectoryForExtension;
+  let ensureDirMock: jest.Mock;
+  let registeredExtensions: ObservableMap<string, string>;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({  doGeneralOverrides: true });
+
+    ensureDirMock = jest.fn();
+
+    di.override(ensureDirInjectable, () => ensureDirMock);
+    di.override(directoryForExtensionDataInjectable, () => "some-directory-for-extension-data");
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+
+    ensureHashedDirectoryForExtension = di.inject(
+      ensureHashedDirectoryForExtensionInjectable,
+    );
+
+    registeredExtensions = di.inject(registeredExtensionsInjectable);
+  });
+
+  it("given registered extension exists, returns existing directory", async () => {
+    runInAction(() => {
+      registeredExtensions.set("some-extension-name", "some-directory");
+    });
+
+    const actual = await ensureHashedDirectoryForExtension(
+      "some-extension-name",
+    );
+
+    expect(actual).toBe("some-directory");
+  });
+
+  it("given registered extension does not exist, returns random directory", async () => {
+    const actual = await ensureHashedDirectoryForExtension(
+      "some-extension-name",
+    );
+
+    expect(actual).toBe("some-directory-for-extension-data/a37a1cfefc0391af3733f23cb6b29443f596a2b8ffe6d116c35df7bc3cd99ef6");
+  });
+
+  describe("given extension directory was saved based on extension's package.json path", () => {
+    beforeEach(() => {
+      runInAction(() => {
+        registeredExtensions.set("/some-directory-for-user-data/node_modules/some-extension-name/package.json", "some-directory");
+      });
+      ensureDirMock.mockClear();
+    });
+
+    it("returns existing directory", async () => {
+      const actual = await ensureHashedDirectoryForExtension(
+        "some-extension-name",
+      );
+
+      expect(actual).toBe("some-directory");
+    });
+
+    it("ensure dir is called with some directory", async () => {
+      await ensureHashedDirectoryForExtension(
+        "some-extension-name",
+      );
+
+      expect(ensureDirMock).toHaveBeenCalledWith("some-directory");
+    });
+
+    it("is migrated to use the extension name as key", async () => {
+      await ensureHashedDirectoryForExtension(
+        "some-extension-name",
+      );
+
+      expect(registeredExtensions.get("some-extension-name")).toEqual("some-directory");
+    });
+
+    it("old key is removed", async () => {
+      await ensureHashedDirectoryForExtension(
+        "some-extension-name",
+      );
+
+      expect(registeredExtensions.has("/some-directory-for-user-data/node_modules/some-extension-name/package.json")).toEqual(false);
+    });
+  });
+});

packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store-injection-token.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { MigrationDeclaration } from "../../../common/base-store/migrations.injectable";
+
+export const fileSystemProvisionerStoreInjectionToken = getInjectionToken<MigrationDeclaration>({
+  id: "file-system-provisioner-store-injection-token",
+});

packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts

@@ -14,6 +14,7 @@ import { persistStateToConfigInjectionToken } from "../../../common/base-store/s
 import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
 import { enlistMessageChannelListenerInjectionToken } from "../../../common/utils/channel/enlist-message-channel-listener-injection-token";
 import ensureHashedDirectoryForExtensionInjectable from "./ensure-hashed-directory-for-extension.injectable";
+import { registeredExtensionsInjectable } from "./registered-extensions.injectable";
 
 const fileSystemProvisionerStoreInjectable = getInjectable({
   id: "file-system-provisioner-store",
@@ -30,6 +31,7 @@ const fileSystemProvisionerStoreInjectable = getInjectable({
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),
     ensureHashedDirectoryForExtension: di.inject(ensureHashedDirectoryForExtensionInjectable),
+    registeredExtensions: di.inject(registeredExtensionsInjectable),
   }),
 });
 

packages/core/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.ts

@@ -3,7 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { action, makeObservable, observable } from "mobx";
+import type { ObservableMap } from "mobx";
+import { action, makeObservable } from "mobx";
 import type { BaseStoreDependencies } from "../../../common/base-store/base-store";
 import { BaseStore } from "../../../common/base-store/base-store";
 import type { LensExtensionId } from "../../lens-extension";
@@ -16,11 +17,10 @@ interface FSProvisionModel {
 
 interface Dependencies extends BaseStoreDependencies {
   ensureHashedDirectoryForExtension: EnsureHashedDirectoryForExtension;
+  registeredExtensions: ObservableMap<LensExtensionId, string>;
 }
 
 export class FileSystemProvisionerStore extends BaseStore<FSProvisionModel> {
-  readonly registeredExtensions = observable.map<LensExtensionId, string>();
-
   constructor(protected readonly dependencies: Dependencies) {
     super(dependencies, {
       configName: "lens-filesystem-provisioner-store",
@@ -37,17 +37,17 @@ export class FileSystemProvisionerStore extends BaseStore<FSProvisionModel> {
    * @returns path to the folder that the extension can safely write files to.
    */
   async requestDirectory(extensionName: string): Promise<string> {
-    return this.dependencies.ensureHashedDirectoryForExtension(extensionName, this.registeredExtensions);
+    return this.dependencies.ensureHashedDirectoryForExtension(extensionName);
   }
 
   @action
   protected fromStore({ extensions }: FSProvisionModel = { extensions: {}}): void {
-    this.registeredExtensions.merge(extensions);
+    this.dependencies.registeredExtensions.merge(extensions);
   }
 
   toJSON(): FSProvisionModel {
     return toJS({
-      extensions: Object.fromEntries(this.registeredExtensions),
+      extensions: Object.fromEntries(this.dependencies.registeredExtensions),
     });
   }
 }

packages/core/src/extensions/extension-loader/file-system-provisioner-store/get-path-to-legacy-package-json.injectable.ts

@@ -0,0 +1,22 @@
+/**
+ * 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 directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
+
+export type GetPathToLegacyPackageJson = (extensionName: string) => string;
+
+const getPathToLegacyPackageJson = getInjectable({
+  id: "get-path-to-legacy-package-json",
+
+  instantiate: (di): GetPathToLegacyPackageJson => {
+    const directoryForUserData = di.inject(directoryForUserDataInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+
+    return (extensionName: string) => joinPaths(directoryForUserData, "node_modules", extensionName, "package.json");
+  },
+});
+
+export default getPathToLegacyPackageJson;

packages/core/src/extensions/extension-loader/file-system-provisioner-store/registered-extensions.injectable.ts

@@ -0,0 +1,12 @@
+/**
+ * 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 { observable } from "mobx";
+import type { LensExtensionId } from "../../lens-extension";
+
+export const registeredExtensionsInjectable = getInjectable({
+  id: "registered-extensions",
+  instantiate: () => observable.map<LensExtensionId, string>(),
+});

packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap

@@ -79,7 +79,11 @@ exports[`disable kube object detail items when cluster is not relevant given ext
             <span
               class="value"
             >
-              some-namespace
+              <a
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+              >
+                some-namespace
+              </a>
             </span>
           </div>
           <div
@@ -695,7 +699,11 @@ exports[`disable kube object detail items when cluster is not relevant given ext
             <span
               class="value"
             >
-              some-namespace
+              <a
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+              >
+                some-namespace
+              </a>
             </span>
           </div>
           <div>
@@ -1306,7 +1314,11 @@ exports[`disable kube object detail items when cluster is not relevant given not
             <span
               class="value"
             >
-              some-namespace
+              <a
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+              >
+                some-namespace
+              </a>
             </span>
           </div>
           <div>

packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap

@@ -79,7 +79,11 @@ exports[`reactively hide kube object detail item renders 1`] = `
             <span
               class="value"
             >
-              some-namespace
+              <a
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+              >
+                some-namespace
+              </a>
             </span>
           </div>
           <div>
@@ -690,7 +694,11 @@ exports[`reactively hide kube object detail item when the item is shown renders
             <span
               class="value"
             >
-              some-namespace
+              <a
+                href="/workloads?kube-details=%2Fapi%2Fv1%2Fnamespaces%2Fsome-namespace&kube-selected=%2Fapis%2Fsome-api-version%2Fnamespaces%2Fsome-namespace%2Fsome-kind%2Fsome-name"
+              >
+                some-namespace
+              </a>
             </span>
           </div>
           <div

packages/core/src/renderer/components/+nodes/details.tsx

@@ -9,7 +9,7 @@ import React from "react";
 import upperFirst from "lodash/upperFirst";
 import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
-import { DrawerItem, DrawerItemLabels } from "../drawer";
+import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { formatNodeTaint, Node } from "../../../common/k8s-api/endpoints";
@@ -23,7 +23,8 @@ import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.inj
 import type { PodStore } from "../+workloads-pods/store";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
-import loadPodsFromAllNamespacesInjectable from "../+workloads-pods/load-pods-from-all-namespaces.injectable";
+import loadPodsFromAllNamespacesInjectable
+  from "../+workloads-pods/load-pods-from-all-namespaces.injectable";
 
 export interface NodeDetailsProps extends KubeObjectDetailsProps<Node> {
 }
@@ -97,14 +98,6 @@ class NonInjectedNodeDetails extends React.Component<NodeDetailsProps & Dependen
             </DrawerItem>
           </>
         )}
-        <DrawerItemLabels
-          name="Labels"
-          labels={node.getLabels()}
-        />
-        <DrawerItemLabels
-          name="Annotations"
-          labels={node.getAnnotations()}
-        />
         {taints.length > 0 && (
           <DrawerItem name="Taints" labelsOnly>
             {taints.map(taint => <Badge key={taint.key} label={formatNodeTaint(taint)} />)}

packages/core/src/renderer/components/kube-object-meta/kube-object-meta.tsx

@@ -19,6 +19,8 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
+import type { NamespaceApi } from "../../../common/k8s-api/endpoints";
+import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable";
 
 export interface KubeObjectMetaProps {
   object: KubeObject;
@@ -28,20 +30,24 @@ export interface KubeObjectMetaProps {
 interface Dependencies {
   getDetailsUrl: GetDetailsUrl;
   apiManager: ApiManager;
+  namespaceApi: NamespaceApi;
   logger: Logger;
 }
 
-const NonInjectedKubeObjectMeta = observer(({
-  apiManager,
-  getDetailsUrl,
-  object,
-  hideFields = [
-    "uid",
-    "resourceVersion",
-    "selfLink",
-  ],
-  logger,
-}: Dependencies & KubeObjectMetaProps) => {
+const NonInjectedKubeObjectMeta = observer((
+  {
+    apiManager,
+    getDetailsUrl,
+    object,
+    hideFields = [
+      "uid",
+      "resourceVersion",
+      "selfLink",
+    ],
+    logger,
+    namespaceApi,
+  }
+    : Dependencies & KubeObjectMetaProps) => {
   if (!object) {
     return null;
   }
@@ -59,6 +65,10 @@ const NonInjectedKubeObjectMeta = observer(({
     getFinalizers, getId, getName, metadata: { creationTimestamp },
   } = object;
   const ownerRefs = object.getOwnerRefs();
+  const namespace = getNs();
+  const namespaceDetailsUrl = namespace ? getDetailsUrl(
+    namespaceApi.formatUrlForNotListing({ name: namespace }),
+  ) : "";
 
   return (
     <>
@@ -71,8 +81,8 @@ const NonInjectedKubeObjectMeta = observer(({
         {getName()}
         <KubeObjectStatusIcon key="icon" object={object} />
       </DrawerItem>
-      <DrawerItem name="Namespace" hidden={isHidden("namespace") || !getNs()}>
-        {getNs()}
+      <DrawerItem name="Namespace" hidden={isHidden("namespace") || !namespace}>
+        <Link to={namespaceDetailsUrl}>{namespace}</Link>
       </DrawerItem>
       <DrawerItem name="UID" hidden={isHidden("uid")}>
         {getId()}
@@ -122,5 +132,6 @@ export const KubeObjectMeta = withInjectables<Dependencies, KubeObjectMetaProps>
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
     apiManager: di.inject(apiManagerInjectable),
     logger: di.inject(loggerInjectable),
+    namespaceApi: di.inject(namespaceApiInjectable),
   }),
 });

packages/core/webpack/main.ts

@@ -36,7 +36,7 @@ const webpackLensMain = (): webpack.Configuration => {
       extensions: [".json", ".js", ".ts"],
     },
     externals: [
-      nodeExternals(),
+      nodeExternals({ modulesFromFile: true }),
     ],
     module: {
       parser: {

packages/core/webpack/renderer.ts

@@ -46,7 +46,7 @@ export function webpackLensRenderer(): webpack.Configuration {
       ],
     },
     externals: [
-      nodeExternals(),
+      nodeExternals({ modulesFromFile: true }),
     ],
     optimization: {
       minimize: false,