From 0298b36a9f54eba3a77cf4401ede5566bfc1a3fa Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Mon, 8 May 2023 13:19:31 +0300 Subject: [PATCH] chore: kube-api lint fixes Signed-off-by: Jari Kolehmainen --- .../kube-api/src/endpoints/daemon-set.api.ts | 18 ++++++++++------- .../kube-api/src/endpoints/deployment.api.ts | 20 +++++++++++-------- .../horizontal-pod-autoscaler.api.ts | 9 ++------- .../src/endpoints/ingress-class.api.ts | 14 ++++++++----- .../kube-api/src/endpoints/ingress.api.ts | 2 +- .../kube-api/src/endpoints/job.api.ts | 2 +- .../kube-api/src/endpoints/lease.api.ts | 2 +- .../kube-api/src/endpoints/limit-range.api.ts | 3 +-- .../mutating-webhook-configuration.api.ts | 2 +- .../kube-api/src/endpoints/namespace.api.ts | 2 +- .../kube-api/src/endpoints/node.api.ts | 2 +- .../endpoints/persistent-volume-claim.api.ts | 3 +-- .../src/endpoints/pod-security-policy.api.ts | 1 - .../kube-api/src/endpoints/pod.api.ts | 4 ++-- .../src/endpoints/priority-class.api.ts | 1 - .../kube-api/src/endpoints/replica-set.api.ts | 4 ++-- .../endpoints/replication-controller.api.ts | 4 ++-- .../src/endpoints/role-binding.api.ts | 1 - .../self-subject-rules-reviews.api.ts | 13 +++++++----- .../src/endpoints/stateful-set.api.ts | 20 +++++++++++-------- .../validating-webhook-configuration.api.ts | 2 +- .../endpoints/vertical-pod-autoscaler.api.ts | 3 +-- .../utility-features/kube-api/src/kube-api.ts | 2 +- 23 files changed, 71 insertions(+), 63 deletions(-) diff --git a/packages/utility-features/kube-api/src/endpoints/daemon-set.api.ts b/packages/utility-features/kube-api/src/endpoints/daemon-set.api.ts index 3a9dd31b2e..d606dcd932 100644 --- a/packages/utility-features/kube-api/src/endpoints/daemon-set.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/daemon-set.api.ts @@ -11,20 +11,24 @@ import { DaemonSet } from "@k8slens/kube-object"; export class DaemonSetApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: DaemonSet, }); } restart(params: NamespacedResourceDescriptor) { - return this.patch(params, { - spec: { - template: { - metadata: { - annotations: { "kubectl.kubernetes.io/restartedAt" : moment.utc().format() }, + return this.patch( + params, + { + spec: { + template: { + metadata: { + annotations: { "kubectl.kubernetes.io/restartedAt": moment.utc().format() }, + }, }, }, }, - }, "strategic"); + "strategic", + ); } } diff --git a/packages/utility-features/kube-api/src/endpoints/deployment.api.ts b/packages/utility-features/kube-api/src/endpoints/deployment.api.ts index 7cfbe4cb01..8cf614f4e3 100644 --- a/packages/utility-features/kube-api/src/endpoints/deployment.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/deployment.api.ts @@ -12,7 +12,7 @@ import { Deployment } from "@k8slens/kube-object"; export class DeploymentApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Deployment, }); } @@ -24,18 +24,22 @@ export class DeploymentApi extends KubeApi { } scale(params: NamespacedResourceDescriptor, replicas: number) { - return this.scaleResource(params, { spec: { replicas }}); + return this.scaleResource(params, { spec: { replicas } }); } restart(params: NamespacedResourceDescriptor) { - return this.patch(params, { - spec: { - template: { - metadata: { - annotations: { "kubectl.kubernetes.io/restartedAt" : moment.utc().format() }, + return this.patch( + params, + { + spec: { + template: { + metadata: { + annotations: { "kubectl.kubernetes.io/restartedAt": moment.utc().format() }, + }, }, }, }, - }, "strategic"); + "strategic", + ); } } diff --git a/packages/utility-features/kube-api/src/endpoints/horizontal-pod-autoscaler.api.ts b/packages/utility-features/kube-api/src/endpoints/horizontal-pod-autoscaler.api.ts index 6f580a2880..85b3b92913 100644 --- a/packages/utility-features/kube-api/src/endpoints/horizontal-pod-autoscaler.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/horizontal-pod-autoscaler.api.ts @@ -11,14 +11,9 @@ export class HorizontalPodAutoscalerApi extends KubeApi constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { allowedUsableVersions: { - autoscaling: [ - "v2", - "v2beta2", - "v2beta1", - "v1", - ], + autoscaling: ["v2", "v2beta2", "v2beta1", "v1"], }, - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: HorizontalPodAutoscaler, checkPreferredVersion: true, }); diff --git a/packages/utility-features/kube-api/src/endpoints/ingress-class.api.ts b/packages/utility-features/kube-api/src/endpoints/ingress-class.api.ts index c47b19407b..08f7c82263 100644 --- a/packages/utility-features/kube-api/src/endpoints/ingress-class.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/ingress-class.api.ts @@ -17,12 +17,16 @@ export class IngressClassApi extends KubeApi { } setAsDefault({ name }: ResourceDescriptor, isDefault = true) { - return this.patch({ name }, { - metadata: { - annotations: { - [IngressClass.ANNOTATION_IS_DEFAULT]: String(isDefault), + return this.patch( + { name }, + { + metadata: { + annotations: { + [IngressClass.ANNOTATION_IS_DEFAULT]: String(isDefault), + }, }, }, - }, "strategic"); + "strategic", + ); } } diff --git a/packages/utility-features/kube-api/src/endpoints/ingress.api.ts b/packages/utility-features/kube-api/src/endpoints/ingress.api.ts index ca8c018935..56bbc383fa 100644 --- a/packages/utility-features/kube-api/src/endpoints/ingress.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/ingress.api.ts @@ -10,7 +10,7 @@ import { KubeApi } from "../kube-api"; export class IngressApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Ingress, // Add fallback for Kubernetes <1.19 checkPreferredVersion: true, diff --git a/packages/utility-features/kube-api/src/endpoints/job.api.ts b/packages/utility-features/kube-api/src/endpoints/job.api.ts index 15d145cbba..7f4bdd3564 100644 --- a/packages/utility-features/kube-api/src/endpoints/job.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/job.api.ts @@ -10,7 +10,7 @@ import { Job } from "@k8slens/kube-object"; export class JobApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Job, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/lease.api.ts b/packages/utility-features/kube-api/src/endpoints/lease.api.ts index 66a3adb960..b56e8ae9cf 100644 --- a/packages/utility-features/kube-api/src/endpoints/lease.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/lease.api.ts @@ -10,7 +10,7 @@ import { Lease } from "@k8slens/kube-object"; export class LeaseApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Lease, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/limit-range.api.ts b/packages/utility-features/kube-api/src/endpoints/limit-range.api.ts index a393d4ab06..3c3767c254 100644 --- a/packages/utility-features/kube-api/src/endpoints/limit-range.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/limit-range.api.ts @@ -7,12 +7,11 @@ import { LimitRange } from "@k8slens/kube-object"; import type { DerivedKubeApiOptions, KubeApiDependencies } from "../kube-api"; import { KubeApi } from "../kube-api"; - export class LimitRangeApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { objectConstructor: LimitRange, - ...opts ?? {}, + ...(opts ?? {}), }); } } diff --git a/packages/utility-features/kube-api/src/endpoints/mutating-webhook-configuration.api.ts b/packages/utility-features/kube-api/src/endpoints/mutating-webhook-configuration.api.ts index ac1bd51a2a..0b18ecfaae 100644 --- a/packages/utility-features/kube-api/src/endpoints/mutating-webhook-configuration.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/mutating-webhook-configuration.api.ts @@ -9,7 +9,7 @@ import { KubeApi } from "../kube-api"; export class MutatingWebhookConfigurationApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: MutatingWebhookConfiguration, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/namespace.api.ts b/packages/utility-features/kube-api/src/endpoints/namespace.api.ts index 65050a544d..4ae16780a7 100644 --- a/packages/utility-features/kube-api/src/endpoints/namespace.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/namespace.api.ts @@ -10,7 +10,7 @@ import { Namespace } from "@k8slens/kube-object"; export class NamespaceApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Namespace, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/node.api.ts b/packages/utility-features/kube-api/src/endpoints/node.api.ts index 5173ed719b..bca14c1591 100644 --- a/packages/utility-features/kube-api/src/endpoints/node.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/node.api.ts @@ -10,7 +10,7 @@ import { KubeApi } from "../kube-api"; export class NodeApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Node, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/persistent-volume-claim.api.ts b/packages/utility-features/kube-api/src/endpoints/persistent-volume-claim.api.ts index ef4b5f1ba3..9e786c1c8b 100644 --- a/packages/utility-features/kube-api/src/endpoints/persistent-volume-claim.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/persistent-volume-claim.api.ts @@ -10,9 +10,8 @@ import { PersistentVolumeClaim } from "@k8slens/kube-object"; export class PersistentVolumeClaimApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: PersistentVolumeClaim, }); } } - diff --git a/packages/utility-features/kube-api/src/endpoints/pod-security-policy.api.ts b/packages/utility-features/kube-api/src/endpoints/pod-security-policy.api.ts index 89f3e003f8..760aa91aa3 100644 --- a/packages/utility-features/kube-api/src/endpoints/pod-security-policy.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/pod-security-policy.api.ts @@ -12,7 +12,6 @@ export class PodSecurityPolicyApi extends KubeApi { super(deps, { ...opts, objectConstructor: PodSecurityPolicy, - }); } } diff --git a/packages/utility-features/kube-api/src/endpoints/pod.api.ts b/packages/utility-features/kube-api/src/endpoints/pod.api.ts index 3b336de577..3d0bb675ae 100644 --- a/packages/utility-features/kube-api/src/endpoints/pod.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/pod.api.ts @@ -13,11 +13,10 @@ import { KubeApi } from "../kube-api"; import type { KubeStatusData, PodLogsQuery } from "@k8slens/kube-object"; import { isKubeStatusData, KubeStatus, Pod } from "@k8slens/kube-object"; - export class PodApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: Pod, }); } @@ -47,6 +46,7 @@ export class PodApi extends KubeApi { if (status.code >= 200 && status.code < 300) { return status.getExplanation(); } else { + // eslint-disable-next-line @typescript-eslint/no-throw-literal throw status.getExplanation(); } } diff --git a/packages/utility-features/kube-api/src/endpoints/priority-class.api.ts b/packages/utility-features/kube-api/src/endpoints/priority-class.api.ts index d5e3319d27..b982d70aa5 100644 --- a/packages/utility-features/kube-api/src/endpoints/priority-class.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/priority-class.api.ts @@ -8,7 +8,6 @@ import { KubeApi } from "../kube-api"; import type { PriorityClassData } from "@k8slens/kube-object"; import { PriorityClass } from "@k8slens/kube-object"; - export class PriorityClassApi extends KubeApi { constructor(deps: KubeApiDependencies, opts: DerivedKubeApiOptions = {}) { super(deps, { diff --git a/packages/utility-features/kube-api/src/endpoints/replica-set.api.ts b/packages/utility-features/kube-api/src/endpoints/replica-set.api.ts index 3c9152759b..1e0dd21152 100644 --- a/packages/utility-features/kube-api/src/endpoints/replica-set.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/replica-set.api.ts @@ -10,7 +10,7 @@ import { ReplicaSet } from "@k8slens/kube-object"; export class ReplicaSetApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: ReplicaSet, }); } @@ -22,6 +22,6 @@ export class ReplicaSetApi extends KubeApi { } scale(params: NamespacedResourceDescriptor, replicas: number) { - return this.scaleResource(params, { spec: { replicas }}); + return this.scaleResource(params, { spec: { replicas } }); } } diff --git a/packages/utility-features/kube-api/src/endpoints/replication-controller.api.ts b/packages/utility-features/kube-api/src/endpoints/replication-controller.api.ts index 98f29e58a1..15583b310f 100644 --- a/packages/utility-features/kube-api/src/endpoints/replication-controller.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/replication-controller.api.ts @@ -11,7 +11,7 @@ import type { Scale } from "@k8slens/kube-object"; export class ReplicationControllerApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: ReplicationController, }); } @@ -25,6 +25,6 @@ export class ReplicationControllerApi extends KubeApi { } scale(params: NamespacedResourceDescriptor, replicas: number): Promise { - return this.scaleResource(params, { spec: { replicas }}); + return this.scaleResource(params, { spec: { replicas } }); } } diff --git a/packages/utility-features/kube-api/src/endpoints/role-binding.api.ts b/packages/utility-features/kube-api/src/endpoints/role-binding.api.ts index 49c92ed42b..821a0c7032 100644 --- a/packages/utility-features/kube-api/src/endpoints/role-binding.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/role-binding.api.ts @@ -8,7 +8,6 @@ import { RoleBinding } from "@k8slens/kube-object"; import type { DerivedKubeApiOptions, KubeApiDependencies } from "../kube-api"; import { KubeApi } from "../kube-api"; - export class RoleBindingApi extends KubeApi { constructor(deps: KubeApiDependencies, opts: DerivedKubeApiOptions = {}) { super(deps, { diff --git a/packages/utility-features/kube-api/src/endpoints/self-subject-rules-reviews.api.ts b/packages/utility-features/kube-api/src/endpoints/self-subject-rules-reviews.api.ts index d1e9c7ad75..0af5a5f04c 100644 --- a/packages/utility-features/kube-api/src/endpoints/self-subject-rules-reviews.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/self-subject-rules-reviews.api.ts @@ -10,16 +10,19 @@ import { KubeApi } from "../kube-api"; export class SelfSubjectRulesReviewApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: SelfSubjectRulesReview, }); } create({ namespace = "default" }) { - return super.create({}, { - spec: { - namespace, + return super.create( + {}, + { + spec: { + namespace, + }, }, - }); + ); } } diff --git a/packages/utility-features/kube-api/src/endpoints/stateful-set.api.ts b/packages/utility-features/kube-api/src/endpoints/stateful-set.api.ts index fcdd2c7b79..b93289ebfe 100644 --- a/packages/utility-features/kube-api/src/endpoints/stateful-set.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/stateful-set.api.ts @@ -12,7 +12,7 @@ import { StatefulSet } from "@k8slens/kube-object"; export class StatefulSetApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: StatefulSet, }); } @@ -24,18 +24,22 @@ export class StatefulSetApi extends KubeApi { } scale(params: NamespacedResourceDescriptor, replicas: number) { - return this.scaleResource(params, { spec: { replicas }}); + return this.scaleResource(params, { spec: { replicas } }); } restart(params: NamespacedResourceDescriptor) { - return this.patch(params, { - spec: { - template: { - metadata: { - annotations: { "kubectl.kubernetes.io/restartedAt" : moment.utc().format() }, + return this.patch( + params, + { + spec: { + template: { + metadata: { + annotations: { "kubectl.kubernetes.io/restartedAt": moment.utc().format() }, + }, }, }, }, - }, "strategic"); + "strategic", + ); } } diff --git a/packages/utility-features/kube-api/src/endpoints/validating-webhook-configuration.api.ts b/packages/utility-features/kube-api/src/endpoints/validating-webhook-configuration.api.ts index 38be6295fb..9b3bd22ad8 100644 --- a/packages/utility-features/kube-api/src/endpoints/validating-webhook-configuration.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/validating-webhook-configuration.api.ts @@ -9,7 +9,7 @@ import { KubeApi } from "../kube-api"; export class ValidatingWebhookConfigurationApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: ValidatingWebhookConfiguration, }); } diff --git a/packages/utility-features/kube-api/src/endpoints/vertical-pod-autoscaler.api.ts b/packages/utility-features/kube-api/src/endpoints/vertical-pod-autoscaler.api.ts index c676f0010e..0ceb2ef8a7 100644 --- a/packages/utility-features/kube-api/src/endpoints/vertical-pod-autoscaler.api.ts +++ b/packages/utility-features/kube-api/src/endpoints/vertical-pod-autoscaler.api.ts @@ -7,11 +7,10 @@ import { VerticalPodAutoscaler } from "@k8slens/kube-object"; import type { DerivedKubeApiOptions, KubeApiDependencies } from "../kube-api"; import { KubeApi } from "../kube-api"; - export class VerticalPodAutoscalerApi extends KubeApi { constructor(deps: KubeApiDependencies, opts?: DerivedKubeApiOptions) { super(deps, { - ...opts ?? {}, + ...(opts ?? {}), objectConstructor: VerticalPodAutoscaler, }); } diff --git a/packages/utility-features/kube-api/src/kube-api.ts b/packages/utility-features/kube-api/src/kube-api.ts index 760c27ce4d..87de206a64 100644 --- a/packages/utility-features/kube-api/src/kube-api.ts +++ b/packages/utility-features/kube-api/src/kube-api.ts @@ -543,7 +543,7 @@ export class KubeApi< // custom apis might return array for list response, e.g. users, groups, etc. return data .filter(isJsonApiData) - .map((data) => (this.ensureMetadataSelfLink(data.metadata), data)) + .map((data) => (this.ensureMetadataSelfLink(data.metadata), data)) // eslint-disable-line no-sequences .map((data) => new KubeObjectConstructor(data as Data)); }