diff --git a/.changeset/chilly-fireants-type.md b/.changeset/chilly-fireants-type.md new file mode 100644 index 0000000000..6bff750d57 --- /dev/null +++ b/.changeset/chilly-fireants-type.md @@ -0,0 +1,5 @@ +--- +'@backstage/backend-common': patch +--- + +Remove the direct dependency on deprecated "request" library diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index ab049ea097..40be12e5ed 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -96,7 +96,6 @@ "node-forge": "^1.3.1", "pg": "^8.3.0", "raw-body": "^2.4.1", - "request": "^2.88.2", "selfsigned": "^2.0.0", "stoppable": "^1.1.0", "tar": "^6.1.12", diff --git a/packages/backend-common/src/util/KubernetesContainerRunner.ts b/packages/backend-common/src/util/KubernetesContainerRunner.ts index f3590a0bdc..4a9c447430 100644 --- a/packages/backend-common/src/util/KubernetesContainerRunner.ts +++ b/packages/backend-common/src/util/KubernetesContainerRunner.ts @@ -30,7 +30,6 @@ import { Watch, } from '@kubernetes/client-node'; import { v4 as uuid } from 'uuid'; -import { Request } from 'request'; /** * An existing Kubernetes volume that will be used as base for mounts. @@ -228,7 +227,7 @@ export class KubernetesContainerRunner implements ContainerRunner { taskId: string, callback: (pod: V1Pod) => void, errorCallback: (reason: any) => void, - ): Promise { + ): Promise<{ abort: () => void }> { const watch = new Watch(this.kubeConfig); const labelSelector = `task=${taskId}`; return watch.watch( @@ -251,8 +250,8 @@ export class KubernetesContainerRunner implements ContainerRunner { taskId: string, logStream: Writable, ): { promise: Promise; close: () => Promise } { - let log: Promise; - let req: Promise; + let log: Promise<{ abort: () => void }>; + let req: Promise<{ abort: () => void }>; const watchPromise = new Promise((_, reject) => { req = this.watchPod( taskId, @@ -299,7 +298,7 @@ export class KubernetesContainerRunner implements ContainerRunner { promise: Promise; close: () => Promise; } { - let req: Promise; + let req: Promise<{ abort: () => void }>; const promise = new Promise(async (resolve, reject) => { req = this.watchPod( taskId, diff --git a/plugins/kubernetes-backend/api-report.md b/plugins/kubernetes-backend/api-report.md index 7dfb0635bd..668061cd31 100644 --- a/plugins/kubernetes-backend/api-report.md +++ b/plugins/kubernetes-backend/api-report.md @@ -298,6 +298,7 @@ export interface KubernetesFetcher { fetchPodMetricsByNamespaces( clusterDetails: ClusterDetails, namespaces: Set, + labelSelector?: string, ): Promise; } diff --git a/yarn.lock b/yarn.lock index 159ffcc09a..92bcd59055 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3585,7 +3585,6 @@ __metadata: pg: ^8.3.0 raw-body: ^2.4.1 recursive-readdir: ^2.2.2 - request: ^2.88.2 selfsigned: ^2.0.0 stoppable: ^1.1.0 supertest: ^6.1.3 @@ -35650,7 +35649,7 @@ __metadata: languageName: node linkType: hard -"request@npm:^2.88.0, request@npm:^2.88.2": +"request@npm:^2.88.0": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: