From 30a595fe1af30705eca00d3a9329ce1699e0647c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 25 May 2023 16:17:35 -0400 Subject: [PATCH] chore: Move kubeApiInjectionToken into own package Signed-off-by: Sebastian Malton --- open-lens/package.json | 1 + package-lock.json | 20 +++++++++ packages/core/package.json | 1 + .../k8s-api/api-manager/manager.injectable.ts | 2 +- .../cluster-role-binding.api.injectable.ts | 3 +- .../endpoints/cluster-role.api.injectable.ts | 3 +- .../endpoints/cluster.api.injectable.ts | 3 +- .../component-status.api.injectable.ts | 3 +- .../endpoints/config-map.api.injectable.ts | 3 +- .../endpoints/cron-job.api.injectable.ts | 3 +- ...stom-resource-definition.api.injectable.ts | 3 +- .../endpoints/daemon-set.api.injectable.ts | 3 +- .../endpoints/deployment.api.injectable.ts | 3 +- .../endpoints/endpoint.api.injectable.ts | 3 +- .../endpoints/events.api.injectable.ts | 3 +- ...orizontal-pod-autoscaler.api.injectable.ts | 3 +- .../endpoints/ingress-class.api.injectable.ts | 3 +- .../endpoints/ingress.api.injectable.ts | 3 +- .../k8s-api/endpoints/job.api.injectable.ts | 3 +- .../k8s-api/endpoints/lease.api.injectable.ts | 3 +- .../endpoints/limit-range.api.injectable.ts | 3 +- ...ng-webhook-configuration-api.injectable.ts | 3 +- .../endpoints/namespace.api.injectable.ts | 3 +- .../network-policy.api.injectable.ts | 3 +- .../k8s-api/endpoints/node.api.injectable.ts | 3 +- .../persistent-volume-claim.api.injectable.ts | 3 +- .../persistent-volume.api.injectable.ts | 3 +- .../pod-disruption-budget.api.injectable.ts | 3 +- .../endpoints/pod-metrics.api.injectable.ts | 3 +- .../pod-security-policy.api.injectable.ts | 3 +- .../k8s-api/endpoints/pod.api.injectable.ts | 3 +- .../priority-class.api.injectable.ts | 3 +- .../endpoints/replica-set.api.injectable.ts | 3 +- .../replication-controller.api.injectable.ts | 3 +- .../resource-quota.api.injectable.ts | 3 +- .../endpoints/role-binding.api.injectable.ts | 3 +- .../k8s-api/endpoints/role.api.injectable.ts | 3 +- .../endpoints/runtime-class.api.injectable.ts | 3 +- .../endpoints/secret.api.injectable.ts | 3 +- ...lf-subject-rules-reviews.api.injectable.ts | 3 +- .../service-account.api.injectable.ts | 3 +- .../endpoints/service.api.injectable.ts | 3 +- .../endpoints/stateful-set.api.injectable.ts | 3 +- .../endpoints/storage-class.api.injectable.ts | 3 +- ...ng-webhook-configuration-api.injectable.ts | 3 +- .../vertical-pod-autoscaler.api.injectable.ts | 3 +- .../get-kube-api-from-path.injectable.ts | 3 +- .../kube-api-specifics/.eslintrc.js | 6 +++ .../kube-api-specifics/.prettierrc | 1 + .../kube-api-specifics/.swcrc | 18 ++++++++ .../kube-api-specifics/index.ts | 1 + .../kube-api-specifics/jest.config.js | 1 + .../kube-api-specifics/package.json | 43 +++++++++++++++++++ .../src/token.ts} | 2 +- .../kube-api-specifics/tsconfig.json | 7 +++ .../kube-api-specifics/webpack.config.js | 1 + packages/utility-features/kube-api/index.ts | 1 - .../utility-features/kube-api/tsconfig.json | 2 +- 58 files changed, 189 insertions(+), 47 deletions(-) create mode 100644 packages/utility-features/kube-api-specifics/.eslintrc.js create mode 100644 packages/utility-features/kube-api-specifics/.prettierrc create mode 100644 packages/utility-features/kube-api-specifics/.swcrc create mode 100644 packages/utility-features/kube-api-specifics/index.ts create mode 100644 packages/utility-features/kube-api-specifics/jest.config.js create mode 100644 packages/utility-features/kube-api-specifics/package.json rename packages/utility-features/{kube-api/src/kube-api-injection-token.ts => kube-api-specifics/src/token.ts} (86%) create mode 100644 packages/utility-features/kube-api-specifics/tsconfig.json create mode 100644 packages/utility-features/kube-api-specifics/webpack.config.js diff --git a/open-lens/package.json b/open-lens/package.json index d49e44a3bf..7c8ed4a10d 100644 --- a/open-lens/package.json +++ b/open-lens/package.json @@ -190,6 +190,7 @@ "@k8slens/event-emitter": "^1.0.0", "@k8slens/feature-core": "^6.5.0", "@k8slens/keyboard-shortcuts": "^1.0.0", + "@k8slens/kube-api-specifics": "^1.0.0-alpha.1", "@k8slens/kube-object": "^1.0.0", "@k8slens/kubectl-versions": "^1.0.0", "@k8slens/legacy-extension-example": "^1.0.0", diff --git a/package-lock.json b/package-lock.json index 7267a91b03..f57c7676de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3749,6 +3749,10 @@ "resolved": "packages/utility-features/kube-api", "link": true }, + "node_modules/@k8slens/kube-api-specifics": { + "resolved": "packages/utility-features/kube-api-specifics", + "link": true + }, "node_modules/@k8slens/kube-object": { "resolved": "packages/kube-object", "link": true @@ -33999,6 +34003,7 @@ "@k8slens/event-emitter": "^1.0.0", "@k8slens/feature-core": "^6.5.0", "@k8slens/keyboard-shortcuts": "^1.0.0", + "@k8slens/kube-api-specifics": "^1.0.0-alpha.1", "@k8slens/kube-object": "^1.0.0", "@k8slens/kubectl-versions": "^1.0.0", "@k8slens/legacy-extension-example": "^1.0.0", @@ -34317,6 +34322,7 @@ "@k8slens/error-boundary": "^1.0.0-alpha.5", "@k8slens/event-emitter": "^1.0.0-alpha.1", "@k8slens/kube-api": "^1.0.0-alpha.1", + "@k8slens/kube-api-specifics": "^1.0.0-alpha.1", "@k8slens/kube-object": "^1.0.0-alpha.5", "@k8slens/kubectl-versions": "^1.0.0-alpha.0", "@k8slens/legacy-extensions": "^1.0.0-alpha.0", @@ -35703,6 +35709,20 @@ "rfc6902": "^5.0.1" } }, + "packages/utility-features/kube-api-specifics": { + "name": "@k8slens/kube-api-specifics", + "version": "1.0.0-alpha.1", + "license": "MIT", + "devDependencies": { + "@k8slens/eslint-config": "^6.5.0-alpha.2", + "@k8slens/jest": "^6.5.0-alpha.4", + "@k8slens/typescript": "^6.5.0-alpha.2" + }, + "peerDependencies": { + "@k8slens/kube-api": "^1.0.0-alpha.1", + "@ogre-tools/injectable": "^16.1.2" + } + }, "packages/utility-features/react-testing-library-discovery": { "name": "@k8slens/react-testing-library-discovery", "version": "1.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index a058afaf42..0741e96832 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -215,6 +215,7 @@ "@k8slens/error-boundary": "^1.0.0-alpha.5", "@k8slens/event-emitter": "^1.0.0-alpha.1", "@k8slens/kube-api": "^1.0.0-alpha.1", + "@k8slens/kube-api-specifics": "^1.0.0-alpha.1", "@k8slens/kube-object": "^1.0.0-alpha.5", "@k8slens/kubectl-versions": "^1.0.0-alpha.0", "@k8slens/legacy-extensions": "^1.0.0-alpha.0", diff --git a/packages/core/src/common/k8s-api/api-manager/manager.injectable.ts b/packages/core/src/common/k8s-api/api-manager/manager.injectable.ts index 20770d8edf..8b6340e4a5 100644 --- a/packages/core/src/common/k8s-api/api-manager/manager.injectable.ts +++ b/packages/core/src/common/k8s-api/api-manager/manager.injectable.ts @@ -7,7 +7,7 @@ import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-c import { ApiManager } from "./api-manager"; import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; import { kubeObjectStoreInjectionToken } from "./kube-object-store-token"; -import { kubeApiInjectionToken } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { computed } from "mobx"; import { customResourceDefinitionApiInjectionToken } from "./crd-api-token"; import createCustomResourceStoreInjectable from "./create-custom-resource-store.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts index ba3dd62ab1..f731e32a28 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster-role-binding.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ClusterRoleBindingApi } from "@k8slens/kube-api"; +import { ClusterRoleBindingApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts index 7b309d33a5..6e5ea7b184 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster-role.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ClusterRoleApi } from "@k8slens/kube-api"; +import { ClusterRoleApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts index 91733280f9..bb2c2f9d3d 100644 --- a/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cluster.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ClusterApi } from "@k8slens/kube-api"; +import { ClusterApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts index dcc8bd708f..eb5a216a13 100644 --- a/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/component-status.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ComponentStatusApi } from "@k8slens/kube-api"; +import { ComponentStatusApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { loggerInjectionToken } from "@k8slens/logger"; diff --git a/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts index fdd63a4433..4b9c1323bf 100644 --- a/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/config-map.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ConfigMapApi } from "@k8slens/kube-api"; +import { ConfigMapApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts index d9c26433b4..016b147668 100644 --- a/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/cron-job.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, CronJobApi } from "@k8slens/kube-api"; +import { CronJobApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts index 464705bbfa..f6b32ffbf6 100644 --- a/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/custom-resource-definition.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, CustomResourceDefinitionApi } from "@k8slens/kube-api"; +import { CustomResourceDefinitionApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; import { loggerInjectionToken } from "@k8slens/logger"; diff --git a/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts index 929773154f..ab2a004a08 100644 --- a/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/daemon-set.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, DaemonSetApi } from "@k8slens/kube-api"; +import { DaemonSetApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts index d95a45e255..d652d710f5 100644 --- a/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/deployment.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, DeploymentApi } from "@k8slens/kube-api"; +import { DeploymentApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts index 2a53b14090..fa2ba55d23 100644 --- a/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/endpoint.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, EndpointsApi } from "@k8slens/kube-api"; +import { EndpointsApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts index 9b56ab1d9c..8b26fb9065 100644 --- a/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/events.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, KubeEventApi } from "@k8slens/kube-api"; +import { KubeEventApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts index 94c200b6de..226fc60e94 100644 --- a/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, HorizontalPodAutoscalerApi } from "@k8slens/kube-api"; +import { HorizontalPodAutoscalerApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts index af186ee1ad..25662ddd7e 100644 --- a/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/ingress-class.api.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { kubeApiInjectionToken, IngressClassApi } from "@k8slens/kube-api"; +import { IngressClassApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts index 74d80be9cf..203d65f25d 100644 --- a/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/ingress.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, IngressApi } from "@k8slens/kube-api"; +import { IngressApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts index 06acf62dd3..edd0a66e29 100644 --- a/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/job.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, JobApi } from "@k8slens/kube-api"; +import { JobApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts index 47e423f542..bdc7552448 100644 --- a/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/lease.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, LeaseApi } from "@k8slens/kube-api"; +import { LeaseApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts index a13f3a0dc1..8eb4427f57 100644 --- a/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/limit-range.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, LimitRangeApi } from "@k8slens/kube-api"; +import { LimitRangeApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts index 8a3edeb40e..a91fa90332 100644 --- a/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/mutating-webhook-configuration-api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, MutatingWebhookConfigurationApi } from "@k8slens/kube-api"; +import { MutatingWebhookConfigurationApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts index 5a68bd12c4..5ed484fe74 100644 --- a/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/namespace.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, NamespaceApi } from "@k8slens/kube-api"; +import { NamespaceApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts index 4edb7b7ec5..bcc325b85b 100644 --- a/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/network-policy.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, NetworkPolicyApi } from "@k8slens/kube-api"; +import { NetworkPolicyApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts index 3f6c09ccfd..fe2764db03 100644 --- a/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/node.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, NodeApi } from "@k8slens/kube-api"; +import { NodeApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts index 2b231fe229..6a50975a8a 100644 --- a/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/persistent-volume-claim.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PersistentVolumeClaimApi } from "@k8slens/kube-api"; +import { PersistentVolumeClaimApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts index 1990783a26..72a1ec8d21 100644 --- a/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/persistent-volume.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PersistentVolumeApi } from "@k8slens/kube-api"; +import { PersistentVolumeApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts index 159b24d75b..ab17a0f35d 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-disruption-budget.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PodDisruptionBudgetApi } from "@k8slens/kube-api"; +import { PodDisruptionBudgetApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts index 4e407fef9a..bda2bfe010 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-metrics.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PodMetricsApi } from "@k8slens/kube-api"; +import { PodMetricsApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts index 5fb9478f05..b6bf8ada32 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod-security-policy.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PodSecurityPolicyApi } from "@k8slens/kube-api"; +import { PodSecurityPolicyApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts index bb844c5039..352d8f5815 100644 --- a/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/pod.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PodApi } from "@k8slens/kube-api"; +import { PodApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts index 5879895f22..de6b2d8c1d 100644 --- a/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/priority-class.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, PriorityClassApi } from "@k8slens/kube-api"; +import { PriorityClassApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts index 338bd5261c..fcebaa7aca 100644 --- a/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/replica-set.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ReplicaSetApi } from "@k8slens/kube-api"; +import { ReplicaSetApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; 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 index 28f59cb8fa..82b09ad2b6 100644 --- 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 @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { kubeApiInjectionToken, ReplicationControllerApi } from "@k8slens/kube-api"; +import { ReplicationControllerApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts index dcbb46a9ac..5bb50c6b14 100644 --- a/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/resource-quota.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ResourceQuotaApi } from "@k8slens/kube-api"; +import { ResourceQuotaApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts index 34536692fb..a254a587b9 100644 --- a/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/role-binding.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, RoleBindingApi } from "@k8slens/kube-api"; +import { RoleBindingApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts index a0f76f09be..0b9e077e4b 100644 --- a/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/role.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, RoleApi } from "@k8slens/kube-api"; +import { RoleApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts index d784234118..4aba1e2d42 100644 --- a/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, RuntimeClassApi } from "@k8slens/kube-api"; +import { RuntimeClassApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts index 1115730180..66cc807c06 100644 --- a/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/secret.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, SecretApi } from "@k8slens/kube-api"; +import { SecretApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts index ac28faa053..f0a44febd4 100644 --- a/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/self-subject-rules-reviews.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, SelfSubjectRulesReviewApi } from "@k8slens/kube-api"; +import { SelfSubjectRulesReviewApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts index 8643806956..170a106b12 100644 --- a/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/service-account.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ServiceAccountApi } from "@k8slens/kube-api"; +import { ServiceAccountApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts index 5afb0500e7..75adcfb3f0 100644 --- a/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/service.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ServiceApi } from "@k8slens/kube-api"; +import { ServiceApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts index 1d3b5851b5..ba56cb4a95 100644 --- a/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/stateful-set.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, StatefulSetApi } from "@k8slens/kube-api"; +import { StatefulSetApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts index 284059abb3..4eb7003e7a 100644 --- a/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/storage-class.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, StorageClassApi } from "@k8slens/kube-api"; +import { StorageClassApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts index 88e31b8194..5bf2f7ab4d 100644 --- a/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/validating-webhook-configuration-api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, ValidatingWebhookConfigurationApi } from "@k8slens/kube-api"; +import { ValidatingWebhookConfigurationApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts b/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts index 13fc8e3b6e..439c2107e9 100644 --- a/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts +++ b/packages/core/src/common/k8s-api/endpoints/vertical-pod-autoscaler.api.injectable.ts @@ -5,7 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import assert from "assert"; import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token"; -import { kubeApiInjectionToken, VerticalPodAutoscalerApi } from "@k8slens/kube-api"; +import { VerticalPodAutoscalerApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import { loggerInjectionToken } from "@k8slens/logger"; import maybeKubeApiInjectable from "../maybe-kube-api.injectable"; diff --git a/packages/core/src/common/k8s-api/kube-api/get-kube-api-from-path.injectable.ts b/packages/core/src/common/k8s-api/kube-api/get-kube-api-from-path.injectable.ts index 601b9f749f..ae82fe9ec5 100644 --- a/packages/core/src/common/k8s-api/kube-api/get-kube-api-from-path.injectable.ts +++ b/packages/core/src/common/k8s-api/kube-api/get-kube-api-from-path.injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { kubeApiInjectionToken, parseKubeApi } from "@k8slens/kube-api"; +import { parseKubeApi } from "@k8slens/kube-api"; +import { kubeApiInjectionToken } from "@k8slens/kube-api-specifics"; import type { KubeApi } from "@k8slens/kube-api"; export type GetKubeApiFromPath = (apiPath: string) => KubeApi | undefined; diff --git a/packages/utility-features/kube-api-specifics/.eslintrc.js b/packages/utility-features/kube-api-specifics/.eslintrc.js new file mode 100644 index 0000000000..19a14e85a4 --- /dev/null +++ b/packages/utility-features/kube-api-specifics/.eslintrc.js @@ -0,0 +1,6 @@ +module.exports = { + extends: "@k8slens/eslint-config/eslint", + parserOptions: { + project: "./tsconfig.json", + }, +}; \ No newline at end of file diff --git a/packages/utility-features/kube-api-specifics/.prettierrc b/packages/utility-features/kube-api-specifics/.prettierrc new file mode 100644 index 0000000000..edd47b479e --- /dev/null +++ b/packages/utility-features/kube-api-specifics/.prettierrc @@ -0,0 +1 @@ +"@k8slens/eslint-config/prettier" diff --git a/packages/utility-features/kube-api-specifics/.swcrc b/packages/utility-features/kube-api-specifics/.swcrc new file mode 100644 index 0000000000..aaf7dd113a --- /dev/null +++ b/packages/utility-features/kube-api-specifics/.swcrc @@ -0,0 +1,18 @@ +{ + "module": { + "type": "commonjs" + }, + "jsc": { + "parser": { + "syntax": "typescript", + "tsx": true, + "decorators": true, + "dynamicImport": false + }, + "transform": { + "legacyDecorator": true, + "decoratorMetadata": true + }, + "target": "es2019" + } +} \ No newline at end of file diff --git a/packages/utility-features/kube-api-specifics/index.ts b/packages/utility-features/kube-api-specifics/index.ts new file mode 100644 index 0000000000..e11b52006c --- /dev/null +++ b/packages/utility-features/kube-api-specifics/index.ts @@ -0,0 +1 @@ +export * from "./src/token"; diff --git a/packages/utility-features/kube-api-specifics/jest.config.js b/packages/utility-features/kube-api-specifics/jest.config.js new file mode 100644 index 0000000000..c6074967eb --- /dev/null +++ b/packages/utility-features/kube-api-specifics/jest.config.js @@ -0,0 +1 @@ +module.exports = require("@k8slens/jest").monorepoPackageConfig(__dirname).configForNode; diff --git a/packages/utility-features/kube-api-specifics/package.json b/packages/utility-features/kube-api-specifics/package.json new file mode 100644 index 0000000000..35ca811d27 --- /dev/null +++ b/packages/utility-features/kube-api-specifics/package.json @@ -0,0 +1,43 @@ +{ + "name": "@k8slens/kube-api-specifics", + "private": false, + "version": "1.0.0-alpha.1", + "description": "Kube api", + "type": "commonjs", + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "files": [ + "dist" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/lensapp/lens.git" + }, + "main": "dist/index.js", + "types": "dist/index.d.ts", + "author": { + "name": "OpenLens Authors", + "email": "info@k8slens.dev" + }, + "license": "MIT", + "homepage": "https://github.com/lensapp/lens", + "scripts": { + "build": "lens-webpack-build", + "clean": "rimraf dist/", + "dev": "webpack --mode=development --watch", + "test": "jest --coverage --runInBand", + "lint": "lens-lint", + "lint:fix": "lens-lint --fix" + }, + "peerDependencies": { + "@k8slens/kube-api": "^1.0.0-alpha.1", + "@ogre-tools/injectable": "^16.1.2" + }, + "devDependencies": { + "@k8slens/eslint-config": "^6.5.0-alpha.2", + "@k8slens/jest": "^6.5.0-alpha.4", + "@k8slens/typescript": "^6.5.0-alpha.2" + } +} diff --git a/packages/utility-features/kube-api/src/kube-api-injection-token.ts b/packages/utility-features/kube-api-specifics/src/token.ts similarity index 86% rename from packages/utility-features/kube-api/src/kube-api-injection-token.ts rename to packages/utility-features/kube-api-specifics/src/token.ts index 65b6481faf..b80a2b5674 100644 --- a/packages/utility-features/kube-api/src/kube-api-injection-token.ts +++ b/packages/utility-features/kube-api-specifics/src/token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { KubeApi } from "./kube-api"; +import type { KubeApi } from "@k8slens/kube-api"; export const kubeApiInjectionToken = getInjectionToken>({ id: "kube-api-injection-token", diff --git a/packages/utility-features/kube-api-specifics/tsconfig.json b/packages/utility-features/kube-api-specifics/tsconfig.json new file mode 100644 index 0000000000..d140381aa7 --- /dev/null +++ b/packages/utility-features/kube-api-specifics/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "@k8slens/typescript/config/base.json", + "include": ["**/*.ts"], + "compilerOptions": { + "moduleResolution": "node" + } +} diff --git a/packages/utility-features/kube-api-specifics/webpack.config.js b/packages/utility-features/kube-api-specifics/webpack.config.js new file mode 100644 index 0000000000..b54738d0a7 --- /dev/null +++ b/packages/utility-features/kube-api-specifics/webpack.config.js @@ -0,0 +1 @@ +module.exports = require("@k8slens/webpack").configForReact; \ No newline at end of file diff --git a/packages/utility-features/kube-api/index.ts b/packages/utility-features/kube-api/index.ts index 49d7be28d8..31a54e21c1 100644 --- a/packages/utility-features/kube-api/index.ts +++ b/packages/utility-features/kube-api/index.ts @@ -1,4 +1,3 @@ -export * from "./src/kube-api-injection-token"; export * from "./src/api-kube"; export * from "./src/kube-api"; export * from "./src/kube-api-parse"; diff --git a/packages/utility-features/kube-api/tsconfig.json b/packages/utility-features/kube-api/tsconfig.json index d140381aa7..1031f883fc 100644 --- a/packages/utility-features/kube-api/tsconfig.json +++ b/packages/utility-features/kube-api/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "@k8slens/typescript/config/base.json", - "include": ["**/*.ts"], + "include": ["**/*.ts", "../kube-api-specifics/src/token.ts"], "compilerOptions": { "moduleResolution": "node" }