@backstage/plugin-kubernetes 0.7.2-next.2 → 0.7.2

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @backstage/plugin-kubernetes
 
+## 0.7.2
+
+### Patch Changes
+
+- 817f3196f6: Updated React Router dependencies to be peer dependencies.
+- 7d47def9c4: Removed dependency on `@types/jest`.
+- 0768d6dece: add new kubernetes backend endpoints to kubernetes backend client
+- 19a27929fb: Reset error state on success
+- 667d917488: Updated dependency `msw` to `^0.47.0`.
+- 87ec2ba4d6: Updated dependency `msw` to `^0.46.0`.
+- bf5e9030eb: Updated dependency `msw` to `^0.45.0`.
+- ef9ab322de: Minor API signatures cleanup
+- Updated dependencies
+  - @backstage/core-components@0.11.1
+  - @backstage/core-plugin-api@1.0.6
+  - @backstage/plugin-catalog-react@1.1.4
+  - @backstage/catalog-model@1.1.1
+  - @backstage/config@1.0.2
+  - @backstage/plugin-kubernetes-common@0.4.2
+
+## 0.7.2-next.3
+
+### Patch Changes
+
+- 7d47def9c4: Removed dependency on `@types/jest`.
+- 19a27929fb: Reset error state on success
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.1.4-next.2
+  - @backstage/catalog-model@1.1.1-next.0
+  - @backstage/config@1.0.2-next.0
+  - @backstage/core-components@0.11.1-next.3
+  - @backstage/core-plugin-api@1.0.6-next.3
+  - @backstage/plugin-kubernetes-common@0.4.2-next.1
+
 ## 0.7.2-next.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 import * as _backstage_core_plugin_api from '@backstage/core-plugin-api';
 import { DiscoveryApi, IdentityApi, OAuthApi, OpenIdConnectApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { KubernetesRequestBody, ObjectsByEntityResponse, ClusterObjects, ClientPodStatus, ClusterAttributes } from '@backstage/plugin-kubernetes-common';
+import { KubernetesRequestBody, ObjectsByEntityResponse, WorkloadsByEntityRequest, CustomObjectsByEntityRequest, ClusterObjects, ClientPodStatus, ClusterAttributes } from '@backstage/plugin-kubernetes-common';
 import { JsonObject } from '@backstage/types';
 import { V1Pod, V1ReplicaSet, V1Deployment, V1HorizontalPodAutoscaler, V1Service, V1ConfigMap, V1Ingress, V1Job, V1CronJob, V1StatefulSet, V1ObjectMeta } from '@kubernetes/client-node';
 import React from 'react';
@@ -36,6 +36,8 @@ interface KubernetesApi {
         authProvider: string;
         oidcTokenProvider?: string | undefined;
     }[]>;
+    getWorkloadsByEntity(request: WorkloadsByEntityRequest): Promise<ObjectsByEntityResponse>;
+    getCustomObjectsByEntity(request: CustomObjectsByEntityRequest): Promise<ObjectsByEntityResponse>;
 }
 
 declare class KubernetesBackendClient implements KubernetesApi {
@@ -48,6 +50,8 @@ declare class KubernetesBackendClient implements KubernetesApi {
     private handleResponse;
     private postRequired;
     getObjectsByEntity(requestBody: KubernetesRequestBody): Promise<ObjectsByEntityResponse>;
+    getWorkloadsByEntity(request: WorkloadsByEntityRequest): Promise<ObjectsByEntityResponse>;
+    getCustomObjectsByEntity(request: CustomObjectsByEntityRequest): Promise<ObjectsByEntityResponse>;
     getClusters(): Promise<{
         name: string;
         authProvider: string;
@@ -246,8 +250,8 @@ declare type KubernetesContentProps = {
 declare const KubernetesContent: ({ entity, refreshIntervalMs, }: KubernetesContentProps) => JSX.Element;
 
 interface KubernetesObjects {
-    kubernetesObjects: ObjectsByEntityResponse | undefined;
-    error: string | undefined;
+    kubernetesObjects?: ObjectsByEntityResponse;
+    error?: string;
 }
 declare const useKubernetesObjects: (entity: Entity, intervalMs?: number) => KubernetesObjects;
 

package/dist/index.esm.js

@@ -1,3 +1,4 @@
+import { stringifyEntityRef } from '@backstage/catalog-model';
 import { createApiRef, createRouteRef, createPlugin, createApiFactory, discoveryApiRef, identityApiRef, googleAuthApiRef, microsoftAuthApiRef, oktaAuthApiRef, oneloginAuthApiRef, createRoutableExtension, useApi } from '@backstage/core-plugin-api';
 import * as React from 'react';
 import React__default, { Fragment, useState, useEffect, useContext } from 'react';
@@ -57,6 +58,19 @@ class KubernetesBackendClient {
       requestBody
     );
   }
+  async getWorkloadsByEntity(request) {
+    return await this.postRequired("/resources/workloads/query", {
+      auth: request.auth,
+      entityRef: stringifyEntityRef(request.entity)
+    });
+  }
+  async getCustomObjectsByEntity(request) {
+    return await this.postRequired(`/resources/custom/query`, {
+      entityRef: stringifyEntityRef(request.entity),
+      auth: request.auth,
+      customResources: request.customResources
+    });
+  }
   async getClusters() {
     const { token: idToken } = await this.identityApi.getCredentials();
     const url = `${await this.discoveryApi.getBaseUrl("kubernetes")}/clusters`;
@@ -700,14 +714,16 @@ const detectErrors = (objects) => {
 const useKubernetesObjects = (entity, intervalMs = 1e4) => {
   const kubernetesApi = useApi(kubernetesApiRef);
   const kubernetesAuthProvidersApi = useApi(kubernetesAuthProvidersApiRef);
-  const [kubernetesObjects, setKubernetesObjects] = useState(void 0);
-  const [error, setError] = useState(void 0);
+  const [result, setResult] = useState({
+    kubernetesObjects: void 0,
+    error: void 0
+  });
   const getObjects = async () => {
     let clusters = [];
     try {
       clusters = await kubernetesApi.getClusters();
     } catch (e) {
-      setError(e.message);
+      setResult({ error: e.message });
       return;
     }
     const authProviders = [
@@ -727,14 +743,15 @@ const useKubernetesObjects = (entity, intervalMs = 1e4) => {
           requestBody
         );
       } catch (e) {
-        setError(e.message);
+        setResult({ error: e.message });
         return;
       }
     }
     try {
-      setKubernetesObjects(await kubernetesApi.getObjectsByEntity(requestBody));
+      const objects = await kubernetesApi.getObjectsByEntity(requestBody);
+      setResult({ kubernetesObjects: objects });
     } catch (e) {
-      setError(e.message);
+      setResult({ error: e.message });
       return;
     }
   };
@@ -744,10 +761,7 @@ const useKubernetesObjects = (entity, intervalMs = 1e4) => {
   useInterval(() => {
     getObjects();
   }, intervalMs);
-  return {
-    kubernetesObjects,
-    error
-  };
+  return result;
 };
 
 const PodNamesWithErrorsContext = React__default.createContext(