Fix a minor bug when CLI prompts for location service even when a existing data connect service is picked (#7291)

fredzqm · joehan · web-flow · commit fe3bfb7418b4 · 2024-06-07T15:38:44.000Z
* fix a bug whenit prompts for location service is chosen and new instance is chosen

* m

* format

---------

Co-authored-by: Joe Hanley &lt;joehanley@google.com&gt;
diff --git a/firebase-vscode/CHANGELOG.md b/firebase-vscode/CHANGELOG.md
@@ -1,4 +1,4 @@
-## NEXT 
+## NEXT
 
 ## 0.2.6
 
diff --git a/src/init/features/dataconnect/index.ts b/src/init/features/dataconnect/index.ts
@@ -192,7 +192,10 @@ async function promptForCloudSQLInstance(setup: Setup, info: RequiredInfo): Prom
         type: "list",
         choices,
       });
-      info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId)!.location;
+      if (info.cloudSqlInstanceId !== "") {
+        // Infer location if a CloudSQL instance is chosen.
+        info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId)!.location;
+      }
     }
   }
   if (info.cloudSqlInstanceId === "") {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## NEXT`
	`1`	`+## NEXT`
`2`	`2`
`3`	`3`	`## 0.2.6`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,10 @@ async function promptForCloudSQLInstance(setup: Setup, info: RequiredInfo): Prom`
`192`	`192`	`type: "list",`
`193`	`193`	`choices,`
`194`	`194`	`});`
`195`		`- info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId)!.location;`
	`195`	`+ if (info.cloudSqlInstanceId !== "") {`
	`196`	`+ // Infer location if a CloudSQL instance is chosen.`
	`197`	`+ info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId)!.location;`
	`198`	`+ }`
`196`	`199`	`}`
`197`	`200`	`}`
`198`	`201`	`if (info.cloudSqlInstanceId === "") {`