diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json index 1f58f64796..d5fbf9f239 100644 --- a/plugins/app-backend/package.json +++ b/plugins/app-backend/package.json @@ -56,7 +56,6 @@ "@backstage/cli": "workspace:^", "@backstage/types": "workspace:^", "@types/supertest": "^2.0.8", - "get-port": "^6.1.2", "mock-fs": "^5.1.0", "msw": "^0.49.0", "node-fetch": "^2.6.7", diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts index 80408694d6..7c57a5d685 100644 --- a/plugins/app-backend/src/service/appPlugin.test.ts +++ b/plugins/app-backend/src/service/appPlugin.test.ts @@ -17,18 +17,14 @@ import mockFs from 'mock-fs'; import { resolve as resolvePath } from 'path'; import fetch from 'node-fetch'; -import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { appPlugin } from './appPlugin'; import { databaseFactory, httpRouterFactory, - rootHttpRouterFactory, loggerFactory, rootLoggerFactory, } from '@backstage/backend-app-api'; -import { ConfigReader } from '@backstage/config'; -import getPort from 'get-port'; describe('appPlugin', () => { beforeEach(() => { @@ -48,23 +44,12 @@ describe('appPlugin', () => { }); it('boots', async () => { - const port = await getPort(); - await startTestBackend({ + const { server } = await startTestBackend({ services: [ - [ - coreServices.config, - new ConfigReader({ - backend: { - listen: { port }, - database: { client: 'better-sqlite3', connection: ':memory:' }, - }, - }), - ], loggerFactory(), rootLoggerFactory(), databaseFactory(), httpRouterFactory(), - rootHttpRouterFactory(), ], features: [ appPlugin({ @@ -75,12 +60,12 @@ describe('appPlugin', () => { }); await expect( - fetch(`http://localhost:${port}/api/app/derp.html`).then(res => + fetch(`http://localhost:${server.port()}/api/app/derp.html`).then(res => res.text(), ), ).resolves.toBe('winning'); await expect( - fetch(`http://localhost:${port}`).then(res => res.text()), + fetch(`http://localhost:${server.port()}`).then(res => res.text()), ).resolves.toBe('winning'); }); }); diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json index 06a0ab1c89..a86e27fae4 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/package.json +++ b/plugins/catalog-backend-module-incremental-ingestion/package.json @@ -56,8 +56,7 @@ "devDependencies": { "@backstage/backend-app-api": "workspace:^", "@backstage/cli": "workspace:^", - "@backstage/plugin-catalog-backend": "workspace:^", - "get-port": "^6.1.2" + "@backstage/plugin-catalog-backend": "workspace:^" }, "files": [ "alpha", diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts index 230af79a88..ec3e5ccf1b 100644 --- a/plugins/catalog-node/src/catalogService.test.ts +++ b/plugins/catalog-node/src/catalogService.test.ts @@ -14,11 +14,7 @@ * limitations under the License. */ -import { PluginEndpointDiscovery } from '@backstage/backend-common'; -import { - createBackendModule, - coreServices, -} from '@backstage/backend-plugin-api'; +import { createBackendModule } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { CatalogClient } from '@backstage/catalog-client'; import { catalogServiceRef } from './catalogService'; @@ -42,9 +38,6 @@ describe('catalogServiceRef', () => { }); await startTestBackend({ - services: [ - [coreServices.discovery, {} as unknown as PluginEndpointDiscovery], - ], features: [testModule()], }); }); diff --git a/yarn.lock b/yarn.lock index f973dee489..0890ba4386 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4518,7 +4518,6 @@ __metadata: express: ^4.17.1 express-promise-router: ^4.1.0 fs-extra: 10.1.0 - get-port: ^6.1.2 globby: ^11.0.0 helmet: ^6.0.0 knex: ^2.0.0 @@ -5117,7 +5116,6 @@ __metadata: "@types/luxon": ^3.0.0 express: ^4.17.1 express-promise-router: ^4.1.0 - get-port: ^6.1.2 knex: ^2.0.0 lodash: ^4.17.21 luxon: ^3.0.0 @@ -23753,13 +23751,6 @@ __metadata: languageName: node linkType: hard -"get-port@npm:^6.1.2": - version: 6.1.2 - resolution: "get-port@npm:6.1.2" - checksum: e3c3d591492a11393455ef220f24c812a28f7da56ec3e4a2512d931a1f196d42850b50ac6138349a44622eda6dc3c0ccd8495cd91376d968e2d9e6f6f849e0a9 - languageName: node - linkType: hard - "get-stdin@npm:^8.0.0": version: 8.0.0 resolution: "get-stdin@npm:8.0.0"