hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove global legacy apiKube

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-08-12 09:35:01 -04:00
parent c3c736c065
commit 15792cdcc9
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/k8s-api/api-kube.ts
View File

@ -4,14 +4,8 @@
*/ */
import { getInjectionToken } from "@ogre-tools/injectable"; import { getInjectionToken } from "@ogre-tools/injectable";
import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
import type { KubeJsonApi } from "./kube-json-api"; import type { KubeJsonApi } from "./kube-json-api";
export const apiKubeInjectionToken = getInjectionToken<KubeJsonApi>({ export const apiKubeInjectionToken = getInjectionToken<KubeJsonApi>({
id: "api-kube-injection-token", id: "api-kube-injection-token",
}); });
/**
* @deprecated Switch to using apiKubeInjectionToken instead
*/
export const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectionToken);

6
src/common/k8s-api/index.ts
View File

@ -1,6 +0,0 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
export { apiKube } from "./api-kube";

7
src/common/k8s-api/kube-api.ts
View File

@ -7,7 +7,6 @@
import { merge } from "lodash"; import { merge } from "lodash";
import { stringify } from "querystring"; import { stringify } from "querystring";
import { apiKube } from "./index";
import { createKubeApiURL, parseKubeApi } from "./kube-api-parse"; import { createKubeApiURL, parseKubeApi } from "./kube-api-parse";
import type { KubeObjectConstructor, KubeJsonApiDataFor, KubeObjectMetadata } from "./kube-object"; import type { KubeObjectConstructor, KubeJsonApiDataFor, KubeObjectMetadata } from "./kube-object";
import { KubeObject, KubeStatus, isKubeStatusData } from "./kube-object"; import { KubeObject, KubeStatus, isKubeStatusData } from "./kube-object";
@ -23,6 +22,8 @@ import type { PartialDeep } from "type-fest";
import logger from "../logger"; import logger from "../logger";
import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
import autoRegistrationEmitterInjectable from "./api-manager/auto-registration-emitter.injectable"; import autoRegistrationEmitterInjectable from "./api-manager/auto-registration-emitter.injectable";
import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
import { apiKubeInjectionToken } from "./api-kube";
import type AbortController from "abort-controller"; import type AbortController from "abort-controller";
/** /**
@ -236,7 +237,7 @@ export class KubeApi<
constructor(opts: KubeApiOptions<Object, Data>) { constructor(opts: KubeApiOptions<Object, Data>) {
const { const {
objectConstructor, objectConstructor,
request = apiKube, request,
kind = objectConstructor.kind, kind = objectConstructor.kind,
isNamespaced, isNamespaced,
apiBase: fullApiPathname = objectConstructor.apiBase, apiBase: fullApiPathname = objectConstructor.apiBase,
@ -262,7 +263,7 @@ export class KubeApi<
this.apiGroup = apiGroup; this.apiGroup = apiGroup;
this.apiVersion = apiVersion; this.apiVersion = apiVersion;
this.apiResource = resource; this.apiResource = resource;
this.request = request; this.request = request ?? asLegacyGlobalForExtensionApi(apiKubeInjectionToken);
this.objectConstructor = objectConstructor; this.objectConstructor = objectConstructor;
legacyRegisterApi(this); legacyRegisterApi(this);
} }