From 1627daac2b57c6a3fabb8aef682e3e7a58e5b782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 24 Jun 2021 12:52:46 +0200 Subject: [PATCH] Fix `catalog:write` on windows systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/forty-students-brake.md | 5 +++++ .../src/scaffolder/actions/builtin/catalog/write.test.ts | 1 + .../src/scaffolder/actions/builtin/catalog/write.ts | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/forty-students-brake.md diff --git a/.changeset/forty-students-brake.md b/.changeset/forty-students-brake.md new file mode 100644 index 0000000000..8be76e59d2 --- /dev/null +++ b/.changeset/forty-students-brake.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +Fix `catalog:write` on windows systems diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts index 0af6822ccf..48c44f090a 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts @@ -37,6 +37,7 @@ describe('catalog:write', () => { output: jest.fn(), createTemporaryDirectory: jest.fn(), }; + beforeEach(() => { jest.resetAllMocks(); }); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts index d7f302031e..45481b47e6 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts @@ -15,6 +15,7 @@ */ import fs from 'fs-extra'; +import { resolve as resolvePath } from 'path'; import { createTemplateAction } from '../../createTemplateAction'; import * as yaml from 'yaml'; import { Entity } from '@backstage/catalog-model'; @@ -41,7 +42,7 @@ export function createCatalogWriteAction() { const { entity } = ctx.input; await fs.writeFile( - `${ctx.workspacePath}/catalog-info.yaml`, + resolvePath(ctx.workspacePath, 'catalog-info.yaml'), yaml.stringify(entity), ); },