From 011c8a8ff16014b4e5bbdbd4b16d6d995e996efd Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 9 Jan 2023 16:04:57 +0100 Subject: [PATCH] backend-common: use readHttpServerOptions to read SingleHostDiscovery options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fredrik Adelöw Co-authored-by: blam Co-authored-by: Johan Haals Signed-off-by: Patrik Oldsberg --- .../backend-common/src/discovery/SingleHostDiscovery.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/backend-common/src/discovery/SingleHostDiscovery.ts b/packages/backend-common/src/discovery/SingleHostDiscovery.ts index cc23a2f744..ded23b3374 100644 --- a/packages/backend-common/src/discovery/SingleHostDiscovery.ts +++ b/packages/backend-common/src/discovery/SingleHostDiscovery.ts @@ -16,8 +16,7 @@ import { Config } from '@backstage/config'; import { PluginEndpointDiscovery } from './types'; -import { readBaseOptions } from '../service/lib/config'; -import { DEFAULT_PORT } from '../service/lib/ServiceBuilderImpl'; +import { readHttpServerOptions } from '@backstage/backend-app-api'; /** * SingleHostDiscovery is a basic PluginEndpointDiscovery implementation @@ -43,9 +42,9 @@ export class SingleHostDiscovery implements PluginEndpointDiscovery { const basePath = options?.basePath ?? '/api'; const externalBaseUrl = config.getString('backend.baseUrl'); - const { listenHost = '::', listenPort = DEFAULT_PORT } = readBaseOptions( - config.getConfig('backend'), - ); + const { + listen: { host: listenHost = '::', port: listenPort }, + } = readHttpServerOptions(config.getConfig('backend')); const protocol = config.has('backend.https') ? 'https' : 'http'; // Translate bind-all to localhost, and support IPv6