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

plugins/auth-backend/src/service/standaloneServer.ts

@@ -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, () => {

plugins/catalog-backend/src/service/standaloneServer.ts

@@ -20,7 +20,6 @@ import {
   UrlReaders,
   useHotMemoize,
 } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
 import { Server } from 'http';
 import { Logger } from 'winston';
 import { DatabaseManager } from '../database';
@@ -37,7 +36,7 @@ export async function startStandaloneServer(
   options: ServerOptions,
 ): Promise<Server> {
   const logger = options.logger.child({ service: 'catalog-backend' });
-  const config = ConfigReader.fromConfigs(await loadBackendConfig());
+  const config = await loadBackendConfig({ logger });
   const reader = UrlReaders.default({ logger, config });
   const db = useHotMemoize(module, () =>
     DatabaseManager.createInMemoryDatabaseConnection(),

plugins/proxy-backend/src/service/router.test.ts

@@ -16,7 +16,6 @@
 
 import { buildMiddleware, createRouter } from './router';
 import * as winston from 'winston';
-import { ConfigReader } from '@backstage/config';
 import {
   loadBackendConfig,
   SingleHostDiscovery,
@@ -42,7 +41,7 @@ const mockCreateProxyMiddleware = createProxyMiddleware as jest.MockedFunction<
 describe('createRouter', () => {
   it('works', async () => {
     const logger = winston.createLogger();
-    const config = ConfigReader.fromConfigs(await loadBackendConfig());
+    const config = await loadBackendConfig({ logger });
     const discovery = SingleHostDiscovery.fromConfig(config);
     const router = await createRouter({
       config,

plugins/proxy-backend/src/service/standaloneServer.ts

@@ -22,7 +22,6 @@ import {
 import { Server } from 'http';
 import { Logger } from 'winston';
 import { createRouter } from './router';
-import { ConfigReader } from '@backstage/config';
 
 export interface ServerOptions {
   port: number;
@@ -37,7 +36,7 @@ export async function startStandaloneServer(
 
   logger.debug('Creating application...');
 
-  const config = ConfigReader.fromConfigs(await loadBackendConfig());
+  const config = await loadBackendConfig({ logger });
   const discovery = SingleHostDiscovery.fromConfig(config);
   const router = await createRouter({
     config,

plugins/rollbar-backend/src/service/standaloneServer.ts

@@ -20,7 +20,6 @@ import {
   createServiceBuilder,
   loadBackendConfig,
 } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
 import { createRouter } from './router';
 
 export interface ServerOptions {
@@ -33,7 +32,7 @@ export async function startStandaloneServer(
   options: ServerOptions,
 ): Promise<Server> {
   const logger = options.logger.child({ service: 'rollbar-backend' });
-  const config = ConfigReader.fromConfigs(await loadBackendConfig());
+  const config = await loadBackendConfig({ logger });
 
   logger.debug('Creating application...');
 

plugins/techdocs-backend/src/default-branch.ts

@@ -15,8 +15,8 @@
  */
 import fetch from 'cross-fetch';
 import parseGitUrl from 'git-url-parse';
-import { ConfigReader, Config } from '@backstage/config';
-import { loadBackendConfig } from '@backstage/backend-common';
+import { Config } from '@backstage/config';
+import { getRootLogger, loadBackendConfig } from '@backstage/backend-common';
 
 interface IGitlabBranch {
   name: string;
@@ -230,7 +230,8 @@ async function getAzureDefaultBranch(
 export const getDefaultBranch = async (
   repositoryUrl: string,
 ): Promise<string> => {
-  const config = ConfigReader.fromConfigs(await loadBackendConfig());
+  // TODO(Rugvip): Config should not be loaded here, pass it in instead
+  const config = await loadBackendConfig({ logger: getRootLogger() });
   const typeMapping = [
     { url: /github*/g, type: 'github' },
     { url: /gitlab*/g, type: 'gitlab' },