diff --git a/packages/cli/src/lib/new/execution/executePortableTemplate.ts b/packages/cli/src/lib/new/execution/executePortableTemplate.ts index 4300bd54bc..435e909278 100644 --- a/packages/cli/src/lib/new/execution/executePortableTemplate.ts +++ b/packages/cli/src/lib/new/execution/executePortableTemplate.ts @@ -44,8 +44,8 @@ export async function executePortableTemplate( await installNewPackage(input); - if (input.builtInParams.owner) { - await addCodeownersEntry(targetDir, input.builtInParams.owner); + if (input.owner) { + await addCodeownersEntry(targetDir, input.owner); } await Task.forCommand('yarn install', { diff --git a/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts b/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts index 62d054f754..c71ff17d4e 100644 --- a/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts +++ b/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts @@ -42,12 +42,12 @@ describe('writeTemplateContents', () => { id: 'test', files: [], role: 'frontend-plugin', + parameters: {}, templateValues: {}, }, { ...baseConfig, roleParams: { role: 'frontend-plugin', pluginId: 'test' }, - builtInParams: {}, packageName: '@internal/plugin-test', packagePath: 'plugins/plugin-test', }, @@ -77,12 +77,12 @@ describe('writeTemplateContents', () => { }, ], role: 'frontend-plugin', + parameters: {}, templateValues: {}, }, { ...baseConfig, roleParams: { role: 'frontend-plugin', pluginId: 'test' }, - builtInParams: {}, packageName: '@internal/plugin-test', packagePath: 'out', }, diff --git a/packages/cli/src/lib/new/execution/writeTemplateContents.ts b/packages/cli/src/lib/new/execution/writeTemplateContents.ts index dc597bb5aa..e99507fd6b 100644 --- a/packages/cli/src/lib/new/execution/writeTemplateContents.ts +++ b/packages/cli/src/lib/new/execution/writeTemplateContents.ts @@ -41,7 +41,6 @@ export async function writeTemplateContents( const templater = await PortableTemplater.create({ values: { ...roleValues, - ...input.builtInParams, packageName: input.packageName, privatePackage: input.private, packageVersion: input.version, diff --git a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts index 376a1908ec..28231976e8 100644 --- a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts +++ b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts @@ -34,6 +34,7 @@ describe('collectTemplateParams', () => { templatePath: '/test', role: 'frontend-plugin' as const, files: [], + parameters: {}, templateValues: {}, }, prefilledParams: { @@ -48,9 +49,7 @@ describe('collectTemplateParams', () => { role: 'frontend-plugin', pluginId: 'test', }, - builtInParams: { - owner: 'me', - }, + owner: 'me', version: '0.1.0', license: 'Apache-2.0', private: true, @@ -72,9 +71,7 @@ describe('collectTemplateParams', () => { role: 'frontend-plugin', pluginId: 'other', }, - builtInParams: { - owner: undefined, - }, + owner: undefined, version: '0.1.0', license: 'Apache-2.0', private: true, diff --git a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts index ae7dcd413a..163993d4c4 100644 --- a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts +++ b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts @@ -20,7 +20,6 @@ import { paths } from '../../paths'; import { PortableTemplateConfig, PortableTemplateInput, - PortableTemplateInputBuiltInParams, PortableTemplateInputRoleParams, PortableTemplateParams, PortableTemplateRole, @@ -83,9 +82,7 @@ export async function collectPortableTemplateInput( return { roleParams, - builtInParams: { - owner: answers.owner, - } as PortableTemplateInputBuiltInParams, + owner: answers.owner as string | undefined, license: config.license, version: config.version, private: config.private, diff --git a/packages/cli/src/lib/new/preparation/selectTemplateInteractively.test.ts b/packages/cli/src/lib/new/preparation/selectTemplateInteractively.test.ts index 7226df4558..6ff7acb5fe 100644 --- a/packages/cli/src/lib/new/preparation/selectTemplateInteractively.test.ts +++ b/packages/cli/src/lib/new/preparation/selectTemplateInteractively.test.ts @@ -20,14 +20,13 @@ import { withLogCollector } from '@backstage/test-utils'; import { selectTemplateInteractively } from './selectTemplateInteractively'; describe('selectTemplateInteractively', () => { - const mockConfig: PortableTemplateConfig = { + const mockConfig = { isUsingDefaultTemplates: false, templatePointers: [ { id: 'template1', target: 'path/to/template1' }, { id: 'template2', target: 'path/to/template2' }, ], - globals: {}, - }; + } as PortableTemplateConfig; beforeEach(() => { jest.resetAllMocks(); diff --git a/packages/cli/src/lib/new/types.ts b/packages/cli/src/lib/new/types.ts index 6937ac2817..fc15eb882c 100644 --- a/packages/cli/src/lib/new/types.ts +++ b/packages/cli/src/lib/new/types.ts @@ -102,13 +102,10 @@ export type PortableTemplateInputRoleParams = moduleId: string; }; -export type PortableTemplateInputBuiltInParams = { - owner?: string; -}; - export type PortableTemplateInput = { roleParams: PortableTemplateInputRoleParams; - builtInParams: PortableTemplateInputBuiltInParams; + + owner?: string; license: string;