Fix toolkit crashing when config doesn't parse (#7889)

* Fix toolkit crashing when config doesn't parse * changelog --------- Co-authored-by: joehan <[email protected]>
firebase · Nov 12, 2024 · a02e52f · a02e52f
1 parent 81dca8f
commit a02e52f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/firebase-vscode/CHANGELOG.md b/firebase-vscode/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## NEXT
 
+- [Fixed] Fixed an issue where the toolkit wouldn't start with misconfigured configs
+
 ## 0.10.7
 
 - Updated internal firebase-tools dependency to 13.24.2

diff --git a/firebase-vscode/src/data-connect/toolkit.ts b/firebase-vscode/src/data-connect/toolkit.ts
@@ -10,6 +10,7 @@ import { DataConnectEmulatorArgs } from "../emulator/dataconnectEmulator";
 import { Config } from "../config";
 import { RC } from "../rc";
 import { findOpenPort } from "../utils/port_utils";
+import { pluginLogger } from "../logger-wrapper";
 
 const DEFAULT_PORT = 50001;
 /** FDC-specific emulator logic; Toolkit and emulator */
@@ -46,10 +47,12 @@ export class DataConnectToolkit implements vscode.Disposable {
       enable_output_generated_sdk: true,
       enable_output_schema_extensions: true,
     };
+    pluginLogger.info(`Starting Data Connect toolkit on port ${port}`);
     return DataConnectToolkitController.start(toolkitArgs);
   }
 
   async stopFDCToolkit() {
+    pluginLogger.info(`Stopping Data Connect toolkit`);
     return DataConnectToolkitController.stop();
   }
 

diff --git a/src/dataconnect/load.ts b/src/dataconnect/load.ts
@@ -11,6 +11,7 @@ export async function load(
   config: Config,
   sourceDirectory: string,
 ): Promise<ServiceInfo> {
+  // TODO: better error handling when config read fails
   const resolvedDir = config.path(sourceDirectory);
   const dataConnectYaml = await fileUtils.readDataConnectYaml(resolvedDir);
   const serviceName = `projects/${projectId}/locations/${dataConnectYaml.location}/services/${dataConnectYaml.serviceId}`;

diff --git a/src/emulator/dataconnectEmulator.ts b/src/emulator/dataconnectEmulator.ts
@@ -80,9 +80,6 @@ export class DataConnectEmulator implements EmulatorInstance {
       this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
     }
 
-    const info = await load(this.args.projectId, this.args.config, this.args.configDir);
-    const dbId = info.dataConnectYaml.schema.datasource.postgresql?.database || "postgres";
-    const serviceId = info.dataConnectYaml.serviceId;
     await start(Emulators.DATACONNECT, {
       auto_download: this.args.auto_download,
       listen: listenSpecsToString(this.args.listen),
@@ -92,6 +89,9 @@ export class DataConnectEmulator implements EmulatorInstance {
     });
     this.usingExistingEmulator = false;
     if (this.args.autoconnectToPostgres) {
+      const info = await load(this.args.projectId, this.args.config, this.args.configDir);
+      const dbId = info.dataConnectYaml.schema.datasource.postgresql?.database || "postgres";
+      const serviceId = info.dataConnectYaml.serviceId;
       const pgPort = this.args.postgresListen?.[0].port;
       const pgHost = this.args.postgresListen?.[0].address;
       let connStr = dataConnectLocalConnString();