From 805f6ecc157331ba0df378550d698406226d0e14 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Fri, 4 Jun 2021 15:45:19 +0200
Subject: [PATCH] Disable strict mode

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../sample-templates/v1beta2-demo/template.yaml          | 9 +++++----
 .../v1beta2-demo/template/catalog-info.yaml              | 2 +-
 .../src/scaffolder/tasks/TaskWorker.ts                   | 3 ---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
index 8a355f880b..f15bef6f75 100644
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
@@ -35,7 +35,7 @@ spec:
           description: System of the component
           ui:field: EntityPicker
           ui:options:
-            allowedKinds: 
+            allowedKinds:
               - System
             defaultKind: System
             
@@ -64,7 +64,8 @@ spec:
         url: ./template
         values:
           name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'
+          owner: '{{ parameters.owner }}'         
+          system: '{{ parameters.system }}'
           destination: '{{ parseRepoUrl parameters.repoUrl }}'
 
     - id: fetch-docs
@@ -98,5 +99,5 @@ spec:
         listWorkspace: true
 
   output:
-    remoteUrl: '{{#unless parameters.dryRun}}{{ steps.publish.output.remoteUrl }}{{/unless}}'
-    entityRef: '{{#unless parameters.dryRun}}{{ steps.register.output.entityRef }}{{/unless}}'
+    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
+    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
index 16e651eaf7..b87ea174f0 100644
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
+++ b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
@@ -7,6 +7,6 @@ spec:
   type: website
   lifecycle: experimental
   owner: {{cookiecutter.owner | jsonify}}
-{%- if cookiecutter.backstage_system != "" %}
+{%- if cookiecutter.system != "" %}
   system: {{ cookiecutter.system | jsonify }}
 {%- endif %}
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
index 49e55881b9..f7ba181c8f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
@@ -118,7 +118,6 @@ export class TaskWorker {
                   if (typeof value === 'string') {
                     const templated = this.handlebars.compile(value, {
                       noEscape: true,
-                      strict: true,
                       data: false,
                       preventIndent: true,
                     })(templateCtx);
@@ -162,7 +161,6 @@ export class TaskWorker {
               if (typeof value === 'string') {
                 const templated = this.handlebars.compile(value, {
                   noEscape: true,
-                  strict: true,
                   data: false,
                   preventIndent: true,
                 })(templateCtx);
@@ -249,7 +247,6 @@ export class TaskWorker {
           if (typeof value === 'string') {
             return this.handlebars.compile(value, {
               noEscape: true,
-              strict: true,
               data: false,
               preventIndent: true,
             })(templateCtx);