From 86fc6a0360139e2d40dd5f318b80165354789750 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Feb 2021 22:55:57 +0100
Subject: [PATCH] scaffolder-backend: move v1 templater value injection into
 template converter

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 .../src/scaffolder/tasks/TemplateConverter.ts         | 11 ++++++++++-
 plugins/scaffolder-backend/src/service/router.ts      |  7 +------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
index 7d824a7d53..f9e9abf925 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
@@ -16,6 +16,7 @@
 
 import { resolve as resolvePath, dirname } from 'path';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
+import parseGitUrl from 'git-url-parse';
 import { TaskSpec } from './types';
 import {
   getTemplaterKey,
@@ -26,7 +27,7 @@ import {
 
 export function templateEntityToSpec(
   template: TemplateEntityV1alpha1,
-  values: TemplaterValues,
+  inputValues: TemplaterValues,
 ): TaskSpec {
   const steps: TaskSpec['steps'] = [];
 
@@ -42,6 +43,13 @@ export function templateEntityToSpec(
   }
   const templater = getTemplaterKey(template);
 
+  const values = {
+    ...inputValues,
+    destination: {
+      git: parseGitUrl(inputValues.storePath),
+    },
+  } as TemplaterValues;
+
   steps.push({
     id: 'prepare',
     name: 'Prepare',
@@ -81,6 +89,7 @@ export function templateEntityToSpec(
   });
 
   return {
+    baseUrl: undefined, // not used by legacy actions
     values: {},
     steps,
     output: {
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index cc483f3bd0..db5ab28064 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -328,12 +328,7 @@ export async function createRouter(
     )
     .post('/v2/tasks', async (req, res) => {
       const templateName: string = req.body.templateName;
-      const values: TemplaterValues = {
-        ...req.body.values,
-        destination: {
-          git: parseGitUrl(req.body.values.storePath),
-        },
-      };
+      const values: TemplaterValues = req.body.values;
       const template = await entityClient.findTemplate(templateName);
 
       let taskSpec;