firebase-tools 13.17.0 → 13.19.0

package/lib/extensions/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExtensionSpec = exports.isResource = exports.isParam = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.isExtensionSpec = exports.isResource = exports.isParam = exports.isObject = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -14,6 +14,7 @@ var Visibility;
     Visibility["UNLISTED"] = "unlisted";
     Visibility["PUBLIC"] = "public";
 })(Visibility = exports.Visibility || (exports.Visibility = {}));
+const lifecycleStages = ["STAGE_UNSPECIFIED", "ON_INSTALL", "ON_UPDATE", "ON_CONFIGURE"];
 exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
 exports.FUNCTIONS_V2_RESOURCE_TYPE = "firebaseextensions.v1beta.v2function";
 var ParamType;
@@ -27,6 +28,7 @@ var ParamType;
 function isObject(value) {
     return typeof value === "object" && value !== null;
 }
+exports.isObject = isObject;
 const isParam = (param) => {
     return (isObject(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
 };
@@ -39,41 +41,35 @@ const isExtensionSpec = (spec) => {
     if (!isObject(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
         return false;
     }
-    let validResources = true;
     if (spec.resources && Array.isArray(spec.resources)) {
         for (const res of spec.resources) {
-            validResources = validResources && (0, exports.isResource)(res);
-            if (!validResources) {
-                break;
+            if (!(0, exports.isResource)(res)) {
+                return false;
             }
         }
     }
     else {
         return false;
     }
-    let validParams = true;
     if (spec.params && Array.isArray(spec.params)) {
         for (const param of spec.params) {
-            validParams = validParams && (0, exports.isParam)(param);
-            if (!validParams) {
-                break;
+            if (!(0, exports.isParam)(param)) {
+                return false;
             }
         }
     }
     else {
         return false;
     }
-    let validSysParams = true;
     if (spec.systemParams && Array.isArray(spec.systemParams)) {
         for (const param of spec.systemParams) {
-            validSysParams = validSysParams && (0, exports.isParam)(param);
-            if (!validSysParams) {
-                break;
+            if (!(0, exports.isParam)(param)) {
+                return false;
             }
         }
     }
     else {
-        return false;
+        return !spec.systemParams;
     }
     return true;
 };

package/lib/extensions/warnings.js

@@ -31,9 +31,12 @@ async function displayWarningsForDeploy(instancesToCreate) {
     return unpublishedExtensions.length > 0;
 }
 exports.displayWarningsForDeploy = displayWarningsForDeploy;
-function outOfBandChangesWarning(instanceIds) {
+function outOfBandChangesWarning(instanceIds, isDynamic) {
+    const extra = isDynamic
+        ? ""
+        : " To avoid this, run `firebase ext:export` to sync these changes to your local extensions manifest.";
     logger_1.logger.warn("The following instances may have been changed in the Firebase console or by another machine since the last deploy from this machine.\n\t" +
         clc.bold(instanceIds.join("\n\t")) +
-        "\nIf you proceed with this deployment, those changes will be overwritten. To avoid this, run `firebase ext:export` to sync these changes to your local extensions manifest.");
+        `\nIf you proceed with this deployment, those changes will be overwritten.${extra}`);
 }
 exports.outOfBandChangesWarning = outOfBandChangesWarning;

package/lib/firestore/checkDatabaseType.js

@@ -4,14 +4,21 @@ exports.checkDatabaseType = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
-async function checkDatabaseType(projectId) {
+const error_1 = require("../error");
+async function checkDatabaseType(projectId, databaseId = "(default)") {
     try {
         const client = new apiv2_1.Client({ urlPrefix: (0, api_1.firestoreOrigin)(), apiVersion: "v1" });
-        const resp = await client.get(`/projects/${projectId}/databases/(default)`);
+        const resp = await client.get(`/projects/${projectId}/databases/${databaseId}`);
         return resp.body.type;
     }
     catch (err) {
-        logger_1.logger.debug("error getting database type", err);
+        logger_1.logger.debug("error getting database type: ", err);
+        if (err instanceof error_1.FirebaseError) {
+            if (err.status === 404) {
+                logger_1.logger.info(`${databaseId} does not exist in project ${projectId}.`);
+                return "DATABASE_DOES_NOT_EXIST";
+            }
+        }
         return undefined;
     }
 }

package/lib/frameworks/angular/index.js

@@ -15,7 +15,7 @@ exports.support = "preview";
 exports.type = 3;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/angular";
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
-exports.supportedRange = "14 - 17";
+exports.supportedRange = "16 - 18";
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
@@ -181,9 +181,21 @@ exports.handle = function(req,res) {
 };\n`;
     }
     else if (serverOutputPath) {
-        bootstrapScript = `const app = ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
+        bootstrapScript = `
+    const app = new Promise((resolve) => {
+      setTimeout(() => {
+        const port = process.env.PORT;
+        const socket = 'express.sock';
+        process.env.PORT = socket;
+        
+        ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
             ? `import(\`./${serverOutputPath}/${serverEntry}\`)`
-            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(server => server.app());
+            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(({ app }) => {
+          process.env.PORT = port;
+          resolve(app());
+        });
+      }, 0);
+    });
 exports.handle = (req,res) => app.then(it => it(req,res));\n`;
     }
     else {

package/lib/frameworks/next/utils.js

@@ -265,7 +265,7 @@ exports.findEsbuildPath = findEsbuildPath;
 function getGlobalEsbuildVersion(binPath) {
     var _a;
     try {
-        const versionOutput = (_a = (0, child_process_1.execSync)(`${binPath} --version`, { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
+        const versionOutput = (_a = (0, child_process_1.execSync)(`"${binPath}" --version`, { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
         if (!versionOutput) {
             return null;
         }

package/lib/gcp/cloudsql/permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupSQLPermissions = exports.iamUserIsCSQLAdmin = exports.checkSQLRoleIsGranted = exports.firebasewriter = exports.firebasereader = exports.firebaseowner = void 0;
+exports.setupSQLPermissions = exports.iamUserIsCSQLAdmin = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.firebasewriter = exports.firebasereader = exports.firebaseowner = void 0;
 const projectUtils_1 = require("../../projectUtils");
 const connect_1 = require("./connect");
 const iam_1 = require("../iam");
@@ -19,6 +19,11 @@ function firebasewriter(databaseId) {
     return `firebasewriter_${databaseId}_public`;
 }
 exports.firebasewriter = firebasewriter;
+exports.fdcSqlRoleMap = {
+    owner: firebaseowner,
+    writer: firebasewriter,
+    reader: firebasereader,
+};
 async function checkSQLRoleIsGranted(options, instanceId, databaseId, grantedRole, granteeRole) {
     const checkCmd = `
     DO $$

package/lib/gcp/secretManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.labels = exports.ensureApi = exports.isAppHostingManaged = exports.isFunctionsManaged = exports.FIREBASE_MANAGED = exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
+exports.labels = exports.ensureApi = exports.isAppHostingManaged = exports.isFunctionsManaged = exports.FIREBASE_MANAGED = exports.checkServiceAgentRole = exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
@@ -207,6 +207,14 @@ async function setIamPolicy(secret, bindings) {
 }
 exports.setIamPolicy = setIamPolicy;
 async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
+    const bindings = await checkServiceAgentRole(secret, serviceAccountEmails, role);
+    if (bindings.length) {
+        await module.exports.setIamPolicy(secret, bindings);
+    }
+    (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
+}
+exports.ensureServiceAgentRole = ensureServiceAgentRole;
+async function checkServiceAgentRole(secret, serviceAccountEmails, role) {
     const policy = await module.exports.getIamPolicy(secret);
     const bindings = policy.bindings || [];
     let binding = bindings.find((b) => b.role === role);
@@ -222,11 +230,10 @@ async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
         }
     }
     if (shouldShortCircuit)
-        return;
-    await module.exports.setIamPolicy(secret, bindings);
-    (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
+        return [];
+    return bindings;
 }
-exports.ensureServiceAgentRole = ensureServiceAgentRole;
+exports.checkServiceAgentRole = checkServiceAgentRole;
 exports.FIREBASE_MANAGED = "firebase-managed";
 function isFunctionsManaged(secret) {
     return (secret.labels[exports.FIREBASE_MANAGED] === "true" || secret.labels[exports.FIREBASE_MANAGED] === "functions");

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

@@ -8,13 +8,16 @@ const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
+const experiments = require("../../../experiments");
 const client_1 = require("../../../dataconnect/client");
 const emulators_1 = require("../emulators");
 const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const utils_1 = require("../../../utils");
+const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
+const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdccompatiblemode.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
@@ -53,7 +56,8 @@ async function askQuestions(setup, config) {
         schemaGql: [],
         shouldProvisionCSQL: false,
     };
-    info = await promptForService(setup, info);
+    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
+    info = await promptForService(setup, info, isBillingEnabled);
     if (info.cloudSqlInstanceId === "") {
         info = await promptForCloudSQLInstance(setup, info);
     }
@@ -70,8 +74,9 @@ async function askQuestions(setup, config) {
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
     info.shouldProvisionCSQL = !!(setup.projectId &&
         (info.isNewInstance || info.isNewDatabase) &&
+        isBillingEnabled &&
         (await (0, prompt_1.confirm)({
-            message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
+            message: `Would you like to provision your Cloud SQL instance and database now?${info.isNewInstance ? " This will take several minutes." : ""}.`,
             default: true,
         })));
     return info;
@@ -125,7 +130,9 @@ function subDataconnectYamlValues(replacementValues) {
         connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
-    let replaced = DATACONNECT_YAML_TEMPLATE;
+    let replaced = experiments.isEnabled("fdccompatiblemode")
+        ? DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE
+        : DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
@@ -141,67 +148,73 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function promptForService(setup, info) {
-    var _a, _b, _c, _d;
+async function promptForService(setup, info, isBillingEnabled) {
+    var _a, _b, _c;
     if (setup.projectId) {
-        await (0, ensureApis_1.ensureApis)(setup.projectId);
-        const existingServices = await (0, client_1.listAllServices)(setup.projectId);
-        const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
-            return {
-                service: s,
-                schema: await (0, client_1.getSchema)(s.name),
-            };
-        }));
-        if (existingServicesAndSchemas.length) {
-            const choices = existingServicesAndSchemas.map((s) => {
-                const serviceName = (0, names_1.parseServiceName)(s.service.name);
+        if (isBillingEnabled) {
+            await (0, ensureApis_1.ensureApis)(setup.projectId);
+            const existingServices = await (0, client_1.listAllServices)(setup.projectId);
+            const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
                 return {
-                    name: `${serviceName.location}/${serviceName.serviceId}`,
-                    value: s,
+                    service: s,
+                    schema: await (0, client_1.getSchema)(s.name),
                 };
-            });
-            choices.push({ name: "Create a new service", value: undefined });
-            const choice = await (0, prompt_1.promptOnce)({
-                message: "Your project already has existing services. Which would you like to set up local files for?",
-                type: "list",
-                choices,
-            });
-            if (choice) {
-                const serviceName = (0, names_1.parseServiceName)(choice.service.name);
-                info.serviceId = serviceName.serviceId;
-                info.locationId = serviceName.location;
-                if (choice.schema) {
-                    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;
-                    }
-                    if (choice.schema.source.files) {
-                        info.schemaGql = choice.schema.source.files;
-                    }
-                    info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
-                    const connectors = await (0, client_1.listConnectors)(choice.service.name, [
-                        "connectors.name",
-                        "connectors.source.files",
-                    ]);
-                    if (connectors.length) {
-                        info.connectors = connectors.map((c) => {
-                            const id = c.name.split("/").pop();
-                            return {
-                                id,
-                                path: connectors.length === 1 ? "./connector" : `./${id}`,
-                                files: c.source.files || [],
-                            };
-                        });
+            }));
+            if (existingServicesAndSchemas.length) {
+                const choices = existingServicesAndSchemas.map((s) => {
+                    const serviceName = (0, names_1.parseServiceName)(s.service.name);
+                    return {
+                        name: `${serviceName.location}/${serviceName.serviceId}`,
+                        value: s,
+                    };
+                });
+                choices.push({ name: "Create a new service", value: undefined });
+                const choice = await (0, prompt_1.promptOnce)({
+                    message: "Your project already has existing services. Which would you like to set up local files for?",
+                    type: "list",
+                    choices,
+                });
+                if (choice) {
+                    const serviceName = (0, names_1.parseServiceName)(choice.service.name);
+                    info.serviceId = serviceName.serviceId;
+                    info.locationId = serviceName.location;
+                    if (choice.schema) {
+                        const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
+                        if ((_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
+                            const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
+                            info.cloudSqlInstanceId = instanceName.instanceId;
+                        }
+                        if (choice.schema.source.files) {
+                            info.schemaGql = choice.schema.source.files;
+                        }
+                        info.cloudSqlDatabase = (_c = (_b = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : "";
+                        const connectors = await (0, client_1.listConnectors)(choice.service.name, [
+                            "connectors.name",
+                            "connectors.source.files",
+                        ]);
+                        if (connectors.length) {
+                            info.connectors = connectors.map((c) => {
+                                const id = c.name.split("/").pop();
+                                return {
+                                    id,
+                                    path: connectors.length === 1 ? "./connector" : `./${id}`,
+                                    files: c.source.files || [],
+                                };
+                            });
+                        }
                     }
                 }
             }
         }
+        else {
+            await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+        }
     }
     if (info.serviceId === "") {
         info.serviceId = await (0, prompt_1.promptOnce)({
             message: "What ID would you like to use for this service?",
             type: "input",
-            default: "my-service",
+            default: "app",
         });
     }
     return info;
@@ -233,7 +246,7 @@ async function promptForCloudSQLInstance(setup, info) {
         info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
             message: `What ID would you like to use for your new CloudSQL instance?`,
             type: "input",
-            default: `fdc-sql`,
+            default: `${info.serviceId || "app"}-fdc`,
         });
     }
     if (info.locationId === "") {

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

@@ -9,13 +9,14 @@ const rules = require("./rules");
 const indexes = require("./indexes");
 const error_1 = require("../../../error");
 const clc = require("colorette");
+const prompt_1 = require("../../../prompt");
 async function checkProjectSetup(setup, config, options) {
     const firestoreUnusedError = new error_1.FirebaseError(`It looks like you haven't used Cloud Firestore in this project before. Go to ${clc.bold(clc.underline(`https://console.firebase.google.com/project/${setup.projectId}/firestore`))} to create your Cloud Firestore database.`, { exit: 1 });
     const isFirestoreEnabled = await apiEnabled.check(setup.projectId, "firestore.googleapis.com", "", true);
     if (!isFirestoreEnabled) {
         throw firestoreUnusedError;
     }
-    const dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId);
+    const dbType = await getDatabaseType(setup);
     logger_1.logger.debug(`database_type: ${dbType}`);
     if (!dbType) {
         throw firestoreUnusedError;
@@ -25,6 +26,24 @@ async function checkProjectSetup(setup, config, options) {
     }
     await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: setup.projectId }));
 }
+async function getDatabaseType(setup) {
+    const dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId, setup.databaseId);
+    logger_1.logger.debug(`database_type: ${dbType}`);
+    if (dbType === "DATABASE_DOES_NOT_EXIST") {
+        setup.databaseId = await selectDatabaseByPrompting();
+        return await getDatabaseType(setup);
+    }
+    else {
+        return dbType;
+    }
+}
+async function selectDatabaseByPrompting() {
+    const database = await (0, prompt_1.promptOnce)({
+        type: "input",
+        message: "Please input the name of the Native Firestore database you would like to use:",
+    });
+    return database;
+}
 async function doSetup(setup, config, options) {
     if (setup.projectId) {
         await checkProjectSetup(setup, config, options);

package/lib/init/features/firestore/indexes.js

@@ -47,15 +47,15 @@ function initIndexes(setup, config) {
         if (!setup.projectId) {
             return config.writeProjectFile(setup.config.firestore.indexes, INDEXES_TEMPLATE);
         }
-        return getIndexesFromConsole(setup.projectId).then((contents) => {
+        return getIndexesFromConsole(setup.projectId, setup.databaseId).then((contents) => {
             return config.writeProjectFile(setup.config.firestore.indexes, contents);
         });
     });
 }
 exports.initIndexes = initIndexes;
-function getIndexesFromConsole(projectId) {
-    const indexesPromise = indexes.listIndexes(projectId);
-    const fieldOverridesPromise = indexes.listFieldOverrides(projectId);
+function getIndexesFromConsole(projectId, databaseId) {
+    const indexesPromise = indexes.listIndexes(projectId, databaseId);
+    const fieldOverridesPromise = indexes.listFieldOverrides(projectId, databaseId);
     return Promise.all([indexesPromise, fieldOverridesPromise])
         .then((res) => {
         return indexes.makeIndexSpec(res[0], res[1]);

package/package.json

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

package/schema/connector-yaml.json

@@ -43,6 +43,16 @@
           "description": "Path to the directory where generated files should be written to."
         }
       }
+    },
+    "llmTools": {
+      "additionalProperties": true,
+      "type": "object",
+      "properties": {
+        "outputFile": {
+          "type": "string",
+          "description": "Path where the JSON LLM tool definitions file should be generated."
+        }
+      }
     }
   },
   "properties": {
@@ -50,35 +60,51 @@
       "type": "string",
       "description": "The ID of the Firebase Data Connect connector."
     },
-    "authMode": {
-      "type": "string",
-      "description": "The authentication strategy to use for this connector"
-
-    },
     "generate": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "javascriptSdk": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/javascriptSdk"
-          },
+          "oneOf": [
+            { "$ref": "#/definitions/javascriptSdk" },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/javascriptSdk"
+              }
+            }
+          ],
           "description": "Configuration for a generated Javascript SDK"
         },
         "kotlinSdk": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/kotlinSdk"
-          },
+          "oneOf": [
+            { "$ref": "#/definitions/kotlinSdk" },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/kotlinSdk"
+              }
+            }
+          ],
           "description": "Configuration for a generated Kotlin SDK"
         },
         "swiftSdk": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/swiftSdk"
-          },
+          "oneOf": [
+            { "$ref": "#/definitions/swiftSdk" },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/swiftSdk"
+              }
+            }
+          ],
           "description": "Configuration for a generated Swift SDK"
+        },
+        "llmTools": {
+          "oneOf": [
+            { "$ref": "#/definitions/llmTools" },
+            { "type": "array", "items": { "$ref": "#/definitions/llmTools" } }
+          ]
         }
       }
     }

package/templates/init/dataconnect/connector.yaml

@@ -1,5 +1,4 @@
 connectorId: __connectorId__
-authMode: "PUBLIC"
 ## ## Here's an example of how to add generated SDKs.
 ## ## You'll need to replace the outputDirs with ones pointing to where you want the generated code in your app.
 # generate:

package/templates/init/dataconnect/dataconnect-fdccompatiblemode.yaml

@@ -0,0 +1,12 @@
+specVersion: "v1beta"
+serviceId: __serviceId__
+location: __location__
+schema:
+  source: "./schema"
+  datasource:
+    postgresql:
+      database: __cloudSqlDatabase__
+      cloudSql:
+        instanceId: __cloudSqlInstanceId__
+      # schemaValidation: "COMPATIBLE"
+connectorDirs: __connectorDirs__

package/templates/init/dataconnect/dataconnect.yaml

@@ -1,4 +1,4 @@
-specVersion: "v1alpha"
+specVersion: "v1beta"
 serviceId: __serviceId__
 location: __location__
 schema: