From 54e874f646896c9f22a278cf8d0f58d267fdbbb2 Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 16 Feb 2023 14:48:24 +0200 Subject: [PATCH 1/8] Replication Controllers (new resource view) (#7154) * New resource view: ReplicationController -- scaffolding files Signed-off-by: Roman * fix: inappropriate names after copy-pasting Signed-off-by: Roman * update replication controller api types/spec, fix menu title Signed-off-by: Roman * items list + details list views (added contents from replication controllers), lint fixes Signed-off-by: Roman * allow to scale replication controllers Signed-off-by: Roman * switched for scaling replicas with `Slider` component instead of `Buttons+Input` Signed-off-by: Roman --------- Signed-off-by: Roman --- ...e-to-replication-controllers.injectable.ts | 20 +++ ...replicationcontrollers-route.injectable.ts | 24 +++ .../src/common/k8s-api/endpoints/index.ts | 1 + .../replication-controller.api.injectable.ts | 23 +++ .../endpoints/replication-controller.api.ts | 149 ++++++++++++++++++ packages/core/src/common/rbac.ts | 7 +- .../index.ts | 7 + ...-controllers-route-component.injectable.ts | 24 +++ .../replicationcontroller-details.module.scss | 16 ++ .../replicationcontroller-details.tsx | 122 ++++++++++++++ ...ioncontroller-sidebar-items.injectable.tsx | 39 +++++ .../replicationcontroller-store.injectable.ts | 26 +++ .../replicationcontroller-store.ts | 23 +++ .../replicationcontrollers.module.scss | 8 + .../replicationcontrollers.tsx | 86 ++++++++++ ...ation-controller-detail-item.injectable.ts | 35 ++++ packages/core/src/renderer/utils/rbac.ts | 1 + 17 files changed, 610 insertions(+), 1 deletion(-) create mode 100644 packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/navigate-to-replication-controllers.injectable.ts create mode 100644 packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable.ts create mode 100644 packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts create mode 100644 packages/core/src/common/k8s-api/endpoints/replication-controller.api.ts create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/index.ts create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replication-controllers-route-component.injectable.ts create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.module.scss create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.tsx create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-sidebar-items.injectable.tsx create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.ts create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.module.scss create mode 100644 packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.tsx create mode 100644 packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replication-controller-detail-item.injectable.ts diff --git a/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/navigate-to-replication-controllers.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/navigate-to-replication-controllers.injectable.ts new file mode 100644 index 0000000000..240ad0f37e --- /dev/null +++ b/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/navigate-to-replication-controllers.injectable.ts @@ -0,0 +1,20 @@ +/** + * 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 replicationControllersRouteInjectable from "./replicationcontrollers-route.injectable"; +import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token"; + +const navigateToReplicationControllersInjectable = getInjectable({ + id: "navigate-to-replicationcontrollers", + + instantiate: (di) => { + const navigateToRoute = di.inject(navigateToRouteInjectionToken); + const route = di.inject(replicationControllersRouteInjectable); + + return () => navigateToRoute(route); + }, +}); + +export default navigateToReplicationControllersInjectable; diff --git a/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable.ts new file mode 100644 index 0000000000..77d87abc96 --- /dev/null +++ b/packages/core/src/common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable.ts @@ -0,0 +1,24 @@ +/** + * 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 { shouldShowResourceInjectionToken } from "../../../../../cluster-store/allowed-resources-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; + +const replicationControllersRouteInjectable = getInjectable({ + id: "replicationcontrollers-route", + + instantiate: (di) => ({ + path: "/replicationcontrollers", + clusterFrame: true, + isEnabled: di.inject(shouldShowResourceInjectionToken, { + apiName: "replicationcontrollers", + group: "", // core + }), + }), + + injectionToken: frontEndRouteInjectionToken, +}); + +export default replicationControllersRouteInjectable; diff --git a/packages/core/src/common/k8s-api/endpoints/index.ts b/packages/core/src/common/k8s-api/endpoints/index.ts index 0314c6b282..8fb6cbdabd 100644 --- a/packages/core/src/common/k8s-api/endpoints/index.ts +++ b/packages/core/src/common/k8s-api/endpoints/index.ts @@ -33,6 +33,7 @@ export * from "./pod-metrics.api"; export * from "./pod-security-policy.api"; export * from "./priority-class.api"; export * from "./replica-set.api"; +export * from "./replication-controller.api"; export * from "./resource-quota.api"; export * from "./role.api"; export * from "./role-binding.api"; diff --git a/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts new file mode 100644 index 0000000000..6d65f446b5 --- /dev/null +++ b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.injectable.ts @@ -0,0 +1,23 @@ +/** + * 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 { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token"; +import loggerInjectable from "../../logger.injectable"; +import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; +import { ReplicationControllerApi } from "./replication-controller.api"; + +const replicationControllerApiInjectable = getInjectable({ + id: "replication-controller-api", + instantiate: (di) => { + return new ReplicationControllerApi({ + logger: di.inject(loggerInjectable), + maybeKubeApi: di.inject(maybeKubeApiInjectable), + }); + }, + + injectionToken: kubeApiInjectionToken, +}); + +export default replicationControllerApiInjectable; diff --git a/packages/core/src/common/k8s-api/endpoints/replication-controller.api.ts b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.ts new file mode 100644 index 0000000000..b87b7a81a8 --- /dev/null +++ b/packages/core/src/common/k8s-api/endpoints/replication-controller.api.ts @@ -0,0 +1,149 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { DerivedKubeApiOptions, KubeApiDependencies } from "../kube-api"; +import { KubeApi } from "../kube-api"; +import type { + BaseKubeObjectCondition, KubeObjectMetadata, + KubeObjectStatus, + NamespaceScopedMetadata, +} from "../kube-object"; +import { KubeObject } from "../kube-object"; +import type { PodTemplateSpec } from "./types"; + +export class ReplicationControllerApi extends KubeApi { + constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { + super(deps, { + ...opts ?? {}, + objectConstructor: ReplicationController, + }); + } + + protected getScaleApiUrl(params: { namespace: string; name: string }) { + return `${this.formatUrlForNotListing(params)}/scale`; + } + + getScale(params: { namespace: string; name: string }): Promise { + return this.request.get(this.getScaleApiUrl(params)); + } + + scale(params: { namespace: string; name: string }, replicas: number): Promise { + return this.request.patch(this.getScaleApiUrl(params), { + data: { + metadata: params, + spec: { + replicas, + }, + }, + }, { + headers: { + "content-type": "application/strategic-merge-patch+json", + }, + }); + } +} + +export interface Scale { + apiVersion: "autoscaling/v1"; + kind: "Scale"; + metadata: KubeObjectMetadata; + spec: { + replicas: number; + }; + status: { + replicas: number; + selector: string; + }; +} + +export interface ReplicationControllerSpec { + /** + * Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. + * Defaults to 0 (pod will be considered available as soon as it is ready) + */ + minReadySeconds?: number; + /** + * Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. + * Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller + */ + replicas?: number; + /** + * Selector is a label query over pods that should match the Replicas count. If Selector is empty, it is defaulted to the labels present on the Pod template. + * Label keys and values that must match in order to be controlled by this replication controller, if empty defaulted to labels on Pod template. + * More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors + */ + selector?: Record; + /** + * Template is the object that describes the pod that will be created if insufficient replicas are detected. This takes precedence over a TemplateRef. + * More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template + */ + template: PodTemplateSpec; +} + +export interface ReplicationControllerStatus extends KubeObjectStatus { + /** + * The number of available replicas (ready for at least minReadySeconds) for this replication controller. + */ + availableReplicas: number; + /** + * The number of pods that have labels matching the labels of the pod template of the replication controller. + */ + fullyLabeledReplicas: number; + /** + * ObservedGeneration reflects the generation of the most recently observed replication controller. + */ + observedGeneration: number; + /** + * The number of ready replicas for this replication controller. + */ + readyReplicas: number; + /** + * Replicas is the most recently observed number of replicas. + * More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#what-is-a-replicationcontroller + */ + replicas: number; +} + +export class ReplicationController extends KubeObject< + NamespaceScopedMetadata, + ReplicationControllerStatus, + ReplicationControllerSpec +> { + static kind = "ReplicationController"; + static namespaced = true; + static apiBase = "/api/v1/replicationcontrollers"; + + getMinReadySeconds(): number { + return this.spec?.minReadySeconds ?? 0; + } + + getGeneration() { + return this.status?.observedGeneration; + } + + getSelectorLabels(): string[] { + return KubeObject.stringifyLabels(this.spec.selector); + } + + getReplicas(): number | undefined { + return this.status?.replicas; + } + + getDesiredReplicas(): number { + return this.spec?.replicas ?? 0; + } + + getAvailableReplicas(): number | undefined { + return this.status?.availableReplicas; + } + + getLabeledReplicas(): number | undefined { + return this.status?.fullyLabeledReplicas; + } + + getConditions(): BaseKubeObjectCondition[] { + return this.status?.conditions ?? []; + } +} diff --git a/packages/core/src/common/rbac.ts b/packages/core/src/common/rbac.ts index e2ccad3806..03b4fd1de9 100644 --- a/packages/core/src/common/rbac.ts +++ b/packages/core/src/common/rbac.ts @@ -6,7 +6,7 @@ export type KubeResource = "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" | "leases" | "secrets" | "configmaps" | "ingresses" | "ingressclasses" | "networkpolicies" | "persistentvolumeclaims" | "persistentvolumes" | "storageclasses" | - "pods" | "daemonsets" | "deployments" | "statefulsets" | "replicasets" | "jobs" | "cronjobs" | + "pods" | "daemonsets" | "deployments" | "statefulsets" | "replicasets" | "replicationcontrollers" | "jobs" | "cronjobs" | "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "verticalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets" | "priorityclasses" | "runtimeclasses" | "roles" | "clusterroles" | "rolebindings" | "clusterrolebindings" | "serviceaccounts"; @@ -171,6 +171,11 @@ export const apiResourceRecord: Record = { group: "apps", namespaced: true, }, + replicationcontrollers: { + kind: "ReplicationController", + group: "", // core + namespaced: true, + }, roles: { kind: "Role", group: "rbac.authorization.k8s.io", diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/index.ts b/packages/core/src/renderer/components/+workloads-replicationcontrollers/index.ts new file mode 100644 index 0000000000..5f9390ae2f --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/index.ts @@ -0,0 +1,7 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +export * from "./replicationcontrollers"; +export * from "./replicationcontroller-details"; diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replication-controllers-route-component.injectable.ts b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replication-controllers-route-component.injectable.ts new file mode 100644 index 0000000000..9049b69076 --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replication-controllers-route-component.injectable.ts @@ -0,0 +1,24 @@ +/** + * 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 { ReplicationControllers } from "./replicationcontrollers"; +import { + routeSpecificComponentInjectionToken, +} from "../../routes/route-specific-component-injection-token"; +import replicationControllersRouteInjectable + from "../../../common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable"; + +const replicationControllersRouteComponentInjectable = getInjectable({ + id: "replicationcontroller-route-component", + + instantiate: (di) => ({ + route: di.inject(replicationControllersRouteInjectable), + Component: ReplicationControllers, + }), + + injectionToken: routeSpecificComponentInjectionToken, +}); + +export default replicationControllersRouteComponentInjectable; diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.module.scss b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.module.scss new file mode 100644 index 0000000000..eb1d11143a --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.module.scss @@ -0,0 +1,16 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +.ReplicationControllerDetails { + .replicas { + display: flex; + gap: calc(var(--margin) * 2); + align-items: center; + + > * { + flex-shrink: 0; + } + } +} diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.tsx b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.tsx new file mode 100644 index 0000000000..44032e53ff --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-details.tsx @@ -0,0 +1,122 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import styles from "./replicationcontroller-details.module.scss"; +import React from "react"; +import { action, makeObservable, observable } from "mobx"; +import { observer } from "mobx-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import { DrawerItem, DrawerTitle } from "../drawer"; +import { Badge } from "../badge"; +import type { KubeObjectDetailsProps } from "../kube-object-details"; +import type { + ReplicationController, + ReplicationControllerApi, +} from "../../../common/k8s-api/endpoints"; +import replicationControllerApiInjectable + from "../../../common/k8s-api/endpoints/replication-controller.api.injectable"; +import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; +import type { ShowNotification } from "../notifications"; +import { Slider } from "../slider"; + +export interface ReplicationControllerDetailsProps extends KubeObjectDetailsProps { +} + +interface Dependencies { + api: ReplicationControllerApi; + showNotificationError: ShowNotification; +} + +@observer +class NonInjectedReplicationControllerDetails extends React.Component { + @observable sliderReplicasValue = this.props.object.getDesiredReplicas(); + @observable sliderReplicasDisabled = false; + + constructor(props: Props) { + super(props); + makeObservable(this); + } + + @action + async scale(replicas: number) { + const { object: resource, api, showNotificationError } = this.props; + + try { + await api.scale({ + name: resource.getName(), + namespace: resource.getNs(), + }, replicas); + } catch (error) { + this.sliderReplicasValue = resource.getDesiredReplicas(); // rollback to last valid value + showNotificationError(error as Error); + } + } + + @action + async onScaleSliderChangeCommitted(evt: React.FormEvent, replicas: number) { + this.sliderReplicasDisabled = true; + await this.scale(replicas); + this.sliderReplicasDisabled = false; + } + + render() { + const { object: resource } = this.props; + + return ( +
+ + Spec + + +
+
{resource.getDesiredReplicas()}
+
Scale
+ this.sliderReplicasValue = value} + onChangeCommitted={(event, value) => this.onScaleSliderChangeCommitted(event, value as number)} + /> +
+ + + { + resource.getSelectorLabels().map(label => ()) + } + + + + Status + + + {resource.getReplicas()} + + + {resource.getAvailableReplicas()} + + + {resource.getLabeledReplicas()} + + + {resource.getGeneration()} + + + {`${resource.getMinReadySeconds()} seconds`} + +
+ ); + } +} + +export const ReplicationControllerDetails = withInjectables(NonInjectedReplicationControllerDetails, { + getProps: (di, props) => ({ + ...props, + api: di.inject(replicationControllerApiInjectable), + showNotificationError: di.inject(showErrorNotificationInjectable), + }), +}); diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-sidebar-items.injectable.tsx b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-sidebar-items.injectable.tsx new file mode 100644 index 0000000000..670db2fd16 --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-sidebar-items.injectable.tsx @@ -0,0 +1,39 @@ +/** + * 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 { computed } from "mobx"; +import { workloadsSidebarItemId } from "../+workloads/workloads-sidebar-items.injectable"; +import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable"; +import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; +import replicationControllersRouteInjectable + from "../../../common/front-end-routing/routes/cluster/workloads/replicationcontrollers/replicationcontrollers-route.injectable"; +import navigateToReplicationControllersInjectable + from "../../../common/front-end-routing/routes/cluster/workloads/replicationcontrollers/navigate-to-replication-controllers.injectable"; + +const replicationControllerSidebarItemsInjectable = getInjectable({ + id: "replicationctrl-sidebar-items", + + instantiate: (di) => { + const route = di.inject(replicationControllersRouteInjectable); + const navigateToPage = di.inject(navigateToReplicationControllersInjectable); + const routeIsActive = di.inject(routeIsActiveInjectable, route); + + return computed(() => [ + { + id: "replication-controllers", + parentId: workloadsSidebarItemId, + title: "Replication Controllers", + onClick: navigateToPage, + isActive: routeIsActive, + isVisible: route.isEnabled, + orderNumber: 61, + }, + ]); + }, + + injectionToken: sidebarItemsInjectionToken, +}); + +export default replicationControllerSidebarItemsInjectable; diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts new file mode 100644 index 0000000000..5749acf915 --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.injectable.ts @@ -0,0 +1,26 @@ +/** + * 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 { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/kube-object-store-token"; +import { ReplicationControllerStore } from "./replicationcontroller-store"; +import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; +import replicationControllerApiInjectable + from "../../../common/k8s-api/endpoints/replication-controller.api.injectable"; + +const replicationControllerStoreInjectable = getInjectable({ + id: "replication-controller-store", + instantiate: (di) => { + const api = di.inject(replicationControllerApiInjectable); + + return new ReplicationControllerStore({ + context: di.inject(clusterFrameContextForNamespacedResourcesInjectable), + logger: di.inject(loggerInjectable), + }, api); + }, + injectionToken: kubeObjectStoreInjectionToken, +}); + +export default replicationControllerStoreInjectable; diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.ts b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.ts new file mode 100644 index 0000000000..9b5243c219 --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontroller-store.ts @@ -0,0 +1,23 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { + ReplicationController, + ReplicationControllerApi, +} from "../../../common/k8s-api/endpoints"; +import type { + KubeObjectStoreDependencies, + KubeObjectStoreOptions, +} from "../../../common/k8s-api/kube-object.store"; +import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; + +export interface ReplicationControllerStoreDependencies extends KubeObjectStoreDependencies { +} + +export class ReplicationControllerStore extends KubeObjectStore { + constructor(protected readonly dependencies: ReplicationControllerStoreDependencies, api: ReplicationControllerApi, opts?: KubeObjectStoreOptions) { + super(dependencies, api, opts); + } +} diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.module.scss b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.module.scss new file mode 100644 index 0000000000..db65602d19 --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.module.scss @@ -0,0 +1,8 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +.ReplicationControllers { + +} diff --git a/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.tsx b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.tsx new file mode 100644 index 0000000000..00f13feecc --- /dev/null +++ b/packages/core/src/renderer/components/+workloads-replicationcontrollers/replicationcontrollers.tsx @@ -0,0 +1,86 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import styles from "./replicationcontrollers.module.scss"; +import React from "react"; +import { observer } from "mobx-react"; +import { KubeObjectListLayout } from "../kube-object-list-layout"; +import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; +import type { ReplicationControllerStore } from "./replicationcontroller-store"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import replicationControllerStoreInjectable from "./replicationcontroller-store.injectable"; +import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge"; +import { Badge } from "../badge"; + +enum columnId { + name = "name", + namespace = "namespace", + replicas = "replicas", + replicasDesired = "replicasDesired", + selector = "selector", +} + +interface Dependencies { + store: ReplicationControllerStore; +} + +const NonInjectedReplicationControllers = observer((props: Dependencies) => { + return ( + + item.getName(), + [columnId.namespace]: item => item.getNs(), + [columnId.selector]: item => item.getSelectorLabels(), + [columnId.replicas]: item => item.getReplicas(), + [columnId.replicasDesired]: item => item.getDesiredReplicas(), + }} + searchFilters={[ + item => item.getSearchFields(), + item => item.getSelectorLabels(), + ]} + renderHeaderTitle="Replication Controllers" + renderTableHeader={[ + { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name }, + { + title: "Namespace", + className: "namespace", + sortBy: columnId.namespace, + id: columnId.namespace, + }, + { title: "Replicas", sortBy: columnId.replicas, id: columnId.replicas }, + { + title: "Desired Replicas", + sortBy: columnId.replicasDesired, + id: columnId.replicasDesired, + }, + { + title: "Selector", + sortBy: columnId.selector, + id: columnId.selector, + }, + ]} + renderTableContents={item => [ + item.getName(), + , + item.getReplicas(), + item.getDesiredReplicas(), + item.getSelectorLabels().map(label => ()), + ]} + /> + + ); +}); + +export const ReplicationControllers = withInjectables(NonInjectedReplicationControllers, { + getProps: (di, props) => ({ + ...props, + store: di.inject(replicationControllerStoreInjectable), + }), +}); diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replication-controller-detail-item.injectable.ts b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replication-controller-detail-item.injectable.ts new file mode 100644 index 0000000000..df14d6cc35 --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replication-controller-detail-item.injectable.ts @@ -0,0 +1,35 @@ +/** + * 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 { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { + kubeObjectMatchesToKindAndApiVersion, +} from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { ReplicationControllerDetails } from "../../../+workloads-replicationcontrollers"; + +const replicationControllerDetailItemInjectable = getInjectable({ + id: "replication-controller-detail-item", + + instantiate(di) { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ReplicationControllerDetails, + enabled: computed(() => isReplicationController(kubeObject.value.get()?.object)), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isReplicationController = kubeObjectMatchesToKindAndApiVersion( + "ReplicationController", + ["v1"], +); + +export default replicationControllerDetailItemInjectable; diff --git a/packages/core/src/renderer/utils/rbac.ts b/packages/core/src/renderer/utils/rbac.ts index 00135a6492..18748bcfac 100644 --- a/packages/core/src/renderer/utils/rbac.ts +++ b/packages/core/src/renderer/utils/rbac.ts @@ -27,6 +27,7 @@ export const ResourceNames: Record = { "deployments": "Deployments", "statefulsets": "Stateful Sets", "replicasets": "Replica Sets", + "replicationcontrollers": "Replication Controllers", "jobs": "Jobs", "cronjobs": "Cron Jobs", "endpoints": "Endpoints", From 4bf72742fd93b04e3aec7f9864ccce0bd36745b9 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 16 Feb 2023 14:49:43 +0200 Subject: [PATCH 2/8] Fix configuration shown release details being stale (#7174) Signed-off-by: Janne Savolainen --- ...wing-details-for-helm-release.test.ts.snap | 2086 ++++++++++++++++- .../showing-details-for-helm-release.test.ts | 91 +- .../release-details-content.tsx | 6 +- 3 files changed, 2170 insertions(+), 13 deletions(-) diff --git a/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap index 86e80acc4c..c36ac69784 100644 --- a/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap +++ b/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -5818,7 +5818,7 @@ exports[`showing details for helm release given application is started when navi @@ -7100,7 +7100,7 @@ exports[`showing details for helm release given application is started when navi @@ -8382,7 +8382,7 @@ exports[`showing details for helm release given application is started when navi @@ -9469,7 +9469,7 @@ exports[`showing details for helm release given application is started when navi @@ -10557,7 +10557,7 @@ exports[`showing details for helm release given application is started when navi @@ -11840,7 +11840,7 @@ exports[`showing details for helm release given application is started when navi @@ -17047,3 +17047,2077 @@ exports[`showing details for helm release given application is started when navi `; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when opening details for second release when details for second release resolve renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 2 items +
+
+
+ + +
+
+
+ Namespaces: some-namespace, some-other-namespace +
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+ Namespace +
+ + + arrow_drop_down + + +
+
+
+ Chart +
+ + + arrow_drop_down + + +
+
+
+ Revision +
+ + + arrow_drop_down + + +
+
+
+ Version +
+
+
+
+ App Version +
+
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ Updated +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ some-name +
+
+
+ some-namespace +
+
+ Set global namespace filter to: + + some-namespace + +
+
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+
+ some-other-namespace +
+
+ Set global namespace filter to: + + some-other-namespace + +
+
+
+ some-other-chart +
+
+ NaN +
+
+ 2.0.0 +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+
+
+
+
+ some-other-name + + + content_copy + + +
+ Copy +
+
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+ +`; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when opening details for second release when details for second release resolve when configuration resolves renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 2 items +
+
+
+ + +
+
+
+ Namespaces: some-namespace, some-other-namespace +
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+ Namespace +
+ + + arrow_drop_down + + +
+
+
+ Chart +
+ + + arrow_drop_down + + +
+
+
+ Revision +
+ + + arrow_drop_down + + +
+
+
+ Version +
+
+
+
+ App Version +
+
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ Updated +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ some-name +
+
+
+ some-namespace +
+
+ Set global namespace filter to: + + some-namespace + +
+
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+
+ some-other-namespace +
+
+ Set global namespace filter to: + + some-other-namespace + +
+
+
+ some-other-chart +
+
+ NaN +
+
+ 2.0.0 +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+
+
+
+
+ some-other-name + + + content_copy + + +
+ Copy +
+
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+ +`; diff --git a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts index 9294b3057e..ca947358ad 100644 --- a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -224,15 +224,96 @@ describe("showing details for helm release", () => { it("closes details for first release", () => { expect( - rendered.queryByTestId("helm-release-details-for-some-namespace/some-name"), + rendered.queryByTestId( + "helm-release-details-for-some-namespace/some-name", + ), ).not.toBeInTheDocument(); }); it("opens details for second release", () => { expect( - rendered.getByTestId("helm-release-details-for-some-other-namespace/some-other-name"), + rendered.getByTestId( + "helm-release-details-for-some-other-namespace/some-other-name", + ), ).toBeInTheDocument(); }); + + it("shows spinner", () => { + expect( + rendered.getByTestId("helm-release-detail-content-spinner"), + ).toBeInTheDocument(); + }); + + describe("when details for second release resolve", () => { + beforeEach(async () => { + await requestDetailedHelmReleaseMock.resolve({ + callWasSuccessful: true, + response: { + release: { + appVersion: "some-app-version", + chart: "some-chart-1.0.0", + status: "some-status", + updated: "some-updated", + revision: "some-revision", + name: "some-other-name", + namespace: "some-other-namespace", + }, + + details: { + name: "some-other-name", + namespace: "some-other-namespace", + version: "some-version", + config: "some-config", + manifest: "some-manifest", + + info: { + deleted: "some-deleted", + description: "some-description", + first_deployed: "some-first-deployed", + last_deployed: "some-last-deployed", + notes: "some-notes", + status: "some-status", + }, + + resources: [ + { + kind: "some-kind", + apiVersion: "some-api-version", + metadata: { + uid: "some-uid", + name: "some-resource", + namespace: "some-namespace", + creationTimestamp: "2015-10-22T07:28:00Z", + }, + }, + ], + }, + }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for release configuration", () => { + expect( + requestHelmReleaseConfigurationMock, + ).toHaveBeenCalledWith("some-other-name", "some-other-namespace", true); + }); + + describe("when configuration resolves", () => { + beforeEach(async () => { + await requestHelmReleaseConfigurationMock.resolve( + "some-other-configuration", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + }); }); describe("when details is closed", () => { @@ -410,7 +491,7 @@ describe("showing details for helm release", () => { describe("when changing the configuration", () => { beforeEach(() => { const configuration = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); fireEvent.change(configuration, { @@ -424,7 +505,7 @@ describe("showing details for helm release", () => { it("has the configuration", () => { const input = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); expect(input).toHaveValue("some-new-configuration"); @@ -466,7 +547,7 @@ describe("showing details for helm release", () => { it("overrides the user inputted configuration with new configuration", () => { const input = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); expect(input).toHaveValue("some-other-configuration"); diff --git a/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx b/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx index 02e3255304..ebfb51c6ef 100644 --- a/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx +++ b/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx @@ -85,6 +85,7 @@ const NonInjectedReleaseDetailsContent = observer(({ model }: Dependencies & Rel { +const ReleaseValues = observer(({ releaseId, configuration, onlyUserSuppliedValuesAreShown }: ReleaseValuesProps) => { const configurationIsLoading = configuration.isLoading.get(); return ( @@ -171,7 +173,7 @@ const ReleaseValues = observer(({ configuration, onlyUserSuppliedValuesAreShown /> Date: Thu, 16 Feb 2023 14:52:09 +0200 Subject: [PATCH 3/8] Change extension ipc registration log level from info to debug (#7175) Signed-off-by: Jari Kolehmainen --- packages/core/src/extensions/ipc/ipc-main.ts | 8 ++++---- packages/core/src/extensions/ipc/ipc-renderer.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/extensions/ipc/ipc-main.ts b/packages/core/src/extensions/ipc/ipc-main.ts index cd18bcc56c..8bb0ada63d 100644 --- a/packages/core/src/extensions/ipc/ipc-main.ts +++ b/packages/core/src/extensions/ipc/ipc-main.ts @@ -27,12 +27,12 @@ export abstract class IpcMain extends IpcRegistrar { listen(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => any): Disposer { const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`; const cleanup = once(() => { - this.extension[lensExtensionDependencies].logger.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + this.extension[lensExtensionDependencies].logger.debug(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); return ipcMain.removeListener(prefixedChannel, listener); }); - this.extension[lensExtensionDependencies].logger.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + this.extension[lensExtensionDependencies].logger.debug(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); ipcMain.addListener(prefixedChannel, listener); this.extension[Disposers].push(cleanup); @@ -47,10 +47,10 @@ export abstract class IpcMain extends IpcRegistrar { handle(channel: string, handler: (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any): void { const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`; - this.extension[lensExtensionDependencies].logger.info(`[IPC-RENDERER]: adding extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + this.extension[lensExtensionDependencies].logger.debug(`[IPC-RENDERER]: adding extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); ipcMainHandle(prefixedChannel, handler); this.extension[Disposers].push(() => { - this.extension[lensExtensionDependencies].logger.info(`[IPC-RENDERER]: removing extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + this.extension[lensExtensionDependencies].logger.debug(`[IPC-RENDERER]: removing extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); return ipcMain.removeHandler(prefixedChannel); }); diff --git a/packages/core/src/extensions/ipc/ipc-renderer.ts b/packages/core/src/extensions/ipc/ipc-renderer.ts index 71b67779f5..ff61738113 100644 --- a/packages/core/src/extensions/ipc/ipc-renderer.ts +++ b/packages/core/src/extensions/ipc/ipc-renderer.ts @@ -28,12 +28,12 @@ export abstract class IpcRenderer extends IpcRegistrar { listen(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => any): Disposer { const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`; const cleanup = once(() => { - console.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + console.debug(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); return ipcRenderer.removeListener(prefixedChannel, listener); }); - console.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); + console.debug(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }}); ipcRenderer.addListener(prefixedChannel, listener); this.extension[Disposers].push(cleanup); From 7e1b56b9429efa0469301625725957f5e848515c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:55:07 -0500 Subject: [PATCH 4/8] Bump joi from 17.7.0 to 17.7.1 (#7172) Bumps [joi](https://github.com/hapijs/joi) from 17.7.0 to 17.7.1. - [Release notes](https://github.com/hapijs/joi/releases) - [Commits](https://github.com/hapijs/joi/compare/v17.7.0...v17.7.1) --- updated-dependencies: - dependency-name: joi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/core/package.json | 2 +- packages/core/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 6c952adc4c..039813ba68 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -158,7 +158,7 @@ "hpagent": "^1.2.0", "http-proxy": "^1.18.1", "immer": "^9.0.19", - "joi": "^17.7.0", + "joi": "^17.7.1", "js-yaml": "^4.1.0", "lodash": "^4.17.15", "marked": "^4.2.12", diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index fa5cdf3baa..0de9a93ed9 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -1778,10 +1778,10 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@sideway/formula@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" - integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== +"@sideway/formula@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== "@sideway/pinpoint@^2.0.0": version "2.0.0" @@ -7806,15 +7806,15 @@ jest@^28.1.3: import-local "^3.0.2" jest-cli "^28.1.3" -joi@^17.7.0: - version "17.7.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.0.tgz#591a33b1fe1aca2bc27f290bcad9b9c1c570a6b3" - integrity sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg== +joi@^17.7.1: + version "17.7.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.1.tgz#854fc85c7fa3cfc47c91124d30bffdbb58e06cec" + integrity sha512-teoLhIvWE298R6AeJywcjR4sX2hHjB3/xJX4qPjg+gTg+c0mzUDsziYlqPmLomq9gVsfaMcgPaGc7VxtD/9StA== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" "@sideway/address" "^4.1.3" - "@sideway/formula" "^3.0.0" + "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" jose@^4.10.0: From c41e4c305f381ca69115a2b2646b49bf0ef2327f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:55:50 -0500 Subject: [PATCH 5/8] Bump zod from 3.20.2 to 3.20.6 (#7169) Bumps [zod](https://github.com/colinhacks/zod) from 3.20.2 to 3.20.6. - [Release notes](https://github.com/colinhacks/zod/releases) - [Changelog](https://github.com/colinhacks/zod/blob/master/CHANGELOG.md) - [Commits](https://github.com/colinhacks/zod/compare/v3.20.2...v3.20.6) --- updated-dependencies: - dependency-name: zod dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/ensure-binaries/package.json | 2 +- packages/ensure-binaries/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/ensure-binaries/package.json b/packages/ensure-binaries/package.json index d4c55b435e..4e3ff58478 100644 --- a/packages/ensure-binaries/package.json +++ b/packages/ensure-binaries/package.json @@ -28,7 +28,7 @@ "gunzip-maybe": "^1.4.2", "node-fetch": "^3.3.0", "tar-stream": "^3.0.0", - "zod": "^3.20.2" + "zod": "^3.20.6" }, "devDependencies": { "@swc/cli": "^0.1.61", diff --git a/packages/ensure-binaries/yarn.lock b/packages/ensure-binaries/yarn.lock index 6c2c510270..0cb22ec3ef 100644 --- a/packages/ensure-binaries/yarn.lock +++ b/packages/ensure-binaries/yarn.lock @@ -1206,7 +1206,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -zod@^3.20.2: - version "3.20.2" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.20.2.tgz#068606642c8f51b3333981f91c0a8ab37dfc2807" - integrity sha512-1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ== +zod@^3.20.6: + version "3.20.6" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.20.6.tgz#2f2f08ff81291d47d99e86140fedb4e0db08361a" + integrity sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA== From d7585d339dcb1dfeea51483f210e5daed6836180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:57:58 -0500 Subject: [PATCH 6/8] Bump mobx from 6.7.0 to 6.8.0 (#7170) Bumps [mobx](https://github.com/mobxjs/mobx) from 6.7.0 to 6.8.0. - [Release notes](https://github.com/mobxjs/mobx/releases) - [Commits](https://github.com/mobxjs/mobx/commits) --- updated-dependencies: - dependency-name: mobx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/core/package.json | 2 +- packages/core/yarn.lock | 8 ++++---- packages/open-lens/package.json | 2 +- packages/open-lens/yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 039813ba68..e88c3642fc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -163,7 +163,7 @@ "lodash": "^4.17.15", "marked": "^4.2.12", "md5-file": "^5.0.0", - "mobx": "^6.7.0", + "mobx": "^6.8.0", "mobx-observable-history": "^2.0.3", "mobx-react": "^7.6.0", "mobx-utils": "^6.0.4", diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index 0de9a93ed9..78f6cb8ed1 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -8941,10 +8941,10 @@ mobx-utils@^6.0.4: resolved "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-6.0.5.tgz#0cce9afb07fbba1fb559f959f8cea1f44baa7252" integrity sha512-QOduwicYedD4mwYZRl8+c3BalljFDcubg+PUGqBkn8tOuBoj2q7GhjXBP6JXM9J+Zh+2mePK8IoToeLfqr3Z/w== -mobx@^6.3.0, mobx@^6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.7.0.tgz#2d805610fee1801fd015c54fd5400d2601aa3768" - integrity sha512-1kBLBdSNG2bA522HQdbsTvwAwYf9hq9FWxmlhX7wTsJUAI54907J+ozfGW+LoYUo06vjit748g6QH1AAGLNebw== +mobx@^6.3.0, mobx@^6.8.0: + version "6.8.0" + resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.8.0.tgz#59051755fdb5c8a9f3f2e0a9b6abaf86bab7f843" + integrity sha512-+o/DrHa4zykFMSKfS8Z+CPSEg5LW9tSNGTuN8o6MF1GKxlfkSHSeJn5UtgxvPkGgaouplnrLXCF+duAsmm6FHQ== mock-http@^1.1.0: version "1.1.0" diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 4aa22a2577..f815bdfd9a 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -200,7 +200,7 @@ "@ogre-tools/injectable-extension-for-auto-registration": "^12.0.1", "@ogre-tools/injectable-extension-for-mobx": "^12.0.1", "@ogre-tools/injectable-react": "^12.0.1", - "mobx": "^6.7.0", + "mobx": "^6.8.0", "rimraf": "^4.1.2" }, "devDependencies": { diff --git a/packages/open-lens/yarn.lock b/packages/open-lens/yarn.lock index eede6fbf8b..871fc96a1c 100644 --- a/packages/open-lens/yarn.lock +++ b/packages/open-lens/yarn.lock @@ -7451,10 +7451,10 @@ mobx-utils@^6.0.4: resolved "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-6.0.5.tgz#0cce9afb07fbba1fb559f959f8cea1f44baa7252" integrity sha512-QOduwicYedD4mwYZRl8+c3BalljFDcubg+PUGqBkn8tOuBoj2q7GhjXBP6JXM9J+Zh+2mePK8IoToeLfqr3Z/w== -mobx@^6.3.0, mobx@^6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.7.0.tgz#2d805610fee1801fd015c54fd5400d2601aa3768" - integrity sha512-1kBLBdSNG2bA522HQdbsTvwAwYf9hq9FWxmlhX7wTsJUAI54907J+ozfGW+LoYUo06vjit748g6QH1AAGLNebw== +mobx@^6.3.0, mobx@^6.7.0, mobx@^6.8.0: + version "6.8.0" + resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.8.0.tgz#59051755fdb5c8a9f3f2e0a9b6abaf86bab7f843" + integrity sha512-+o/DrHa4zykFMSKfS8Z+CPSEg5LW9tSNGTuN8o6MF1GKxlfkSHSeJn5UtgxvPkGgaouplnrLXCF+duAsmm6FHQ== moment-timezone@^0.5.40: version "0.5.40" From 8e4f7a4623ce530f9e75874acc79a37463bd92fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:58:27 -0500 Subject: [PATCH 7/8] Bump lerna from 6.5.0 to 6.5.1 (#7171) Bumps [lerna](https://github.com/lerna/lerna/tree/HEAD/packages/lerna) from 6.5.0 to 6.5.1. - [Release notes](https://github.com/lerna/lerna/releases) - [Changelog](https://github.com/lerna/lerna/blob/main/packages/lerna/CHANGELOG.md) - [Commits](https://github.com/lerna/lerna/commits/6.5.1/packages/lerna) --- updated-dependencies: - dependency-name: lerna dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 830939a7cb..d68bce842b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "devDependencies": { "adr": "^1.4.3", "cross-env": "^7.0.3", - "lerna": "^6.5.0", + "lerna": "^6.5.1", "rimraf": "^4.1.2" } } diff --git a/yarn.lock b/yarn.lock index 011853ac7a..255ddf3ae5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,21 +38,21 @@ resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== -"@lerna/child-process@6.5.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.5.0.tgz#8a0d37453f2163c3a1737493d328399a53e4cc5b" - integrity sha512-ZuN3eivyzkaCCT4MNwHW5FuJ0Zu4kPFCnx7NXcGisca4a7Urjs3odZN1Tf9ZoYcPCf2I9DKfHj2bfnS0SHpMIg== +"@lerna/child-process@6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.5.1.tgz#da9161ba00e8d67fa7241a709703e5cc5e4a5e5e" + integrity sha512-QfyleXSD9slh4qM54wDaqKVPvtUH1NJMgsFc9BabqSHO1Ttpandv1EAvTCN9Lu73RbCX3LJpn+BfJmnjHbjCyw== dependencies: chalk "^4.1.0" execa "^5.0.0" strong-log-transformer "^2.1.0" -"@lerna/create@6.5.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-6.5.0.tgz#b8350e145968f17c4b785c50c0cba49079c192e8" - integrity sha512-EbYXW6W/khXDXhA15HETcU7toq2zxuqalBw9MZzHWj3sEBQsTd/un56qzIRMWUuHy8CO7FxJIdPItYI8QPop4A== +"@lerna/create@6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-6.5.1.tgz#326b5d26c247bfc9e2d8728aa1f69419840cec8c" + integrity sha512-ejERJnfA36jEuKrfM+94feLiyf2/hF2NoG923N0rE4rsmvRFPr1XLVPvAKleXW+Gdi/t1p410lJ7NKaLRMYCYw== dependencies: - "@lerna/child-process" "6.5.0" + "@lerna/child-process" "6.5.1" dedent "^0.7.0" fs-extra "^9.1.0" init-package-json "^3.0.2" @@ -2266,7 +2266,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@4.1.0: +js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -2359,13 +2359,13 @@ lazy-cache@^2.0.2: dependencies: set-getter "^0.1.0" -lerna@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.5.0.tgz#c46f179ecf88d6a55010ced0a0ccdacdf9d3fcd2" - integrity sha512-2GbRXeQLFf9KwxRXd+AgEEzKat4DbvVnXtSVDkpgzIzITXtYPThxqzYhhaHUhBSM9Rq7TcJ1XLbArS2qIvlazg== +lerna@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.5.1.tgz#eb89698e5b2891f5681f39d980f63d0519fc464f" + integrity sha512-Va1bysubwWdoWZ1ncKcoTGBXNAu/10/TwELb550TTivXmEWjCCdek4eX0BNLTEYKxu3tpV2UEeqVisUiWGn4WA== dependencies: - "@lerna/child-process" "6.5.0" - "@lerna/create" "6.5.0" + "@lerna/child-process" "6.5.1" + "@lerna/create" "6.5.1" "@npmcli/arborist" "5.3.0" "@npmcli/run-script" "4.1.7" "@nrwl/devkit" ">=15.5.2 < 16" @@ -2398,6 +2398,7 @@ lerna@^6.5.0: inquirer "^8.2.4" is-ci "2.0.0" is-stream "2.0.0" + js-yaml "^4.1.0" libnpmaccess "6.0.3" libnpmpublish "6.0.4" load-json-file "6.2.0" From c94dce2c2927dbef8efe75654eff365aba46543a Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 16 Feb 2023 17:51:57 +0200 Subject: [PATCH 8/8] Fix chromium net error codes (#7180) Signed-off-by: Jari Kolehmainen --- .../application-window/create-electron-window.injectable.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts index fde9348234..0f8c84668b 100644 --- a/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts +++ b/packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts @@ -27,10 +27,11 @@ export interface UrlSource { } export type ContentSource = RequireExactlyOne; +// see https://www.electronjs.org/docs/latest/api/session#sessetcertificateverifyprocproc enum ChromiumNetError { SUCCESS = 0, - FAILURE = 1, - RESULT_FROM_CHROMIUM, + FAILURE = -2, + RESULT_FROM_CHROMIUM = -3, } export interface ElectronWindowConfiguration {