Merge remote-tracking branch 'origin' into migrate-to-msw

* origin:
  fix: ts
  fix: forwardRef to SidebarItem
  fix(cli): one more await in the test
  backend-common: make loadBackendConfig return config directly and log all resolved app-configs
This commit is contained in:
blam
2020-10-21 13:57:40 +02:00
20 changed files with 160 additions and 88 deletions
@@ -17,7 +17,6 @@
import Knex from 'knex';
import { Server } from 'http';
import { Logger } from 'winston';
import { ConfigReader } from '@backstage/config';
import { createRouter } from './router';
import {
createServiceBuilder,
@@ -34,7 +33,7 @@ export async function startStandaloneServer(
options: ServerOptions,
): Promise<Server> {
const logger = options.logger.child({ service: 'auth-backend' });
const config = ConfigReader.fromConfigs(await loadBackendConfig());
const config = await loadBackendConfig({ logger });
const discovery = SingleHostDiscovery.fromConfig(config);
const database = useHotMemoize(module, () => {