[FDC] Relax project requirement in sdk:generate & Fixed GA metrics label ambiguity (#9337)

* label init from gen sdk

* m

* pull source into a parent object

* m

* relax project requirement in sdk:generate

Author: fredzqm

src/commands/dataconnect-sdk-generate.ts

@@ -3,7 +3,7 @@ import * as clc from "colorette";
 import { Command } from "../command";
 import { Options } from "../options";
 import { DataConnectEmulator } from "../emulator/dataconnectEmulator";
-import { needProjectId } from "../projectUtils";
+import { getProjectId } from "../projectUtils";
 import { loadAll } from "../dataconnect/load";
 import { getProjectDefaultAccount } from "../auth";
 import { logBullet, logLabeledSuccess, logWarning } from "../utils";
@@ -14,6 +14,7 @@ import * as dataconnectInit from "../init/features/dataconnect";
 import * as dataconnectSdkInit from "../init/features/dataconnect/sdk";
 import { FirebaseError } from "../error";
 import { postInitSaves } from "./init";
+import { EmulatorHub } from "../emulator/hub";
 
 type GenerateOptions = Options & { watch?: boolean };
 
@@ -24,7 +25,7 @@ export const command = new Command("dataconnect:sdk:generate")
     "watch for changes to your connector GQL files and regenerate your SDKs when updates occur",
   )
   .action(async (options: GenerateOptions) => {
-    const projectId = needProjectId(options);
+    const projectId = getProjectId(options);
 
     let justRanInit = false;
     let config = options.config;
@@ -44,7 +45,11 @@ export const command = new Command("dataconnect:sdk:generate")
       }
       const setup: Setup = {
         config: config.src,
+        projectId: projectId,
         rcfile: options.rc.data,
+        featureInfo: {
+          dataconnectSource: "gen_sdk_init",
+        },
         instructions: [],
       };
       await dataconnectInit.askQuestions(setup);
@@ -67,7 +72,11 @@ export const command = new Command("dataconnect:sdk:generate")
       );
       const setup: Setup = {
         config: config.src,
+        projectId: projectId,
         rcfile: options.rc.data,
+        featureInfo: {
+          dataconnectSource: "gen_sdk_init_sdk",
+        },
         instructions: [],
       };
       await dataconnectSdkInit.askQuestions(setup);
@@ -79,8 +88,11 @@ export const command = new Command("dataconnect:sdk:generate")
     await generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit);
   });
 
-async function loadAllWithSDKs(projectId: string, config: Config): Promise<ServiceInfo[]> {
-  const serviceInfos = await loadAll(projectId, config);
+async function loadAllWithSDKs(
+  projectId: string | undefined,
+  config: Config,
+): Promise<ServiceInfo[]> {
+  const serviceInfos = await loadAll(projectId || EmulatorHub.MISSING_PROJECT_PLACEHOLDER, config);
   return serviceInfos.filter((serviceInfo) =>
     serviceInfo.connectorInfo.some((c) => {
       return (

src/dataconnect/provisionCloudSql.ts

@@ -8,6 +8,7 @@ import { checkFreeTrialInstanceUsed, freeTrialTermsLink } from "./freeTrial";
 import { promiseWithSpinner } from "../utils";
 import { trackGA4 } from "../track";
 import * as utils from "../utils";
+import { Source } from "../init/features/dataconnect";
 
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 
@@ -24,7 +25,7 @@ export async function setupCloudSql(args: {
   instanceId: string;
   databaseId: string;
   requireGoogleMlIntegration: boolean;
-  source: "mcp_init" | "init" | "init_sdk" | "deploy";
+  source: Source;
   dryRun?: boolean;
 }): Promise<void> {
   const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;

src/init/features/dataconnect/index.spec.ts

@@ -247,7 +247,6 @@ function mockConfig(data: Record<string, any> = {}): Config {
 }
 function mockRequiredInfo(info: Partial<init.RequiredInfo> = {}): init.RequiredInfo {
   return {
-    source: "init",
     flow: "test",
     appDescription: "",
     serviceId: "test-service",

src/init/features/dataconnect/index.ts

@@ -50,9 +50,16 @@ const QUERIES_TEMPLATE = readTemplateSync("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = readTemplateSync("init/dataconnect/mutations.gql");
 const SEED_DATA_TEMPLATE = readTemplateSync("init/dataconnect/seed_data.gql");
 
+export type Source =
+  | "mcp_init"
+  | "init"
+  | "init_sdk"
+  | "gen_sdk_init"
+  | "gen_sdk_init_sdk"
+  | "deploy";
+
 export interface RequiredInfo {
   // The GA analytics metric to track how developers go through `init dataconnect`.
-  source: "mcp_init" | "init" | "init_sdk";
   flow: string;
   appDescription: string;
   serviceId: string;
@@ -100,7 +107,6 @@ const templateServiceInfo: ServiceGQL = {
 // logic should live here, and _no_ actuation logic should live here.
 export async function askQuestions(setup: Setup): Promise<void> {
   const info: RequiredInfo = {
-    source: "init",
     flow: "",
     appDescription: "",
     serviceId: "",
@@ -177,10 +183,10 @@ export async function actuate(setup: Setup, config: Config, options: any): Promi
     void trackGA4(
       "dataconnect_init",
       {
-        source: info.source,
+        source: setup.featureInfo?.dataconnectSource || "init",
         flow: info.flow.substring(1), // Trim the leading `_`
         project_status: setup.projectId
-          ? setup.isBillingEnabled
+          ? (await isBillingEnabled(setup))
             ? info.shouldProvisionCSQL
               ? "blaze_provisioned_csql"
               : "blaze"
@@ -199,7 +205,7 @@ export async function actuate(setup: Setup, config: Config, options: any): Promi
     https://console.firebase.google.com/project/${setup.projectId!}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`,
     );
   }
-  if (!setup.isBillingEnabled) {
+  if (!(await isBillingEnabled(setup))) {
     setup.instructions.push(upgradeInstructions(setup.projectId || "your-firebase-project"));
   }
   setup.instructions.push(
@@ -230,7 +236,7 @@ async function actuateWithInfo(
       instanceId: info.cloudSqlInstanceId,
       databaseId: info.cloudSqlDatabase,
       requireGoogleMlIntegration: false,
-      source: info.source,
+      source: setup.featureInfo?.dataconnectSource || "init",
     });
   }
 

src/init/features/dataconnect/sdk.ts

@@ -34,6 +34,7 @@ import { getGlobalDefaultAccount } from "../../../auth";
 import { createFlutterApp, createNextApp, createReactApp } from "./create_app";
 import { trackGA4 } from "../../../track";
 import { dirExistsSync, listFiles } from "../../../fsutils";
+import { isBillingEnabled } from "../../../gcp/cloudbilling";
 
 export const FDC_APP_FOLDER = "FDC_APP_FOLDER";
 export const FDC_SDK_FRAMEWORKS_ENV = "FDC_SDK_FRAMEWORKS";
@@ -170,9 +171,9 @@ export async function actuate(setup: Setup, config: Config) {
       void trackGA4(
         "dataconnect_init",
         {
-          flow: "cli_sdk",
+          source: setup.featureInfo?.dataconnectSource || "cli_sdk",
           project_status: setup.projectId
-            ? setup.isBillingEnabled
+            ? (await isBillingEnabled(setup))
               ? "blaze"
               : "spark"
             : "missing",

src/init/features/index.ts

@@ -25,6 +25,7 @@ export { initGitHub as hostingGithub } from "./hosting/github";
 export {
   askQuestions as dataconnectAskQuestions,
   RequiredInfo as DataconnectInfo,
+  Source as DataconnectSource,
   actuate as dataconnectActuate,
 } from "./dataconnect";
 export {

src/init/index.ts

@@ -36,6 +36,7 @@ export interface SetupInfo {
   firestore?: features.FirestoreInfo;
   dataconnect?: features.DataconnectInfo;
   dataconnectSdk?: features.DataconnectSdkInfo;
+  dataconnectSource?: features.DataconnectSource;
   storage?: features.StorageInfo;
   apptesting?: features.ApptestingInfo;
   ailogic?: features.AiLogicInfo;

src/mcp/tools/core/init.ts

@@ -182,8 +182,8 @@ export const init = tool(
         if (err) return err;
       }
       featuresList.push("dataconnect");
+      featureInfo.dataconnectSource = "mcp_init";
       featureInfo.dataconnect = {
-        source: "mcp_init",
         flow: "",
         appDescription: features.dataconnect.app_description || "",
         serviceId: features.dataconnect.service_id || "",