From ba43e4ae35e837420d301388c3d0101417d576e6 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 14 Jun 2023 20:42:40 -0400 Subject: [PATCH 1/2] chore: Remove deprecated imports Signed-off-by: Adam Harvey --- .../implementations/discovery/discoveryServiceFactory.ts | 4 ++-- packages/backend-test-utils/src/next/wiring/TestBackend.ts | 4 ++-- .../templates/default-app/packages/backend/src/index.ts | 4 ++-- packages/techdocs-cli/src/commands/migrate/migrate.ts | 4 ++-- packages/techdocs-cli/src/commands/publish/publish.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts b/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts index 6c0da8521d..7e2bb6b21e 100644 --- a/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts +++ b/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SingleHostDiscovery } from '@backstage/backend-common'; +import { HostDiscovery } from '@backstage/backend-common'; import { coreServices, createServiceFactory, @@ -27,6 +27,6 @@ export const discoveryServiceFactory = createServiceFactory({ config: coreServices.config, }, async factory({ config }) { - return SingleHostDiscovery.fromConfig(config); + return HostDiscovery.fromConfig(config); }, }); diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts index 66bbb62193..e8df15862f 100644 --- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts +++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts @@ -22,7 +22,7 @@ import { ExtendedHttpServer, DefaultRootHttpRouter, } from '@backstage/backend-app-api'; -import { SingleHostDiscovery } from '@backstage/backend-common'; +import { HostDiscovery } from '@backstage/backend-common'; import { ServiceFactory, ServiceRef, @@ -148,7 +148,7 @@ export async function startTestBackend< throw new Error('Test server not started yet'); } const port = server.port(); - const discovery = SingleHostDiscovery.fromConfig( + const discovery = HostDiscovery.fromConfig( new ConfigReader({ backend: { baseUrl: `http://localhost:${port}`, listen: { port } }, }), diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.ts b/packages/create-app/templates/default-app/packages/backend/src/index.ts index c4736a5df8..1c08288675 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/index.ts +++ b/packages/create-app/templates/default-app/packages/backend/src/index.ts @@ -15,7 +15,7 @@ import { notFoundHandler, CacheManager, DatabaseManager, - SingleHostDiscovery, + HostDiscovery, UrlReaders, ServerTokenManager, } from '@backstage/backend-common'; @@ -35,7 +35,7 @@ import { DefaultIdentityClient } from '@backstage/plugin-auth-node'; function makeCreateEnv(config: Config) { const root = getRootLogger(); const reader = UrlReaders.default({ logger: root, config }); - const discovery = SingleHostDiscovery.fromConfig(config); + const discovery = HostDiscovery.fromConfig(config); const cacheManager = CacheManager.fromConfig(config); const databaseManager = DatabaseManager.fromConfig(config, { logger: root }); const tokenManager = ServerTokenManager.noop(); diff --git a/packages/techdocs-cli/src/commands/migrate/migrate.ts b/packages/techdocs-cli/src/commands/migrate/migrate.ts index a086073cda..1340d852f6 100644 --- a/packages/techdocs-cli/src/commands/migrate/migrate.ts +++ b/packages/techdocs-cli/src/commands/migrate/migrate.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SingleHostDiscovery } from '@backstage/backend-common'; +import { HostDiscovery } from '@backstage/backend-common'; import { Publisher } from '@backstage/plugin-techdocs-node'; import { OptionValues } from 'commander'; import { createLogger } from '../../lib/utility'; @@ -24,7 +24,7 @@ export default async function migrate(opts: OptionValues) { const logger = createLogger({ verbose: opts.verbose }); const config = PublisherConfig.getValidConfig(opts); - const discovery = SingleHostDiscovery.fromConfig(config); + const discovery = HostDiscovery.fromConfig(config); const publisher = await Publisher.fromConfig(config, { logger, discovery }); if (!publisher.migrateDocsCase) { diff --git a/packages/techdocs-cli/src/commands/publish/publish.ts b/packages/techdocs-cli/src/commands/publish/publish.ts index f4e78b57a4..961f42c73b 100644 --- a/packages/techdocs-cli/src/commands/publish/publish.ts +++ b/packages/techdocs-cli/src/commands/publish/publish.ts @@ -17,7 +17,7 @@ import { resolve } from 'path'; import { OptionValues } from 'commander'; import { createLogger } from '../../lib/utility'; -import { SingleHostDiscovery } from '@backstage/backend-common'; +import { HostDiscovery } from '@backstage/backend-common'; import { Publisher } from '@backstage/plugin-techdocs-node'; import { Entity } from '@backstage/catalog-model'; import { PublisherConfig } from '../../lib/PublisherConfig'; @@ -26,7 +26,7 @@ export default async function publish(opts: OptionValues): Promise { const logger = createLogger({ verbose: opts.verbose }); const config = PublisherConfig.getValidConfig(opts); - const discovery = SingleHostDiscovery.fromConfig(config); + const discovery = HostDiscovery.fromConfig(config); const publisher = await Publisher.fromConfig(config, { logger, discovery }); // Check that the publisher's underlying storage is ready and available. From 68a21956ef5268c8cc1317a79f9f8d23eb9724b7 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 14 Jun 2023 20:46:36 -0400 Subject: [PATCH 2/2] chore: Add changeset Signed-off-by: Adam Harvey --- .changeset/orange-frogs-exist.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/orange-frogs-exist.md diff --git a/.changeset/orange-frogs-exist.md b/.changeset/orange-frogs-exist.md new file mode 100644 index 0000000000..0eb7508b77 --- /dev/null +++ b/.changeset/orange-frogs-exist.md @@ -0,0 +1,8 @@ +--- +'@backstage/backend-test-utils': patch +'@backstage/backend-app-api': patch +'@techdocs/cli': patch +'@backstage/create-app': patch +--- + +Remove reference to deprecated import