From 45ddab44eda68f2d5d06dcf66cc751a043e8c28a Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 4 Apr 2022 11:44:56 +0200
Subject: [PATCH] scaffolder-backend: switch bitbucket-demo example template to
 use fetch:template

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../sample-templates/bitbucket-demo/template.yaml      | 10 ++++------
 .../bitbucket-demo/template/catalog-info.yaml          |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
index 8b6ff302ac..52714f6d73 100644
--- a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
@@ -45,20 +45,18 @@ spec:
   steps:
     - id: fetch-base
       name: Fetch Base
-      action: fetch:cookiecutter
+      action: fetch:template
       input:
         url: ./template
         values:
           name: ${{ parameters.name }}
           owner: ${{ parameters.owner }}
-
     - id: fetch-docs
       name: Fetch Docs
       action: fetch:plain
       input:
         targetPath: ./community
         url: https://github.com/backstage/community/tree/main/backstage-community-sessions
-
     - id: publish
       name: Publish
       action: publish:bitbucket
@@ -74,9 +72,9 @@ spec:
         catalogInfoPath: '/catalog-info.yaml'
 
   output:
-    links:	
-      - title: Repository	
+    links:
+      - title: Repository
         url: ${{ steps.publish.output.remoteUrl }}
-      - title: Open in catalog	
+      - title: Open in catalog
         icon: catalog
         entityRef: ${{ steps.register.output.entityRef }}
diff --git a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
index 875664d2a8..cfd2fb4990 100644
--- a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
@@ -1,8 +1,8 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: {{cookiecutter.name | jsonify}}
+  name: ${{values.name | dump}}
 spec:
   type: website
   lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
+  owner: ${{values.owner | dump}}