firebase-tools 15.1.0 → 15.2.0

package/lib/dataconnect/client.js

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.listSchemas = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
+exports.listLocations = listLocations;
+exports.getService = getService;
+exports.listAllServices = listAllServices;
+exports.createService = createService;
+exports.deleteService = deleteService;
+exports.getSchema = getSchema;
+exports.listSchemas = listSchemas;
+exports.upsertSchema = upsertSchema;
+exports.deleteSchema = deleteSchema;
+exports.getConnector = getConnector;
+exports.deleteConnector = deleteConnector;
+exports.listConnectors = listConnectors;
+exports.upsertConnector = upsertConnector;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
@@ -13,22 +25,17 @@ const dataconnectClient = () => new apiv2_1.Client({
     auth: true,
 });
 async function listLocations(projectId) {
-    var _a, _b, _c;
     const res = await dataconnectClient().get(`/projects/${projectId}/locations`);
-    return (_c = (_b = (_a = res.body) === null || _a === void 0 ? void 0 : _a.locations) === null || _b === void 0 ? void 0 : _b.map((l) => l.locationId)) !== null && _c !== void 0 ? _c : [];
+    return res.body?.locations?.map((l) => l.locationId) ?? [];
 }
-exports.listLocations = listLocations;
 async function getService(serviceName) {
     const res = await dataconnectClient().get(serviceName);
     return res.body;
 }
-exports.getService = getService;
 async function listAllServices(projectId) {
-    var _a;
     const res = await dataconnectClient().get(`/projects/${projectId}/locations/-/services`);
-    return (_a = res.body.services) !== null && _a !== void 0 ? _a : [];
+    return res.body.services ?? [];
 }
-exports.listAllServices = listAllServices;
 async function createService(projectId, locationId, serviceId) {
     try {
         const op = await dataconnectClient().post(`/projects/${projectId}/locations/${locationId}/services`, {
@@ -52,7 +59,6 @@ async function createService(projectId, locationId, serviceId) {
         return undefined;
     }
 }
-exports.createService = createService;
 async function deleteService(serviceName) {
     const op = await dataconnectClient().delete(serviceName, {
         queryParams: { force: "true" },
@@ -64,7 +70,6 @@ async function deleteService(serviceName) {
     });
     return pollRes;
 }
-exports.deleteService = deleteService;
 async function getSchema(serviceName, schemaId = types.MAIN_SCHEMA_ID) {
     try {
         const res = await dataconnectClient().get(`${serviceName}/schemas/${schemaId}`);
@@ -77,7 +82,6 @@ async function getSchema(serviceName, schemaId = types.MAIN_SCHEMA_ID) {
         return undefined;
     }
 }
-exports.getSchema = getSchema;
 async function listSchemas(serviceName, fields = []) {
     const schemas = [];
     const getNextPage = async (pageToken = "") => {
@@ -96,7 +100,6 @@ async function listSchemas(serviceName, fields = []) {
     await getNextPage();
     return schemas;
 }
-exports.listSchemas = listSchemas;
 async function upsertSchema(schema, validateOnly = false, async = false) {
     const op = await dataconnectClient().patch(`${schema.name}`, schema, {
         queryParams: {
@@ -114,7 +117,6 @@ async function upsertSchema(schema, validateOnly = false, async = false) {
         masterTimeout: 10000,
     });
 }
-exports.upsertSchema = upsertSchema;
 async function deleteSchema(serviceName) {
     const op = await dataconnectClient().delete(`${serviceName}/schemas/${types.MAIN_SCHEMA_ID}`);
     await operationPoller.pollOperation({
@@ -124,12 +126,10 @@ async function deleteSchema(serviceName) {
     });
     return;
 }
-exports.deleteSchema = deleteSchema;
 async function getConnector(name) {
     const res = await dataconnectClient().get(name);
     return res.body;
 }
-exports.getConnector = getConnector;
 async function deleteConnector(name) {
     const op = await dataconnectClient().delete(name);
     await operationPoller.pollOperation({
@@ -139,7 +139,6 @@ async function deleteConnector(name) {
     });
     return;
 }
-exports.deleteConnector = deleteConnector;
 async function listConnectors(serviceName, fields = []) {
     const connectors = [];
     const getNextPage = async (pageToken = "") => {
@@ -158,7 +157,6 @@ async function listConnectors(serviceName, fields = []) {
     await getNextPage();
     return connectors;
 }
-exports.listConnectors = listConnectors;
 async function upsertConnector(connector) {
     const op = await dataconnectClient().patch(`${connector.name}?allow_missing=true`, connector);
     const pollRes = await operationPoller.pollOperation({
@@ -168,4 +166,3 @@ async function upsertConnector(connector) {
     });
     return pollRes;
 }
-exports.upsertConnector = upsertConnector;

package/lib/dataconnect/dataplaneClient.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeGraphQLMutation = exports.executeGraphQLQuery = exports.executeGraphQLRead = exports.executeGraphQL = exports.dataconnectDataplaneClient = exports.DATACONNECT_API_VERSION = exports.dataconnectOrigin = void 0;
+exports.DATACONNECT_API_VERSION = exports.dataconnectOrigin = void 0;
+exports.dataconnectDataplaneClient = dataconnectDataplaneClient;
+exports.executeGraphQL = executeGraphQL;
+exports.executeGraphQLRead = executeGraphQLRead;
+exports.executeGraphQLQuery = executeGraphQLQuery;
+exports.executeGraphQLMutation = executeGraphQLMutation;
 const api_1 = require("../api");
 var api_2 = require("../api");
 Object.defineProperty(exports, "dataconnectOrigin", { enumerable: true, get: function () { return api_2.dataconnectOrigin; } });
@@ -13,24 +18,19 @@ function dataconnectDataplaneClient() {
         auth: true,
     });
 }
-exports.dataconnectDataplaneClient = dataconnectDataplaneClient;
 async function executeGraphQL(client, servicePath, body) {
     const res = await client.post(`${servicePath}:executeGraphql`, body, { resolveOnHTTPError: true });
     return res;
 }
-exports.executeGraphQL = executeGraphQL;
 async function executeGraphQLRead(client, servicePath, body) {
     const res = await client.post(`${servicePath}:executeGraphqlRead`, body, { resolveOnHTTPError: true });
     return res;
 }
-exports.executeGraphQLRead = executeGraphQLRead;
 async function executeGraphQLQuery(client, connectorPath, body) {
     const res = await client.post(`${connectorPath}:executeQuery`, body, { resolveOnHTTPError: true });
     return res;
 }
-exports.executeGraphQLQuery = executeGraphQLQuery;
 async function executeGraphQLMutation(client, connectorPath, body) {
     const res = await client.post(`${connectorPath}:executeMutation`, body, { resolveOnHTTPError: true });
     return res;
 }
-exports.executeGraphQLMutation = executeGraphQLMutation;

package/lib/dataconnect/ensureApis.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureGIFApiTos = exports.ensureApis = void 0;
+exports.ensureApis = ensureApis;
+exports.ensureGIFApiTos = ensureGIFApiTos;
 const api = require("../api");
 const configstore_1 = require("../configstore");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
@@ -11,7 +12,6 @@ async function ensureApis(projectId, silent = false) {
         (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix, silent),
     ]);
 }
-exports.ensureApis = ensureApis;
 async function ensureGIFApiTos(projectId) {
     if (configstore_1.configstore.get("gemini")) {
         await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudAiCompanionOrigin(), "");
@@ -23,4 +23,3 @@ async function ensureGIFApiTos(projectId) {
     }
     return true;
 }
-exports.ensureGIFApiTos = ensureGIFApiTos;

package/lib/dataconnect/errors.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGQLErrors = exports.getInvalidConnectors = exports.getIncompatibleSchemaError = void 0;
+exports.getIncompatibleSchemaError = getIncompatibleSchemaError;
+exports.getInvalidConnectors = getInvalidConnectors;
+exports.getGQLErrors = getGQLErrors;
 const graphqlError_1 = require("./graphqlError");
 const INCOMPATIBLE_SCHEMA_ERROR_TYPESTRING = "IncompatibleSqlSchemaError";
 const PRECONDITION_ERROR_TYPESTRING = "type.googleapis.com/google.rpc.PreconditionFailure";
@@ -19,27 +21,22 @@ function getIncompatibleSchemaError(err) {
     incompatible.violationType = violationTypes[0];
     return incompatible;
 }
-exports.getIncompatibleSchemaError = getIncompatibleSchemaError;
 function getInvalidConnectors(err) {
-    var _a, _b;
     const preconditionErrs = errorDetails(err, PRECONDITION_ERROR_TYPESTRING);
     const invalidConns = [];
     for (const preconditionErr of preconditionErrs) {
-        const incompatibleConnViolation = (_a = preconditionErr === null || preconditionErr === void 0 ? void 0 : preconditionErr.violations) === null || _a === void 0 ? void 0 : _a.filter((v) => v.type === INCOMPATIBLE_CONNECTOR_TYPE);
-        const newConns = (_b = incompatibleConnViolation === null || incompatibleConnViolation === void 0 ? void 0 : incompatibleConnViolation.map((i) => i.subject)) !== null && _b !== void 0 ? _b : [];
+        const incompatibleConnViolation = preconditionErr?.violations?.filter((v) => v.type === INCOMPATIBLE_CONNECTOR_TYPE);
+        const newConns = incompatibleConnViolation?.map((i) => i.subject) ?? [];
         invalidConns.push(...newConns);
     }
     return invalidConns;
 }
-exports.getInvalidConnectors = getInvalidConnectors;
 function getGQLErrors(err) {
     const gqlErrs = errorDetails(err, "GraphqlError");
     return gqlErrs.map(graphqlError_1.prettify).join("\n");
 }
-exports.getGQLErrors = getGQLErrors;
 function errorDetails(err, ofType) {
-    var _a, _b;
-    const original = ((_b = (_a = err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) || (err === null || err === void 0 ? void 0 : err.original);
-    const details = original === null || original === void 0 ? void 0 : original.details;
-    return (details === null || details === void 0 ? void 0 : details.filter((d) => { var _a; return (_a = d["@type"]) === null || _a === void 0 ? void 0 : _a.includes(ofType); })) || [];
+    const original = err.context?.body?.error || err?.original;
+    const details = original?.details;
+    return details?.filter((d) => d["@type"]?.includes(ofType)) || [];
 }

package/lib/dataconnect/filters.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toString = exports.getResourceFilters = void 0;
+exports.getResourceFilters = getResourceFilters;
+exports.toString = toString;
 const error_1 = require("../error");
 function getResourceFilters(options) {
     if (!options.only) {
@@ -21,7 +22,6 @@ function getResourceFilters(options) {
     }
     return filters;
 }
-exports.getResourceFilters = getResourceFilters;
 function parseSelector(selector) {
     const parts = selector.split(":");
     const filter = {
@@ -53,4 +53,3 @@ function toString(rf) {
     }
     return base;
 }
-exports.toString = toString;

package/lib/dataconnect/freeTrial.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeInstructions = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
+exports.freeTrialTermsLink = freeTrialTermsLink;
+exports.checkFreeTrialInstanceUsed = checkFreeTrialInstanceUsed;
+exports.upgradeInstructions = upgradeInstructions;
 const clc = require("colorette");
 const cloudmonitoring_1 = require("../gcp/cloudmonitoring");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
-exports.freeTrialTermsLink = freeTrialTermsLink;
 const FREE_TRIAL_METRIC = "sqladmin.googleapis.com/fdc_lifetime_free_trial_per_project";
 async function checkFreeTrialInstanceUsed(projectId) {
     const past7d = new Date();
@@ -28,7 +29,6 @@ async function checkFreeTrialInstanceUsed(projectId) {
     }
     return used;
 }
-exports.checkFreeTrialInstanceUsed = checkFreeTrialInstanceUsed;
 function upgradeInstructions(projectId, trialUsed) {
     return `To provision a ${trialUsed ? "paid CloudSQL Postgres instance" : "CloudSQL Postgres instance on the Firebase Data Connect no-cost trial"}:
 
@@ -38,4 +38,3 @@ function upgradeInstructions(projectId, trialUsed) {
 
   2. Run ${clc.bold("firebase deploy --only dataconnect")} to deploy your Data Connect service.`;
 }
-exports.upgradeInstructions = upgradeInstructions;

package/lib/dataconnect/graphqlError.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettifyTable = exports.prettify = void 0;
+exports.prettify = prettify;
+exports.prettifyTable = prettifyTable;
 const Table = require("cli-table3");
 function prettify(err) {
-    var _a, _b, _c, _d;
     let message = err.message;
-    let header = (_b = (_a = err.extensions) === null || _a === void 0 ? void 0 : _a.file) !== null && _b !== void 0 ? _b : "";
+    let header = err.extensions?.file ?? "";
     if (err.locations && err.locations.length) {
-        const line = (_d = (_c = err.locations[0]) === null || _c === void 0 ? void 0 : _c.line) !== null && _d !== void 0 ? _d : "";
+        const line = err.locations[0]?.line ?? "";
         if (line) {
             header += `:${line}`;
         }
@@ -31,7 +31,6 @@ function prettify(err) {
     }
     return header.length ? `${header}: ${message}` : message;
 }
-exports.prettify = prettify;
 function splitIssueMessage(err) {
     const msg = err.message.split(": ");
     if (msg.length >= 2) {
@@ -40,7 +39,6 @@ function splitIssueMessage(err) {
     return ["", err.message];
 }
 function prettifyTable(errs) {
-    var _a, _b;
     const table = new Table({
         head: ["Type", "Issue", "Workaround", "Reason"],
         style: { head: ["yellow"] },
@@ -51,7 +49,7 @@ function prettifyTable(errs) {
     for (const e of errs) {
         const msg = splitIssueMessage(e);
         e.message = msg[1];
-        if (!((_b = (_a = e.extensions) === null || _a === void 0 ? void 0 : _a.workarounds) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!e.extensions?.workarounds?.length) {
             table.push([msg[0], prettify(e), "", ""]);
         }
         else {
@@ -68,4 +66,3 @@ function prettifyTable(errs) {
     }
     return table.toString();
 }
-exports.prettifyTable = prettifyTable;

package/lib/dataconnect/load.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.squashGraphQL = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = exports.load = exports.loadAll = exports.pickServices = exports.pickOneService = void 0;
+exports.pickOneService = pickOneService;
+exports.pickServices = pickServices;
+exports.loadAll = loadAll;
+exports.load = load;
+exports.readFirebaseJson = readFirebaseJson;
+exports.readDataConnectYaml = readDataConnectYaml;
+exports.readConnectorYaml = readConnectorYaml;
+exports.readGQLFiles = readGQLFiles;
+exports.squashGraphQL = squashGraphQL;
 const path = require("path");
 const fs = require("fs-extra");
 const clc = require("colorette");
@@ -17,7 +25,6 @@ async function pickOneService(projectId, config, service, location) {
     }
     return services[0];
 }
-exports.pickOneService = pickOneService;
 async function pickServices(projectId, config, serviceId, location) {
     const serviceInfos = await loadAll(projectId, config);
     if (serviceInfos.length === 0) {
@@ -32,12 +39,10 @@ async function pickServices(projectId, config, serviceId, location) {
     }
     return matchingServices;
 }
-exports.pickServices = pickServices;
 async function loadAll(projectId, config) {
     const serviceCfgs = readFirebaseJson(config);
     return await Promise.all(serviceCfgs.map((c) => load(projectId, config, c.source)));
 }
-exports.loadAll = loadAll;
 async function load(projectId, config, sourceDirectory) {
     const resolvedDir = config.path(sourceDirectory);
     const dataConnectYaml = await readDataConnectYaml(resolvedDir);
@@ -77,9 +82,8 @@ async function load(projectId, config, sourceDirectory) {
         connectorInfo,
     };
 }
-exports.load = load;
 function readFirebaseJson(config) {
-    if (!(config === null || config === void 0 ? void 0 : config.has("dataconnect"))) {
+    if (!config?.has("dataconnect")) {
         return [];
     }
     const validator = (cfg) => {
@@ -101,13 +105,11 @@ function readFirebaseJson(config) {
         throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string }");
     }
 }
-exports.readFirebaseJson = readFirebaseJson;
 async function readDataConnectYaml(sourceDirectory) {
     const file = await (0, utils_1.readFileFromDirectory)(sourceDirectory, "dataconnect.yaml");
     const dataconnectYaml = await (0, utils_1.wrappedSafeLoad)(file.source);
     return validateDataConnectYaml(dataconnectYaml);
 }
-exports.readDataConnectYaml = readDataConnectYaml;
 function validateDataConnectYaml(unvalidated) {
     if (!unvalidated["location"]) {
         throw new error_1.FirebaseError("Missing required field 'location' in dataconnect.yaml");
@@ -125,7 +127,6 @@ async function readConnectorYaml(sourceDirectory) {
     const connectorYaml = await (0, utils_1.wrappedSafeLoad)(file.source);
     return validateConnectorYaml(connectorYaml);
 }
-exports.readConnectorYaml = readConnectorYaml;
 function validateConnectorYaml(unvalidated) {
     return unvalidated;
 }
@@ -136,7 +137,6 @@ async function readGQLFiles(sourceDir) {
     const files = await (0, glob_1.glob)("**/*.{gql,graphql}", { cwd: sourceDir, absolute: true, nodir: true });
     return files.map((f) => toFile(sourceDir, f));
 }
-exports.readGQLFiles = readGQLFiles;
 function toFile(sourceDir, fullPath) {
     const relPath = path.relative(sourceDir, fullPath);
     if (!fs.existsSync(fullPath)) {
@@ -166,4 +166,3 @@ function squashGraphQL(source) {
     }
     return query;
 }
-exports.squashGraphQL = squashGraphQL;

package/lib/dataconnect/names.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGraphqlName = exports.parseCloudSQLInstanceName = exports.parseConnectorName = exports.parseServiceName = void 0;
+exports.parseServiceName = parseServiceName;
+exports.parseConnectorName = parseConnectorName;
+exports.parseCloudSQLInstanceName = parseCloudSQLInstanceName;
+exports.isGraphqlName = isGraphqlName;
 const error_1 = require("../error");
 const serviceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/services\/(?<serviceId>[^\/]+)/;
 function parseServiceName(serviceName) {
-    var _a, _b, _c;
     const res = serviceNameRegex.exec(serviceName);
-    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 serviceId = (_c = res === null || res === void 0 ? void 0 : res.groups) === null || _c === void 0 ? void 0 : _c.serviceId;
+    const projectId = res?.groups?.projectId;
+    const location = res?.groups?.location;
+    const serviceId = res?.groups?.serviceId;
     if (!projectId || !location || !serviceId) {
         throw new error_1.FirebaseError(`${serviceName} is not a valid service name`);
     }
@@ -22,15 +24,13 @@ function parseServiceName(serviceName) {
         toString,
     };
 }
-exports.parseServiceName = parseServiceName;
 const connectorNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/services\/(?<serviceId>[^\/]+)\/connectors\/(?<connectorId>[^\/]+)/;
 function parseConnectorName(connectorName) {
-    var _a, _b, _c, _d;
     const res = connectorNameRegex.exec(connectorName);
-    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 serviceId = (_c = res === null || res === void 0 ? void 0 : res.groups) === null || _c === void 0 ? void 0 : _c.serviceId;
-    const connectorId = (_d = res === null || res === void 0 ? void 0 : res.groups) === null || _d === void 0 ? void 0 : _d.connectorId;
+    const projectId = res?.groups?.projectId;
+    const location = res?.groups?.location;
+    const serviceId = res?.groups?.serviceId;
+    const connectorId = res?.groups?.connectorId;
     if (!projectId || !location || !serviceId || !connectorId) {
         throw new error_1.FirebaseError(`${connectorName} is not a valid connector name`);
     }
@@ -45,14 +45,12 @@ function parseConnectorName(connectorName) {
         toString,
     };
 }
-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;
+    const projectId = res?.groups?.projectId;
+    const location = res?.groups?.location;
+    const instanceId = res?.groups?.instanceId;
     if (!projectId || !location || !instanceId) {
         throw new error_1.FirebaseError(`${cloudSQLInstanceName} is not a valid cloudSQL instance name`);
     }
@@ -66,9 +64,7 @@ function parseCloudSQLInstanceName(cloudSQLInstanceName) {
         toString,
     };
 }
-exports.parseCloudSQLInstanceName = parseCloudSQLInstanceName;
 const graphqlNameRegex = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function isGraphqlName(name) {
     return graphqlNameRegex.test(name);
 }
-exports.isGraphqlName = isGraphqlName;

package/lib/dataconnect/prompts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptDeleteConnector = void 0;
+exports.promptDeleteConnector = promptDeleteConnector;
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const client_1 = require("./client");
@@ -17,4 +17,3 @@ async function promptDeleteConnector(options, connectorName) {
         utils.logLabeledSuccess("dataconnect", `Connector ${connectorName} deleted`);
     }
 }
-exports.promptDeleteConnector = promptDeleteConnector;

package/lib/dataconnect/provisionCloudSql.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpdateReason = exports.cloudSQLBeingCreated = exports.setupCloudSql = void 0;
+exports.setupCloudSql = setupCloudSql;
+exports.cloudSQLBeingCreated = cloudSQLBeingCreated;
+exports.getUpdateReason = getUpdateReason;
 const clc = require("colorette");
 const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const logger_1 = require("../logger");
@@ -12,13 +14,12 @@ const utils = require("../utils");
 const cloudbilling_1 = require("../gcp/cloudbilling");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 async function setupCloudSql(args) {
-    var _a;
     const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
     const startTime = Date.now();
     const stats = { action: "get" };
     let success = false;
     try {
-        await upsertInstance(stats, Object.assign({}, args));
+        await upsertInstance(stats, { ...args });
         success = true;
     }
     finally {
@@ -28,7 +29,7 @@ async function setupCloudSql(args) {
                 action: success ? stats.action : `${stats.action}_error`,
                 location: args.location,
                 enable_google_ml_integration: args.requireGoogleMlIntegration.toString(),
-                database_version: ((_a = stats.databaseVersion) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || "unknown",
+                database_version: stats.databaseVersion?.toLowerCase() || "unknown",
                 dataconnect_label: stats.dataconnectLabel || "unknown",
             }, Date.now() - startTime);
         }
@@ -37,16 +38,14 @@ async function setupCloudSql(args) {
         await (0, checkIam_1.grantRolesToCloudSqlServiceAccount)(projectId, instanceId, [GOOGLE_ML_INTEGRATION_ROLE]);
     }
 }
-exports.setupCloudSql = setupCloudSql;
 async function upsertInstance(stats, args) {
-    var _a, _b;
     const { projectId, instanceId, requireGoogleMlIntegration, dryRun } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         utils.logLabeledBullet("dataconnect", `Found existing Cloud SQL instance ${clc.bold(instanceId)}.`);
         stats.databaseVersion = existingInstance.databaseVersion;
         stats.dataconnectLabel =
-            ((_b = (_a = existingInstance.settings) === null || _a === void 0 ? void 0 : _a.userLabels) === null || _b === void 0 ? void 0 : _b["firebase-data-connect"]) || "absent";
+            existingInstance.settings?.userLabels?.["firebase-data-connect"] || "absent";
         const why = getUpdateReason(existingInstance, requireGoogleMlIntegration);
         if (why) {
             if (dryRun) {
@@ -61,7 +60,7 @@ async function upsertInstance(stats, args) {
                 await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.updateInstanceForDataConnect(existingInstance, requireGoogleMlIntegration), "Updating your Cloud SQL instance...");
             }
         }
-        await upsertDatabase(Object.assign({}, args));
+        await upsertDatabase({ ...args });
     }
     catch (err) {
         if (err.status !== 404) {
@@ -71,7 +70,7 @@ async function upsertInstance(stats, args) {
         stats.databaseVersion = cloudSqlAdminClient.DEFAULT_DATABASE_VERSION;
         const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId);
         stats.dataconnectLabel = freeTrialUsed ? "nt" : "ft";
-        await createInstance(Object.assign(Object.assign({}, args), { freeTrialLabel: stats.dataconnectLabel }));
+        await createInstance({ ...args, freeTrialLabel: stats.dataconnectLabel });
     }
 }
 async function createInstance(args) {
@@ -104,7 +103,6 @@ function cloudSQLBeingCreated(projectId, instanceId, isFreeTrial, billingEnabled
             : ` 
    Monitor its progress at\n\n\t${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}\n`));
 }
-exports.cloudSQLBeingCreated = cloudSQLBeingCreated;
 async function upsertDatabase(args) {
     const { projectId, instanceId, databaseId, dryRun } = args;
     try {
@@ -127,14 +125,13 @@ async function upsertDatabase(args) {
     }
 }
 function getUpdateReason(instance, requireGoogleMlIntegration) {
-    var _a, _b, _c, _d, _e, _f;
     let reason = "";
     const settings = instance.settings;
-    if (!((_a = settings.ipConfiguration) === null || _a === void 0 ? void 0 : _a.ipv4Enabled)) {
+    if (!settings.ipConfiguration?.ipv4Enabled) {
         utils.logLabeledWarning("dataconnect", `Cloud SQL instance ${clc.bold(instance.name)} does not have a public IP.
     ${clc.bold("firebase dataconnect:sql:migrate")} will only work within its VPC (e.g. GCE, GKE).`);
-        if (((_b = settings.ipConfiguration) === null || _b === void 0 ? void 0 : _b.privateNetwork) &&
-            !((_c = settings.ipConfiguration) === null || _c === void 0 ? void 0 : _c.enablePrivatePathForGoogleCloudServices)) {
+        if (settings.ipConfiguration?.privateNetwork &&
+            !settings.ipConfiguration?.enablePrivatePathForGoogleCloudServices) {
             reason += "\n - to enable Private Path for Google Cloud Services.";
         }
     }
@@ -142,14 +139,13 @@ function getUpdateReason(instance, requireGoogleMlIntegration) {
         if (!settings.enableGoogleMlIntegration) {
             reason += "\n - to enable Google ML integration.";
         }
-        if (!((_d = settings.databaseFlags) === null || _d === void 0 ? void 0 : _d.some((f) => f.name === "cloudsql.enable_google_ml_integration" && f.value === "on"))) {
+        if (!settings.databaseFlags?.some((f) => f.name === "cloudsql.enable_google_ml_integration" && f.value === "on")) {
             reason += "\n - to enable Google ML integration database flag.";
         }
     }
-    const isIamEnabled = (_f = (_e = settings.databaseFlags) === null || _e === void 0 ? void 0 : _e.some((f) => f.name === "cloudsql.iam_authentication" && f.value === "on")) !== null && _f !== void 0 ? _f : false;
+    const isIamEnabled = settings.databaseFlags?.some((f) => f.name === "cloudsql.iam_authentication" && f.value === "on") ?? false;
     if (!isIamEnabled) {
         reason += "\n - to enable IAM authentication database flag.";
     }
     return reason;
 }
-exports.getUpdateReason = getUpdateReason;