From 66016baf5c7876847fe13a33f34821dc9774fefd Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 6 Jul 2020 11:34:46 +0200
Subject: [PATCH] chore(scaffolder): fixing typescript woes

---
 .../src/scaffolder/stages/templater/cookiecutter.test.ts   | 4 ++--
 .../src/scaffolder/stages/templater/cookiecutter.ts        | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts
index 27e4cd4b01..31bcdf189b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts
@@ -131,13 +131,13 @@ describe('CookieCutter Templater', () => {
       component_id: 'newthing',
     };
 
-    const returnPath = await cookie.run({
+    const { resultDir } = await cookie.run({
       directory: tempdir,
       values,
       dockerClient: mockDocker,
     });
 
-    expect(returnPath.startsWith(`${tempdir}-result`)).toBeTruthy();
+    expect(resultDir.startsWith(`${tempdir}-result`)).toBeTruthy();
   });
 
   it('should pass through the streamer to the run docker helper', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
index 1f2ae56959..fff349cf82 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
@@ -18,6 +18,7 @@ import { JsonValue } from '@backstage/config';
 import { runDockerContainer } from './helpers';
 import { TemplaterBase, TemplaterRunOptions } from '.';
 import path from 'path';
+import { TemplaterRunResult } from './types';
 
 export class CookieCutter implements TemplaterBase {
   private async fetchTemplateCookieCutter(
@@ -34,7 +35,7 @@ export class CookieCutter implements TemplaterBase {
     }
   }
 
-  public async run(options: TemplaterRunOptions): Promise<string> {
+  public async run(options: TemplaterRunOptions): Promise<TemplaterRunResult> {
     // First lets grab the default cookiecutter.json file
     const cookieCutterJson = await this.fetchTemplateCookieCutter(
       options.directory,
@@ -66,6 +67,8 @@ export class CookieCutter implements TemplaterBase {
       dockerClient: options.dockerClient,
     });
 
-    return path.resolve(resultDir, options.values.component_id as string);
+    return {
+      resultDir: path.resolve(resultDir, options.values.component_id as string),
+    };
   }
 }