From 284842865ea01c5a6b279511b209a1f0297be2ba Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 7 Feb 2025 16:04:18 +0100
Subject: [PATCH] cli/new: move default globals to config reading

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/lib/new/collection/collectTemplateParams.ts  |  9 ---------
 packages/cli/src/lib/new/preparation/loadConfig.ts   | 12 +++++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/lib/new/collection/collectTemplateParams.ts b/packages/cli/src/lib/new/collection/collectTemplateParams.ts
index 31d9837ef8..5338dc34ca 100644
--- a/packages/cli/src/lib/new/collection/collectTemplateParams.ts
+++ b/packages/cli/src/lib/new/collection/collectTemplateParams.ts
@@ -28,14 +28,6 @@ type CollectTemplateParamsOptions = {
   prefilledParams: Record<string, string | number | boolean>;
 };
 
-const defaultParams = {
-  owner: '',
-  license: 'Apache-2.0',
-  scope: '',
-  baseVersion: '0.1.0',
-  private: true,
-};
-
 export async function collectTemplateParams(
   options: CollectTemplateParamsOptions,
 ): Promise<Options> {
@@ -67,7 +59,6 @@ export async function collectTemplateParams(
   >(needsAnswer);
 
   return {
-    ...defaultParams,
     ...config.globals,
     ...prefilledAnswers,
     ...promptAnswers,
diff --git a/packages/cli/src/lib/new/preparation/loadConfig.ts b/packages/cli/src/lib/new/preparation/loadConfig.ts
index 13e47a34e1..489371d802 100644
--- a/packages/cli/src/lib/new/preparation/loadConfig.ts
+++ b/packages/cli/src/lib/new/preparation/loadConfig.ts
@@ -22,6 +22,12 @@ import { z } from 'zod';
 import { fromZodError } from 'zod-validation-error';
 import { ForwardedError } from '@backstage/errors';
 
+const defaultGlobals = {
+  license: 'Apache-2.0',
+  baseVersion: '0.1.0',
+  private: true,
+};
+
 const pkgJsonWithNewConfigSchema = z.object({
   backstage: z
     .object({
@@ -72,6 +78,10 @@ export async function loadConfig(
   return {
     isUsingDefaultTemplates: !newConfig?.templates,
     templatePointers: newConfig?.templates ?? defaultTemplates,
-    globals: { ...newConfig?.globals, ...options.globalOverrides },
+    globals: {
+      ...defaultGlobals,
+      ...newConfig?.globals,
+      ...options.globalOverrides,
+    },
   };
 }