Skip to content

Commit

Permalink
Fix extension API (#6947)
Browse files Browse the repository at this point in the history
- Make sure that dependency constructors are not exported
- Readd `KubeJsonApi.forCluster`

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
  • Loading branch information
Nokel81 committed Jan 16, 2023
1 parent e1abea0 commit 5c9dc03
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions src/extensions/common-api/k8s-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-exten
import maybeKubeApiInjectable from "../../common/k8s-api/maybe-kube-api.injectable";
import { DeploymentApi as InternalDeploymentApi, IngressApi as InternalIngressApi, NodeApi, PersistentVolumeClaimApi, PodApi } from "../../common/k8s-api/endpoints";
import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token";
import type { JsonApiConfig } from "../../common/k8s-api/json-api";
import type { KubeJsonApi as InternalKubeJsonApi } from "../../common/k8s-api/kube-json-api";
import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable";
import type { RequestInit } from "node-fetch";

export const apiManager = asLegacyGlobalForExtensionApi(apiManagerInjectable);
export const forCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForClusterInjectable);
Expand Down Expand Up @@ -107,11 +111,24 @@ export {
type KubeStatusData,
} from "../../common/k8s-api/kube-object";

export {
KubeJsonApi,
type KubeJsonApiData,
export type {
KubeJsonApiData,
} from "../../common/k8s-api/kube-json-api";

function KubeJsonApiCstr(config: JsonApiConfig, reqInit?: RequestInit) {
const di = getLegacyGlobalDiForExtensionApi();
const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);

return createKubeJsonApi(config, reqInit);
}

export const KubeJsonApi = Object.assign(
KubeJsonApiCstr as unknown as new (config: JsonApiConfig, reqInit?: RequestInit) => InternalKubeJsonApi,
{
forCluster,
},
);

export abstract class KubeObjectStore<
K extends KubeObject = KubeObject,
A extends InternalKubeApi<K, D> = InternalKubeApi<K, KubeJsonApiDataFor<K>>,
Expand Down

0 comments on commit 5c9dc03

Please sign in to comment.