From 64826f9e2bf8f16fc9476d84d41293914772fcf2 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Wed, 20 Jan 2021 11:52:36 +0100
Subject: [PATCH] Re-add logger to preparer

Co-authored-by: blam<ben@blam.sh>
---
 packages/backend/src/plugins/scaffolder.ts                 | 3 ++-
 .../default-app/packages/backend/src/plugins/scaffolder.ts | 4 ++--
 .../src/scaffolder/stages/prepare/preparers.ts             | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/plugins/scaffolder.ts b/packages/backend/src/plugins/scaffolder.ts
index fb1d9babef..4e2257a46c 100644
--- a/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/backend/src/plugins/scaffolder.ts
@@ -34,10 +34,11 @@ export default async function createPlugin({
   const cookiecutterTemplater = new CookieCutter();
   const craTemplater = new CreateReactAppTemplater();
   const templaters = new Templaters();
+
   templaters.register('cookiecutter', cookiecutterTemplater);
   templaters.register('cra', craTemplater);
 
-  const preparers = await Preparers.fromConfig(config);
+  const preparers = await Preparers.fromConfig(config, { logger });
   const publishers = await Publishers.fromConfig(config, { logger });
 
   const dockerClient = new Docker();
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index 590f55c427..c8bd3e5012 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -18,11 +18,11 @@ export default async function createPlugin({
   const cookiecutterTemplater = new CookieCutter();
   const craTemplater = new CreateReactAppTemplater();
   const templaters = new Templaters();
-  
+
   templaters.register('cookiecutter', cookiecutterTemplater);
   templaters.register('cra', craTemplater);
 
-  const preparers = await Preparers.fromConfig(config);
+  const preparers = await Preparers.fromConfig(config, { logger });
   const publishers = await Publishers.fromConfig(config, { logger });
 
   const dockerClient = new Docker();
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts
index 9a209f4860..a0b477b66a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.ts
@@ -16,6 +16,7 @@
 
 import { Config } from '@backstage/config';
 import { PreparerBase, PreparerBuilder } from './types';
+import { Logger } from 'winston';
 
 import { GitlabPreparer } from './gitlab';
 import { AzurePreparer } from './azure';
@@ -40,7 +41,11 @@ export class Preparers implements PreparerBuilder {
     return preparer;
   }
 
-  static async fromConfig(config: Config): Promise<PreparerBuilder> {
+  static async fromConfig(
+    config: Config,
+    // eslint-disable-next-line
+    _: { logger: Logger },
+  ): Promise<PreparerBuilder> {
     const preparers = new Preparers();
     const scm = ScmIntegrations.fromConfig(config);
     for (const integration of scm.azure.list()) {