From 934cc34563778f2a81f77c62d3003f2e19c24e6b Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 5 Sep 2022 10:43:12 +0200 Subject: [PATCH] cli: avoid backend schema processing when loading config Signed-off-by: Patrik Oldsberg --- .changeset/gold-fishes-yawn.md | 5 +++++ packages/cli/src/lib/bundler/server.ts | 6 ++---- packages/cli/src/lib/bundler/types.ts | 2 +- packages/cli/src/lib/config.ts | 5 ++--- 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 .changeset/gold-fishes-yawn.md diff --git a/.changeset/gold-fishes-yawn.md b/.changeset/gold-fishes-yawn.md new file mode 100644 index 0000000000..4b9ef0f605 --- /dev/null +++ b/.changeset/gold-fishes-yawn.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Avoid validating the backend configuration schema when loading static configuration for building the frontend. diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts index d3f1e8da75..fb11316fa6 100644 --- a/packages/cli/src/lib/bundler/server.ts +++ b/packages/cli/src/lib/bundler/server.ts @@ -64,10 +64,8 @@ export async function serveBundle(options: ServeOptions) { https: url.protocol === 'https:' ? { - cert: options.backendConfig.getString( - 'app.https.certificate.cert', - ), - key: options.backendConfig.getString('app.https.certificate.key'), + cert: options.fullConfig.getString('app.https.certificate.cert'), + key: options.fullConfig.getString('app.https.certificate.key'), } : false, host, diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts index 68260735f9..64916e349c 100644 --- a/packages/cli/src/lib/bundler/types.ts +++ b/packages/cli/src/lib/bundler/types.ts @@ -31,7 +31,7 @@ export type ServeOptions = BundlingPathsOptions & { checksEnabled: boolean; frontendConfig: Config; frontendAppConfigs: AppConfig[]; - backendConfig: Config; + fullConfig: Config; }; export type BuildOptions = BundlingPathsOptions & { diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts index 994714a3ce..a76571c3f6 100644 --- a/packages/cli/src/lib/config.ts +++ b/packages/cli/src/lib/config.ts @@ -96,15 +96,14 @@ export async function loadCliConfig(options: Options) { }); const frontendConfig = ConfigReader.fromConfigs(frontendAppConfigs); - const backendAppConfigs = schema.process(appConfigs); - const backendConfig = ConfigReader.fromConfigs(backendAppConfigs); + const fullConfig = ConfigReader.fromConfigs(appConfigs); return { schema, appConfigs, frontendConfig, frontendAppConfigs, - backendConfig, + fullConfig, }; } catch (error) { const maybeSchemaError = error as Error & { messages?: string[] };