From bc59e8833baf5e15eca7691ff8c8965babbd095a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Ca=C3=B1ete?= Date: Sat, 9 Jul 2022 19:37:40 +0200 Subject: [PATCH] Fix issue when a file is skipped inside a directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Cañete --- .../src/scaffolder/actions/builtin/fetch/template.test.ts | 6 ++++++ .../src/scaffolder/actions/builtin/fetch/template.ts | 3 +++ 2 files changed, 9 insertions(+) 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 c870d9a6b7..0b90db54e1 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 @@ -226,6 +226,12 @@ describe('fetch:template', () => { ).resolves.toEqual(false); }); + it('skips empty filename inside directory', async () => { + await expect( + fs.pathExists(`${workspacePath}/target/subdir3/fileSkippedInsideDirectory.txt`), + ).resolves.toEqual(false); + }); + it('skips content of empty subdirectory', async () => { await expect( fs.pathExists( 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 119c870002..25457f4775 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts @@ -217,6 +217,9 @@ export function createFetchTemplateAction(options: { } const outputPath = resolveSafeChildPath(outputDir, localOutputPath); + if (fs.existsSync(outputPath)) { + continue; + } if (!renderContents && !extension) { ctx.logger.info(