From b4680036b60b1ea38abfb432a829e028df8a7a64 Mon Sep 17 00:00:00 2001 From: Mike Lewis Date: Mon, 5 Jul 2021 17:52:04 +0100 Subject: [PATCH] scaffolder: adjust case of cookieCutterCompat flag in fetch:template Realized that `cookiecutter` is more idiomatic than `cookieCutter`, so renamed the `cookieCutterCompat` flag on the new `fetch:template` action to `cookiecutterCompat`. Signed-off-by: Mike Lewis --- .../scaffolder/actions/builtin/fetch/template.test.ts | 2 +- .../src/scaffolder/actions/builtin/fetch/template.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 2fa00336df..48dcb8a06a 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 @@ -229,7 +229,7 @@ describe('fetch:template', () => { count: 1234, itemList: ['first', 'second', 'third'], }, - cookieCutterCompat: true, + cookiecutterCompat: true, }); mockFetchContents.mockImplementation(({ outputPath }) => { 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 38771292d4..54e9888184 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts @@ -42,7 +42,7 @@ export type FetchTemplateInput = { targetPath?: string; values: any; copyWithoutRender?: string[]; - cookieCutterCompat?: boolean; + cookiecutterCompat?: boolean; }; export function createFetchTemplateAction(options: { @@ -86,7 +86,7 @@ export function createFetchTemplateAction(options: { type: 'string', }, }, - cookieCutterCompat: { + cookiecutterCompat: { title: 'Cookiecutter compatibility mode', // TODO(mtlewis): documentation for cookiecutter compat mode description: @@ -160,7 +160,7 @@ export function createFetchTemplateAction(options: { // Create a templater const templater = nunjucks.configure({ // TODO(mtlewis/orkohunter): Document Why we are changing the literals? Not here, but on scaffolder docs. ADR? - ...(ctx.input.cookieCutterCompat + ...(ctx.input.cookiecutterCompat ? {} : { tags: { @@ -174,7 +174,7 @@ export function createFetchTemplateAction(options: { autoescape: false, }); - if (ctx.input.cookieCutterCompat) { + if (ctx.input.cookiecutterCompat) { // The "jsonify" filter built into cookiecutter is common // in fetch:cookiecutter templates, so when compat mode // is enabled we alias the "dump" filter from nunjucks as @@ -191,7 +191,7 @@ export function createFetchTemplateAction(options: { // `cookiecutter.`. To replicate this, we wrap our parameters // in an object with a `cookiecutter` property when compat // mode is enabled. - const parameters = ctx.input.cookieCutterCompat + const parameters = ctx.input.cookiecutterCompat ? { cookiecutter: ctx.input.values } : ctx.input.values;