firebase-tools 11.4.2 → 11.7.0

package/lib/commands/login-add.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const utils = require("../utils");

package/lib/commands/login-ci.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -19,7 +19,7 @@ exports.command = new command_1.Command("login:ci")
     const userCredentials = await auth.loginGoogle(options.localhost);
     logger_1.logger.info();
     utils.logSuccess("Success! Use this token to login on a CI server:\n\n" +
-        clc.bold(userCredentials.tokens.refresh_token) +
+        clc.bold(userCredentials.tokens.refresh_token || "") +
         '\n\nExample: firebase deploy --token "$FIREBASE_TOKEN"\n');
     return userCredentials;
 });

package/lib/commands/login-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const utils = require("../utils");

package/lib/commands/login-use.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const utils = require("../utils");
 const auth = require("../auth");

package/lib/commands/login.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const configstore_1 = require("../configstore");
@@ -28,11 +28,11 @@ exports.command = new command_1.Command("login")
         return user;
     }
     if (!options.reauth) {
-        utils.logBullet("Firebase optionally collects CLI usage and error reporting information to help improve our products. Data is collected in accordance with Google's privacy policy (https://policies.google.com/privacy) and is not used to identify you.\n");
+        utils.logBullet("Firebase optionally collects CLI and Emulator Suite usage and error reporting information to help improve our products. Data is collected in accordance with Google's privacy policy (https://policies.google.com/privacy) and is not used to identify you.\n");
         const collectUsage = await (0, prompt_1.promptOnce)({
             type: "confirm",
             name: "collectUsage",
-            message: "Allow Firebase to collect CLI usage and error reporting information?",
+            message: "Allow Firebase to collect CLI and Emulator Suite usage and error reporting information?",
         });
         configstore_1.configstore.set("usage", collectUsage);
         if (collectUsage) {

package/lib/commands/logout.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const logger_1 = require("../logger");
-const clc = require("cli-color");
+const clc = require("colorette");
 const utils = require("../utils");
 const auth = require("../auth");
 const prompt_1 = require("../prompt");

package/lib/commands/open.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const open = require("open");
 const error_1 = require("../error");
 const api = require("../api");
@@ -79,10 +79,10 @@ exports.command = new command_1.Command("open [link]")
         throw new error_1.FirebaseError(`Unable to determine URL for link: ${link}`);
     }
     if (link.arg !== linkName) {
-        logger_1.logger.info(`${clc.bold.cyan("Tip:")} You can also run ${clc.bold.underline(`firebase open ${link.arg}`)}`);
+        logger_1.logger.info(`${clc.bold(clc.cyan("Tip:"))} You can also run ${clc.bold(clc.underline(`firebase open ${link.arg}`))}`);
         logger_1.logger.info();
     }
     logger_1.logger.info(`Opening ${clc.bold(link.name)} link in your default browser:`);
-    logger_1.logger.info(clc.bold.underline(url));
+    logger_1.logger.info(clc.bold(clc.underline(url)));
     open(url);
 });

package/lib/commands/projects-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const Table = require("cli-table");
 const command_1 = require("../command");
@@ -22,7 +22,7 @@ function logProjectsList(projects, currentProjectId) {
     const table = new Table({ head: tableHead, style: { head: ["green"] } });
     projects.forEach(({ projectId, projectNumber, displayName, resources }) => {
         if (projectId === currentProjectId) {
-            projectId = clc.cyan.bold(`${projectId} (current)`);
+            projectId = clc.cyan(clc.bold(`${projectId} (current)`));
         }
         table.push([
             displayName || NOT_SPECIFIED,

package/lib/commands/serve.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const utils = require("../utils");

package/lib/commands/target-apply.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const requireConfig_1 = require("../requireConfig");

package/lib/commands/target-clear.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");

package/lib/commands/target-remove.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");

package/lib/commands/target.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
 const requireConfig_1 = require("../requireConfig");

package/lib/commands/use.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const command_1 = require("../command");
 const projects_1 = require("../management/projects");
 const logger_1 = require("../logger");
@@ -11,12 +11,12 @@ const command_2 = require("../command");
 const utils = require("../utils");
 function listAliases(options) {
     if (options.rc.hasProjects) {
-        logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot) + ":");
+        logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot || "") + ":");
         logger_1.logger.info();
         for (const [alias, projectId] of Object.entries(options.rc.projects)) {
             const listing = alias + " (" + projectId + ")";
             if (options.project === projectId || options.projectAlias === alias) {
-                logger_1.logger.info(clc.cyan.bold("* " + listing));
+                logger_1.logger.info(clc.cyan(clc.bold("* " + listing)));
             }
             else {
                 logger_1.logger.info("  " + listing);
@@ -121,8 +121,8 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
                 options.rc.addProjectAlias(results.alias, results.project);
                 utils.makeActiveProject(options.projectRoot, results.alias);
                 logger_1.logger.info();
-                logger_1.logger.info("Created alias", clc.bold(results.alias), "for", results.project + ".");
-                logger_1.logger.info("Now using alias", clc.bold(results.alias) + " (" + results.project + ")");
+                logger_1.logger.info("Created alias", clc.bold(results.alias || ""), "for", results.project + ".");
+                logger_1.logger.info("Now using alias", clc.bold(results.alias || "") + " (" + results.project + ")");
             });
         });
     }
@@ -143,10 +143,10 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
             return utils.reject("No active project");
         }
         if (options.projectAlias) {
-            logger_1.logger.info("Active Project:", clc.bold.cyan(options.projectAlias + " (" + options.project + ")"));
+            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.projectAlias + " (" + options.project + ")")));
         }
         else if (options.project) {
-            logger_1.logger.info("Active Project:", clc.bold.cyan(options.project));
+            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.project)));
         }
         else {
             let msg = "No project is currently active";

package/lib/config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs-extra");
 const path = require("path");
 const cjson = require("cjson");

package/lib/crashlytics/buildToolsJarHelper.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBuildtoolsCommand = exports.fetchBuildtoolsJar = void 0;
+const fs = require("fs-extra");
+const os = require("os");
+const path = require("path");
+const spawn = require("cross-spawn");
+const downloadUtils = require("../downloadUtils");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const rimraf = require("rimraf");
+const utils = require("../utils");
+const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
+    path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
+const JAR_VERSION = "2.9.1";
+const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
+async function fetchBuildtoolsJar() {
+    if (process.env.CRASHLYTICS_LOCAL_JAR) {
+        return process.env.CRASHLYTICS_LOCAL_JAR;
+    }
+    const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);
+    if (fs.existsSync(jarPath)) {
+        logger_1.logger.debug(`Buildtools Jar already downloaded at ${jarPath}`);
+        return jarPath;
+    }
+    if (fs.existsSync(JAR_CACHE_DIR)) {
+        logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
+        rimraf.sync(JAR_CACHE_DIR);
+    }
+    utils.logBullet("Downloading crashlytics-buildtools.jar to " + jarPath);
+    utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");
+    const tmpfile = await downloadUtils.downloadToTmp(JAR_URL);
+    fs.mkdirSync(JAR_CACHE_DIR, { recursive: true });
+    fs.copySync(tmpfile, jarPath);
+    return jarPath;
+}
+exports.fetchBuildtoolsJar = fetchBuildtoolsJar;
+function runBuildtoolsCommand(jarFile, args, debug) {
+    var _a;
+    const fullArgs = ["-jar", jarFile, ...args, "-clientName", "firebase-cli;crashlytics-buildtools"];
+    const outputs = spawn.sync("java", fullArgs, {
+        stdio: debug ? "inherit" : "pipe",
+    });
+    if (outputs.status !== 0) {
+        if (!debug) {
+            utils.logWarning(((_a = outputs.stdout) === null || _a === void 0 ? void 0 : _a.toString()) || "An unknown error occurred");
+        }
+        throw new error_1.FirebaseError(`java command failed with args: ${fullArgs}`);
+    }
+}
+exports.runBuildtoolsCommand = runBuildtoolsCommand;

package/lib/deploy/database/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepare = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const path = require("path");
 const error_1 = require("../../error");
 const parseBoltRules_1 = require("../../parseBoltRules");
@@ -39,12 +39,12 @@ function prepare(context, options) {
         deploys: deploys,
         ruleFiles: ruleFiles,
     };
-    utils.logBullet(clc.bold.cyan("database: ") + "checking rules syntax...");
+    utils.logBullet(clc.bold(clc.cyan("database: ")) + "checking rules syntax...");
     return Promise.all(deploys.map((deploy) => {
         return rtdb
             .updateRules(context.projectId, deploy.instance, ruleFiles[deploy.rules], { dryRun: true })
             .then(() => {
-            utils.logSuccess(clc.bold.green("database: ") +
+            utils.logSuccess(clc.bold(clc.green("database: ")) +
                 "rules syntax for database " +
                 clc.bold(deploy.instance) +
                 " is valid");

package/lib/deploy/database/release.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const rtdb = require("../../rtdb");
 const utils = require("../../utils");
 function release(context) {
@@ -13,14 +13,14 @@ function release(context) {
     }
     const deploys = context.database.deploys;
     const ruleFiles = context.database.ruleFiles;
-    utils.logBullet(clc.bold.cyan("database: ") + "releasing rules...");
+    utils.logBullet(clc.bold(clc.cyan("database: ")) + "releasing rules...");
     return Promise.all(deploys.map((deploy) => {
         return rtdb
             .updateRules(context.projectId, deploy.instance, ruleFiles[deploy.rules], {
             dryRun: false,
         })
             .then(() => {
-            utils.logSuccess(clc.bold.green("database: ") +
+            utils.logSuccess(clc.bold(clc.green("database: ")) +
                 "rules for database " +
                 clc.bold(deploy.instance) +
                 " released successfully");

package/lib/deploy/extensions/deploymentSummary.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deletesSummary = exports.configuresSummary = exports.updatesSummary = exports.createsSummary = exports.humanReadable = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const refs = require("../../extensions/refs");
 const humanReadable = (dep) => `${clc.bold(dep.instanceId)} (${dep.ref ? `${refs.toExtensionVersionRef(dep.ref)}` : `Installed from local source`})`;
 exports.humanReadable = humanReadable;

package/lib/deploy/extensions/errors.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorHandler = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../../logger");
 class ErrorHandler {
     constructor() {

package/lib/deploy/extensions/secrets.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSpecForSecrets = exports.handleSecretParams = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const secretUtils = require("../../extensions/secretsUtils");
 const secretManager = require("../../gcp/secretManager");
 const planner_1 = require("./planner");

package/lib/deploy/extensions/tasks.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteExtensionInstanceTask = exports.configureExtensionInstanceTask = exports.updateExtensionInstanceTask = exports.createExtensionInstanceTask = exports.extensionsDeploymentHandler = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const extensionsApi = require("../../extensions/extensionsApi");
 const extensionsHelper_1 = require("../../extensions/extensionsHelper");
@@ -146,5 +146,5 @@ function deleteExtensionInstanceTask(projectId, instanceSpec) {
 exports.deleteExtensionInstanceTask = deleteExtensionInstanceTask;
 function printSuccess(instanceId, type, validateOnly) {
     const action = validateOnly ? `validated ${type} for` : `${type}d`;
-    utils.logSuccess(clc.bold.green("extensions") + ` Successfully ${action} ${instanceId}`);
+    utils.logSuccess(clc.bold(clc.green("extensions")) + ` Successfully ${action} ${instanceId}`);
 }

package/lib/deploy/firestore/deploy.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const indexes_1 = require("../../firestore/indexes");
 const logger_1 = require("../../logger");
@@ -30,7 +30,7 @@ async function deployIndexes(context, options) {
     }
     const fieldOverrides = indexesSrc.fieldOverrides || [];
     await new indexes_1.FirestoreIndexes().deploy(options, indexes, fieldOverrides);
-    utils.logSuccess(`${clc.bold.green("firestore:")} deployed indexes in ${clc.bold(indexesFileName)} successfully`);
+    utils.logSuccess(`${clc.bold(clc.green("firestore:"))} deployed indexes in ${clc.bold(indexesFileName)} successfully`);
 }
 async function default_1(context, options) {
     await Promise.all([deployRules(context), deployIndexes(context, options)]);

package/lib/deploy/firestore/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const loadCJSON_1 = require("../../loadCJSON");
 const rulesDeploy_1 = require("../../rulesDeploy");
 const utils = require("../../utils");
@@ -23,7 +23,7 @@ function prepareIndexes(context, options) {
     const indexesFileName = options.config.src.firestore.indexes;
     const indexesPath = options.config.path(indexesFileName);
     const parsedSrc = (0, loadCJSON_1.loadCJSON)(indexesPath);
-    utils.logBullet(`${clc.bold.cyan("firestore:")} reading indexes from ${clc.bold(indexesFileName)}...`);
+    utils.logBullet(`${clc.bold(clc.cyan("firestore:"))} reading indexes from ${clc.bold(indexesFileName)}...`);
     context.firestore = context.firestore || {};
     context.firestore.indexes = {
         name: indexesFileName,

package/lib/deploy/functions/backend.js

@@ -65,8 +65,8 @@ function memoryToGen1Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 3,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen1Cpu = memoryToGen1Cpu;
@@ -79,8 +79,8 @@ function memoryToGen2Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 3,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen2Cpu = memoryToGen2Cpu;

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.resolveBackend = exports.of = exports.empty = void 0;
+exports.toBackend = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isValidMemoryOption = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -8,6 +8,7 @@ const params = require("./params");
 const previews_1 = require("../../previews");
 const error_1 = require("../../error");
 const functional_1 = require("../../functional");
+const env_1 = require("../../functions/env");
 const logger_1 = require("../../logger");
 function empty() {
     return {
@@ -23,15 +24,79 @@ function of(endpoints) {
     return build;
 }
 exports.of = of;
+function isHttpsTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "httpsTrigger");
+}
+exports.isHttpsTriggered = isHttpsTriggered;
+function isCallableTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "callableTrigger");
+}
+exports.isCallableTriggered = isCallableTriggered;
+function isEventTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "eventTrigger");
+}
+exports.isEventTriggered = isEventTriggered;
+function isScheduleTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "scheduleTrigger");
+}
+exports.isScheduleTriggered = isScheduleTriggered;
+function isTaskQueueTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "taskQueueTrigger");
+}
+exports.isTaskQueueTriggered = isTaskQueueTriggered;
+function isBlockingTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "blockingTrigger");
+}
+exports.isBlockingTriggered = isBlockingTriggered;
+const allMemoryOptions = [128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768];
+function isValidMemoryOption(mem) {
+    return allMemoryOptions.includes(mem);
+}
+exports.isValidMemoryOption = isValidMemoryOption;
+exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2"];
+exports.AllVpcEgressSettings = ["PRIVATE_RANGES_ONLY", "ALL_TRAFFIC"];
+exports.AllIngressSettings = [
+    "ALLOW_ALL",
+    "ALLOW_INTERNAL_ONLY",
+    "ALLOW_INTERNAL_AND_GCLB",
+];
 async function resolveBackend(build, userEnvOpt, userEnvs) {
+    var _a;
     const projectId = userEnvOpt.projectId;
     let paramValues = {};
     if (previews_1.previews.functionsparams) {
-        paramValues = await params.resolveParams(build.params, projectId, userEnvs);
+        paramValues = await params.resolveParams(build.params, projectId, envWithTypes(userEnvs));
+        const toWrite = {};
+        for (const paramName of Object.keys(paramValues)) {
+            if (userEnvs.hasOwnProperty(paramName)) {
+                continue;
+            }
+            toWrite[paramName] = ((_a = paramValues[paramName]) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+        }
+        (0, env_1.writeUserEnvs)(toWrite, userEnvOpt);
     }
     return toBackend(build, paramValues);
 }
 exports.resolveBackend = resolveBackend;
+function envWithTypes(rawEnvs) {
+    const out = {};
+    for (const envName of Object.keys(rawEnvs)) {
+        const value = rawEnvs[envName];
+        if (!isNaN(+value) && isFinite(+value) && !value.includes("e")) {
+            out[envName] = +value;
+        }
+        else if (value === "true") {
+            out[envName] = true;
+        }
+        else if (value === "false") {
+            out[envName] = false;
+        }
+        else {
+            out[envName] = value;
+        }
+    }
+    return out;
+}
 class Resolver {
     constructor(paramValues) {
         this.paramValues = paramValues;
@@ -109,6 +174,9 @@ function toBackend(build, paramValues) {
             r.resolveInts(bkEndpoint, bdEndpoint, "timeoutSeconds", "maxInstances", "minInstances", "concurrency");
             proto.convertIfPresent(bkEndpoint, bdEndpoint, "cpu", (0, functional_1.nullsafeVisitor)((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))));
             if (bdEndpoint.vpc) {
+                if (bdEndpoint.vpc.connector && !bdEndpoint.vpc.connector.includes("/")) {
+                    bdEndpoint.vpc.connector = `projects/${bdEndpoint.project}/locations/${region}/connectors/${bdEndpoint.vpc.connector}`;
+                }
                 bkEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) };
                 proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings");
             }
@@ -124,7 +192,7 @@ function toBackend(build, paramValues) {
 }
 exports.toBackend = toBackend;
 function discoverTrigger(endpoint, region, r) {
-    if ("httpsTrigger" in endpoint) {
+    if (isHttpsTriggered(endpoint)) {
         const httpsTrigger = {};
         if (endpoint.httpsTrigger.invoker === null) {
             httpsTrigger.invoker = null;
@@ -134,13 +202,13 @@ function discoverTrigger(endpoint, region, r) {
         }
         return { httpsTrigger };
     }
-    else if ("callableTrigger" in endpoint) {
+    else if (isCallableTriggered(endpoint)) {
         return { callableTrigger: {} };
     }
-    else if ("blockingTrigger" in endpoint) {
+    else if (isBlockingTriggered(endpoint)) {
         return { blockingTrigger: endpoint.blockingTrigger };
     }
-    else if ("eventTrigger" in endpoint) {
+    else if (isEventTriggered(endpoint)) {
         const eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
             retry: r.resolveBoolean(endpoint.eventTrigger.retry) || false,
@@ -154,11 +222,13 @@ function discoverTrigger(endpoint, region, r) {
         r.resolveStrings(eventTrigger, endpoint.eventTrigger, "serviceAccount", "region", "channel");
         return { eventTrigger };
     }
-    else if ("scheduleTrigger" in endpoint) {
+    else if (isScheduleTriggered(endpoint)) {
         const bkSchedule = {
             schedule: r.resolveString(endpoint.scheduleTrigger.schedule),
-            timeZone: r.resolveString(endpoint.scheduleTrigger.timeZone),
         };
+        if (endpoint.scheduleTrigger.timeZone !== undefined) {
+            bkSchedule.timeZone = r.resolveString(endpoint.scheduleTrigger.timeZone);
+        }
         if (endpoint.scheduleTrigger.retryConfig) {
             const bkRetry = {};
             r.resolveInts(bkRetry, endpoint.scheduleTrigger.retryConfig, "maxBackoffSeconds", "minBackoffSeconds", "maxRetrySeconds", "retryCount", "maxDoublings");