From 26eb174ce8f9ecd163738cc919aa8e27f51057c1 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <tim.jacomb@hmcts.net>
Date: Fri, 12 Nov 2021 15:33:22 +0000
Subject: [PATCH] Skip empty file names during scaffolder

Signed-off-by: Tim Jacomb <tim.jacomb@hmcts.net>
---
 .changeset/ninety-spies-prove.md                |  5 +++++
 .../actions/builtin/fetch/template.test.ts      | 17 +++++++++++++++++
 .../actions/builtin/fetch/template.ts           |  5 +++++
 3 files changed, 27 insertions(+)
 create mode 100644 .changeset/ninety-spies-prove.md

diff --git a/.changeset/ninety-spies-prove.md b/.changeset/ninety-spies-prove.md
new file mode 100644
index 0000000000..509aedd66f
--- /dev/null
+++ b/.changeset/ninety-spies-prove.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Skip empty file names when scaffolding with nunjucks
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
index 4befec5a81..755b435149 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
@@ -144,6 +144,7 @@ describe('fetch:template', () => {
             name: 'test-project',
             count: 1234,
             itemList: ['first', 'second', 'third'],
+            showDummyFile: false,
           },
         });
 
@@ -163,6 +164,10 @@ describe('fetch:template', () => {
               },
               '.${{ values.name }}': '${{ values.itemList | dump }}',
               'a-binary-file.png': aBinaryFile,
+              '{% if values.showDummyFile %}dummy-file.txt{% else %}{% endif %}':
+                'dummy file',
+              '${{ "dummy-file2.txt" if values.showDummyFile else "" }}':
+                'some dummy file',
             },
           });
 
@@ -181,6 +186,18 @@ describe('fetch:template', () => {
         );
       });
 
+      it('skips empty filename', async () => {
+        await expect(
+          fs.pathExists(`${workspacePath}/target/dummy-file.txt`),
+        ).resolves.toEqual(false);
+      });
+
+      it('skips empty filename syntax #2', async () => {
+        await expect(
+          fs.pathExists(`${workspacePath}/target/dummy-file2.txt`),
+        ).resolves.toEqual(false);
+      });
+
       it('copies files with no templating in names or content successfully', async () => {
         await expect(
           fs.readFile(`${workspacePath}/target/static.txt`, 'utf-8'),
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index bb568c25e6..47bfcccfdf 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -241,6 +241,11 @@ export function createFetchTemplateAction(options: {
           localOutputPath = templater.renderString(localOutputPath, context);
         }
         const outputPath = resolvePath(outputDir, localOutputPath);
+        // variables have been expanded to make an empty file name
+        // this is due to a conditional like if values.my_condition then file-name.txt else empty string so skip
+        if (outputDir === outputPath) {
+          continue;
+        }
 
         if (!renderContents && !extension) {
           ctx.logger.info(