firebase-tools 13.11.0 → 13.11.2

package/lib/commands/dataconnect-sdk-generate.js

@@ -20,6 +20,17 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             configDir = path.resolve(path.join(cwd), configDir);
         }
         const serviceInfo = await (0, load_1.load)(projectId, service.location, configDir);
+        const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
+            var _a, _b, _c;
+            return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
+                ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
+                ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk));
+        });
+        if (!hasGeneratables) {
+            logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
+            logger_1.logger.warn("See https://firebase.google.com/docs/data-connect/quickstart#configure-sdk-outputs for examples of how to configure generated SDKs.");
+            return;
+        }
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,

package/lib/dataconnect/client.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listServices = exports.listAllServices = exports.listLocations = void 0;
+exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.listLocations = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
 const types = require("./types");
-const logger_1 = require("../logger");
 const DATACONNECT_API_VERSION = "v1alpha";
 const dataconnectClient = () => new apiv2_1.Client({
     urlPrefix: (0, api_1.dataconnectOrigin)(),
@@ -19,26 +18,11 @@ async function listLocations(projectId) {
 }
 exports.listLocations = listLocations;
 async function listAllServices(projectId) {
-    const locations = await listLocations(projectId);
-    let services = [];
-    await Promise.all(locations.map(async (l) => {
-        try {
-            const locationServices = await listServices(projectId, l);
-            services = services.concat(locationServices);
-        }
-        catch (err) {
-            logger_1.logger.debug(`Unable to listServices in ${l}: ${err}`);
-        }
-    }));
-    return services;
-}
-exports.listAllServices = listAllServices;
-async function listServices(projectId, locationId) {
     var _a;
-    const res = await dataconnectClient().get(`/projects/${projectId}/locations/${locationId}/services`);
+    const res = await dataconnectClient().get(`/projects/${projectId}/locations/-/services`);
     return (_a = res.body.services) !== null && _a !== void 0 ? _a : [];
 }
-exports.listServices = listServices;
+exports.listAllServices = listAllServices;
 async function createService(projectId, locationId, serviceId) {
     const op = await dataconnectClient().post(`/projects/${projectId}/locations/${locationId}/services`, {
         name: `projects/${projectId}/locations/${locationId}/services/${serviceId}`,

package/lib/dataconnect/names.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseConnectorName = exports.parseServiceName = void 0;
+exports.parseCloudSQLInstanceName = exports.parseConnectorName = exports.parseServiceName = void 0;
 const error_1 = require("../error");
 const serviceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/services\/(?<serviceId>[^\/]+)/;
 function parseServiceName(serviceName) {
@@ -46,3 +46,24 @@ function parseConnectorName(connectorName) {
     };
 }
 exports.parseConnectorName = parseConnectorName;
+const cloudSQLInstanceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/instances\/(?<instanceId>[^\/]+)/;
+function parseCloudSQLInstanceName(cloudSQLInstanceName) {
+    var _a, _b, _c;
+    const res = cloudSQLInstanceNameRegex.exec(cloudSQLInstanceName);
+    const projectId = (_a = res === null || res === void 0 ? void 0 : res.groups) === null || _a === void 0 ? void 0 : _a.projectId;
+    const location = (_b = res === null || res === void 0 ? void 0 : res.groups) === null || _b === void 0 ? void 0 : _b.location;
+    const instanceId = (_c = res === null || res === void 0 ? void 0 : res.groups) === null || _c === void 0 ? void 0 : _c.instanceId;
+    if (!projectId || !location || !instanceId) {
+        throw new error_1.FirebaseError(`${cloudSQLInstanceName} is not a valid cloudSQL instance name`);
+    }
+    const toString = () => {
+        return `projects/${projectId}/locations/${location}/services/${instanceId}`;
+    };
+    return {
+        projectId,
+        location,
+        instanceId,
+        toString,
+    };
+}
+exports.parseCloudSQLInstanceName = parseCloudSQLInstanceName;

package/lib/dataconnect/provisionCloudSql.js

@@ -9,8 +9,8 @@ const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 const freeTrial_1 = require("./freeTrial");
 const error_1 = require("../error");
 async function provisionCloudSql(args) {
-    let connectionName;
-    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, silent } = args;
+    let connectionName = "";
+    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
@@ -35,11 +35,17 @@ async function provisionCloudSql(args) {
             throw new error_1.FirebaseError("Free trial unavailable.");
         }
         silent ||
-            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found, creating it. This instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}`);
-        silent || utils.logLabeledBullet("dataconnect", `This may take while...`);
-        const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration), "Creating your instance...");
-        silent || utils.logLabeledBullet("dataconnect", "Instance created");
-        connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
+            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found, creating it.` +
+                `\nThis instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
+                `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`);
+        const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration, waitForCreation), "Creating your instance...");
+        if (newInstance) {
+            silent || utils.logLabeledBullet("dataconnect", "Instance created");
+            connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
+        }
+        else {
+            silent || utils.logLabeledBullet("dataconnect", "Instance creation process started");
+        }
     }
     try {
         await cloudSqlAdminClient.getDatabase(projectId, instanceId, databaseId);

package/lib/deploy/dataconnect/deploy.js

@@ -56,6 +56,7 @@ async function default_1(context, options) {
             instanceId,
             databaseId,
             enableGoogleMlIntegration,
+            waitForCreation: true,
         });
     }));
     return;

package/lib/emulator/controller.js

@@ -540,7 +540,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         });
         await startEmulator(dataConnectEmulator);
         if (!utils.isVSCodeExtension()) {
-            dataConnectEmulator.connectToPostgres();
+            await dataConnectEmulator.connectToPostgres();
         }
     }
     if (listenForEmulator.storage) {

package/lib/emulator/dataconnectEmulator.js

@@ -118,11 +118,22 @@ class DataConnectEmulator {
 exports.DataConnectEmulator = DataConnectEmulator;
 class DataConnectEmulatorClient {
     constructor() {
-        this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
+        this.client = undefined;
     }
     async configureEmulator(body) {
-        const res = await this.client.post("emulator/configure", body);
-        return res;
+        if (!this.client) {
+            this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
+        }
+        try {
+            const res = await this.client.post("emulator/configure", body);
+            return res;
+        }
+        catch (err) {
+            if (err.status === 500) {
+                throw new error_1.FirebaseError(`Data Connect emulator: ${err.context.body.message}`);
+            }
+            throw err;
+        }
     }
 }
 exports.DataConnectEmulatorClient = DataConnectEmulatorClient;

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.getInstance = exports.listInstances = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const operationPoller = require("../../operation-poller");
+const error_1 = require("../../error");
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({
     urlPrefix: (0, api_1.cloudSQLAdminOrigin)(),
@@ -18,10 +19,17 @@ async function listInstances(projectId) {
 exports.listInstances = listInstances;
 async function getInstance(projectId, instanceId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}`);
+    if (res.body.state === "FAILED") {
+        throw new error_1.FirebaseError(`Cloud SQL instance ${instanceId} is in a failed state.\nGo to ${instanceConsoleLink(projectId, instanceId)} to repair or delete it.`);
+    }
     return res.body;
 }
 exports.getInstance = getInstance;
-async function createInstance(projectId, location, instanceId, enableGoogleMlIntegration) {
+function instanceConsoleLink(projectId, instanceId) {
+    return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
+}
+exports.instanceConsoleLink = instanceConsoleLink;
+async function createInstance(projectId, location, instanceId, enableGoogleMlIntegration, waitForCreation) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (enableGoogleMlIntegration) {
         databaseFlags.push({ name: "cloudsql.enable_google_ml_integration", value: "on" });
@@ -47,6 +55,9 @@ async function createInstance(projectId, location, instanceId, enableGoogleMlInt
             },
         },
     });
+    if (!waitForCreation) {
+        return;
+    }
     const opName = `projects/${projectId}/operations/${op.body.name}`;
     const pollRes = await operationPoller.pollOperation({
         apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),

package/lib/init/features/dataconnect/index.js

@@ -11,6 +11,7 @@ const ensureApis_1 = require("../../../dataconnect/ensureApis");
 const client_1 = require("../../../dataconnect/client");
 const emulators_1 = require("../emulators");
 const names_1 = require("../../../dataconnect/names");
+const logger_1 = require("../../../logger");
 const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, "../../../../templates/init/dataconnect/");
 const DATACONNECT_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "dataconnect.yaml"), "utf8");
 const CONNECTOR_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "connector.yaml"), "utf8");
@@ -46,6 +47,10 @@ async function doSetup(setup, config) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, info);
     const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, info);
+    if (!config.has("dataconnect")) {
+        config.set("dataconnect.source", dir);
+        config.set("dataconnect.location", info.locationId);
+    }
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
     await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
     await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "connector.yaml"), subbedConnectorYaml);
@@ -63,6 +68,7 @@ async function doSetup(setup, config) {
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
             enableGoogleMlIntegration: false,
+            waitForCreation: false,
         });
     }
 }
@@ -114,8 +120,10 @@ async function promptForService(setup, info) {
                 info.serviceId = serviceName.serviceId;
                 info.locationId = serviceName.location;
                 if (choice.schema) {
-                    info.cloudSqlInstanceId =
-                        (_b = (_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) !== null && _b !== void 0 ? _b : "";
+                    if ((_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
+                        const instanceName = (0, names_1.parseCloudSQLInstanceName)((_b = choice.schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance);
+                        info.cloudSqlInstanceId = instanceName.instanceId;
+                    }
                     info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
                 }
             }
@@ -147,7 +155,9 @@ async function promptForCloudSQLInstance(setup, info) {
                 type: "list",
                 choices,
             });
-            info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
+            if (info.cloudSqlInstanceId !== "") {
+                info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
+            }
         }
     }
     if (info.cloudSqlInstanceId === "") {
@@ -189,23 +199,23 @@ async function locationChoices(setup) {
     }
 }
 async function promptForDatabase(setup, config, info) {
-    const dir = config.get("dataconnect.source") || "dataconnect";
-    if (!config.has("dataconnect")) {
-        config.set("dataconnect.source", dir);
-        config.set("dataconnect.location", info.locationId);
-    }
     if (!info.isNewInstance && setup.projectId) {
-        const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
-        const choices = dbs.map((d) => {
-            return { name: d.name, value: d.name };
-        });
-        choices.push({ name: "Create a new database", value: "" });
-        if (dbs.length) {
-            info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-                message: `Which database in ${info.cloudSqlInstanceId} would you like to use?`,
-                type: "list",
-                choices,
+        try {
+            const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
+            const choices = dbs.map((d) => {
+                return { name: d.name, value: d.name };
             });
+            choices.push({ name: "Create a new database", value: "" });
+            if (dbs.length) {
+                info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+                    message: `Which database in ${info.cloudSqlInstanceId} would you like to use?`,
+                    type: "list",
+                    choices,
+                });
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
         }
     }
     if (info.cloudSqlDatabase === "") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.11.0",
+  "version": "13.11.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {