@backstage/plugin-kubernetes-backend 0.16.4 → 0.17.0

package/dist/index.d.ts

@@ -2,14 +2,14 @@ import * as k8sTypes from '@backstage/plugin-kubernetes-node';
 import { AuthenticationStrategy as AuthenticationStrategy$1, ClusterDetails as ClusterDetails$1, KubernetesCredential as KubernetesCredential$1, AuthMetadata as AuthMetadata$1, KubernetesClustersSupplier as KubernetesClustersSupplier$1, CustomResource as CustomResource$1, KubernetesFetcher as KubernetesFetcher$1, KubernetesObjectsProvider as KubernetesObjectsProvider$1, KubernetesServiceLocator as KubernetesServiceLocator$1 } from '@backstage/plugin-kubernetes-node';
 import { KubernetesRequestAuth, KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 import { Config } from '@backstage/config';
-import { Logger } from 'winston';
 import { TokenCredential } from '@azure/identity';
+import { LoggerService, PermissionsService, DiscoveryService, HttpAuthService, AuthService, BackstageCredentials } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import express from 'express';
 import { Duration } from 'luxon';
-import { DiscoveryService, AuthService, HttpAuthService, BackstageCredentials } from '@backstage/backend-plugin-api';
 import { RequestHandler } from 'http-proxy-middleware';
+import { Logger } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
 /**
@@ -65,7 +65,7 @@ declare class AzureIdentityStrategy implements AuthenticationStrategy$1 {
     private readonly tokenCredential;
     private accessToken;
     private newTokenPromise;
-    constructor(logger: Logger, tokenCredential?: TokenCredential);
+    constructor(logger: LoggerService, tokenCredential?: TokenCredential);
     getCredential(): Promise<KubernetesCredential$1>;
     validateCluster(): Error[];
     private fetchNewToken;
@@ -154,7 +154,7 @@ type ServiceLocatorMethod = 'multiTenant' | 'singleTenant' | 'catalogRelation' |
  * @public
  */
 interface KubernetesObjectsProviderOptions {
-    logger: Logger;
+    logger: LoggerService;
     config: Config;
     fetcher: k8sTypes.KubernetesFetcher;
     serviceLocator: k8sTypes.KubernetesServiceLocator;
@@ -240,7 +240,7 @@ declare const HEADER_KUBERNETES_AUTH: string;
  * @public
  */
 type KubernetesProxyCreateRequestHandlerOptions = {
-    permissionApi: PermissionEvaluator;
+    permissionApi: PermissionsService;
 };
 /**
  * Options accepted as a parameter by the KubernetesProxy
@@ -248,9 +248,11 @@ type KubernetesProxyCreateRequestHandlerOptions = {
  * @public
  */
 type KubernetesProxyOptions = {
-    logger: Logger;
+    logger: LoggerService;
     clusterSupplier: KubernetesClustersSupplier;
     authStrategy: AuthenticationStrategy;
+    discovery: DiscoveryService;
+    httpAuth?: HttpAuthService;
 };
 /**
  * A proxy that routes requests to the Kubernetes API.
@@ -262,6 +264,7 @@ declare class KubernetesProxy {
     private readonly logger;
     private readonly clusterSupplier;
     private readonly authStrategy;
+    private readonly httpAuth;
     constructor(options: KubernetesProxyOptions);
     createRequestHandler(options: KubernetesProxyCreateRequestHandlerOptions): RequestHandler;
     private getMiddleware;
@@ -276,7 +279,7 @@ declare class KubernetesProxy {
  * @public
  */
 interface KubernetesEnvironment {
-    logger: Logger;
+    logger: LoggerService;
     config: Config;
     catalogApi: CatalogApi;
     discovery: DiscoveryService;
@@ -336,7 +339,7 @@ declare class KubernetesBuilder {
     protected buildSingleTenantServiceLocator(clusterSupplier: KubernetesClustersSupplier$1): KubernetesServiceLocator$1;
     protected buildCatalogRelationServiceLocator(clusterSupplier: KubernetesClustersSupplier$1): KubernetesServiceLocator$1;
     protected buildHttpServiceLocator(_clusterSupplier: KubernetesClustersSupplier$1): KubernetesServiceLocator$1;
-    protected buildProxy(logger: Logger, clusterSupplier: KubernetesClustersSupplier$1): KubernetesProxy;
+    protected buildProxy(logger: LoggerService, clusterSupplier: KubernetesClustersSupplier$1, discovery: DiscoveryService, httpAuth: HttpAuthService): KubernetesProxy;
     protected buildRouter(objectsProvider: KubernetesObjectsProvider$1, clusterSupplier: KubernetesClustersSupplier$1, catalogApi: CatalogApi, proxy: KubernetesProxy, permissionApi: PermissionEvaluator, authService: AuthService, httpAuth: HttpAuthService): express.Router;
     protected buildAuthStrategyMap(): {
         [key: string]: AuthenticationStrategy$1;
@@ -350,7 +353,7 @@ declare class KubernetesBuilder {
     protected getServiceLocator(): KubernetesServiceLocator$1;
     protected getObjectsProvider(options: KubernetesObjectsProviderOptions): KubernetesObjectsProvider$1;
     protected getObjectTypesToFetch(): k8sTypes.ObjectToFetch[] | undefined;
-    protected getProxy(logger: Logger, clusterSupplier: KubernetesClustersSupplier$1): KubernetesProxy;
+    protected getProxy(logger: LoggerService, clusterSupplier: KubernetesClustersSupplier$1, discovery: DiscoveryService, httpAuth: HttpAuthService): KubernetesProxy;
     protected getAuthStrategyMap(): {
         [key: string]: AuthenticationStrategy$1;
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
-  "version": "0.16.4",
+  "version": "0.17.0",
   "main": "./dist/index.cjs.js",
   "types": "./dist/index.d.ts",
   "license": "Apache-2.0",
@@ -49,25 +49,25 @@
     "@aws-sdk/credential-providers": "^3.350.0",
     "@aws-sdk/signature-v4": "^3.347.0",
     "@azure/identity": "^4.0.0",
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/backend-plugin-api": "^0.6.16",
-    "@backstage/catalog-client": "^1.6.3",
+    "@backstage/backend-common": "^0.21.7",
+    "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/catalog-client": "^1.6.4",
     "@backstage/catalog-model": "^1.4.5",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
     "@backstage/integration-aws-node": "^0.1.12",
-    "@backstage/plugin-auth-node": "^0.4.11",
-    "@backstage/plugin-catalog-node": "^1.11.0",
+    "@backstage/plugin-auth-node": "^0.4.12",
+    "@backstage/plugin-catalog-node": "^1.11.1",
     "@backstage/plugin-kubernetes-common": "^0.7.5",
-    "@backstage/plugin-kubernetes-node": "^0.1.10",
+    "@backstage/plugin-kubernetes-node": "^0.1.11",
     "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.27",
+    "@backstage/plugin-permission-node": "^0.7.28",
     "@backstage/types": "^1.1.1",
     "@google-cloud/container": "^5.0.0",
     "@jest-mock/express": "^2.0.1",
     "@kubernetes/client-node": "0.20.0",
     "@types/express": "^4.17.6",
-    "@types/http-proxy-middleware": "^0.19.3",
+    "@types/http-proxy-middleware": "^1.0.0",
     "@types/luxon": "^3.0.0",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -85,11 +85,11 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-app-api": "^0.6.2",
-    "@backstage/backend-test-utils": "^0.3.6",
-    "@backstage/cli": "^0.26.2",
-    "@backstage/plugin-permission-backend": "^0.5.40",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.13",
+    "@backstage/backend-app-api": "^0.7.0",
+    "@backstage/backend-test-utils": "^0.3.7",
+    "@backstage/cli": "^0.26.3",
+    "@backstage/plugin-permission-backend": "^0.5.41",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.14",
     "@types/aws4": "^1.5.1",
     "msw": "^1.0.0",
     "supertest": "^6.1.3",