firebase-tools 13.6.0 → 13.7.0

package/lib/extensions/emulator/specHelper.js

@@ -4,6 +4,7 @@ exports.getRuntime = exports.DEFAULT_RUNTIME = exports.getFunctionProperties = e
 const yaml = require("js-yaml");
 const path = require("path");
 const fs = require("fs-extra");
+const supported = require("../../deploy/functions/runtimes/supported");
 const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
 const utils_1 = require("../utils");
@@ -77,7 +78,7 @@ function getFunctionProperties(resources) {
     return resources.map((r) => r.properties);
 }
 exports.getFunctionProperties = getFunctionProperties;
-exports.DEFAULT_RUNTIME = "nodejs14";
+exports.DEFAULT_RUNTIME = supported.latest("nodejs");
 function getRuntime(resources) {
     if (resources.length === 0) {
         return exports.DEFAULT_RUNTIME;
@@ -88,7 +89,7 @@ function getRuntime(resources) {
         if (!runtime) {
             return exports.DEFAULT_RUNTIME;
         }
-        if (!/^(nodejs)?([0-9]+)/.test(runtime)) {
+        if (!supported.runtimeIsLanguage(runtime, "nodejs")) {
             invalidRuntimes.push(runtime);
             return exports.DEFAULT_RUNTIME;
         }
@@ -97,6 +98,6 @@ function getRuntime(resources) {
     if (invalidRuntimes.length) {
         throw new error_1.FirebaseError(`The following runtimes are not supported by the Emulator Suite: ${invalidRuntimes.join(", ")}. \n Only Node runtimes are supported.`);
     }
-    return runtimes.sort()[runtimes.length - 1];
+    return supported.latest("nodejs", runtimes);
 }
 exports.getRuntime = getRuntime;

package/lib/frameworks/next/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_LAYERS = exports.ESBUILD_VERSION = exports.SERVER_REFERENCE_MANIFEST = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
+exports.WEBPACK_LAYERS = exports.ESBUILD_VERSION = exports.CONFIG_FILES = exports.SERVER_REFERENCE_MANIFEST = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
 exports.APP_PATH_ROUTES_MANIFEST = "app-path-routes-manifest.json";
 exports.EXPORT_MARKER = "export-marker.json";
 exports.IMAGES_MANIFEST = "images-manifest.json";
@@ -10,6 +10,7 @@ exports.PRERENDER_MANIFEST = "prerender-manifest.json";
 exports.ROUTES_MANIFEST = "routes-manifest.json";
 exports.APP_PATHS_MANIFEST = "app-paths-manifest.json";
 exports.SERVER_REFERENCE_MANIFEST = "server-reference-manifest.json";
+exports.CONFIG_FILES = ["next.config.js", "next.config.mjs"];
 exports.ESBUILD_VERSION = "0.19.2";
 const WEBPACK_LAYERS_NAMES = {
     shared: "shared",

package/lib/frameworks/next/index.js

@@ -7,7 +7,6 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const url_1 = require("url");
-const fs_1 = require("fs");
 const semver_1 = require("semver");
 const clc = require("colorette");
 const stream_chain_1 = require("stream-chain");
@@ -40,7 +39,7 @@ async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
     const version = (0, utils_2.getNextVersion)(dir);
-    if (!(await (0, fs_extra_1.pathExists)("next.config.js")) && !version)
+    if (!(await (0, utils_2.whichNextConfigFile)(dir)) && !version)
         return;
     return { mayWantBackend: true, publicDirectory: (0, path_1.join)(dir, PUBLIC_DIR), version };
 }
@@ -336,7 +335,8 @@ exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context) {
     const { distDir } = await getConfig(sourceDir);
     const packageJson = await (0, utils_1.readJSON)((0, path_1.join)(sourceDir, "package.json"));
-    if ((0, fs_1.existsSync)((0, path_1.join)(sourceDir, "next.config.js"))) {
+    const configFile = await (0, utils_2.whichNextConfigFile)(sourceDir);
+    if (configFile) {
         try {
             const productionDeps = await new Promise((resolve) => {
                 const dependencies = [];
@@ -361,8 +361,14 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
             });
             const esbuildArgs = productionDeps
                 .map((it) => `--external:${it}`)
-                .concat("--bundle", "--platform=node", `--target=node${constants_1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
-            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", `esbuild@${constants_2.ESBUILD_VERSION}`, "next.config.js", ...esbuildArgs], {
+                .concat("--bundle", "--platform=node", `--target=node${constants_1.NODE_VERSION}`, "--log-level=error");
+            if (configFile === "next.config.mjs") {
+                esbuildArgs.push(...[`--outfile=${(0, path_1.join)(destDir, configFile)}`, "--format=esm"]);
+            }
+            else {
+                esbuildArgs.push(`--outfile=${(0, path_1.join)(destDir, configFile)}`);
+            }
+            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", `esbuild@${constants_2.ESBUILD_VERSION}`, configFile, ...esbuildArgs], {
                 cwd: sourceDir,
                 timeout: BUNDLE_NEXT_CONFIG_TIMEOUT,
             });
@@ -371,9 +377,9 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
             }
         }
         catch (e) {
-            console.warn("Unable to bundle next.config.js for use in Cloud Functions, proceeding with deploy but problems may be enountered.");
+            console.warn(`Unable to bundle ${configFile} for use in Cloud Functions, proceeding with deploy but problems may be encountered.`);
             console.error(e.message || e);
-            (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, "next.config.js"), (0, path_1.join)(destDir, "next.config.js"));
+            await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, configFile), (0, path_1.join)(destDir, configFile));
         }
     }
     if (await (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDir, "public"))) {
@@ -390,8 +396,11 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
             dotEnv["VERCEL_URL"] = deploymentDomain;
         }
     }
-    await (0, fs_extra_1.mkdirp)((0, path_1.join)(destDir, distDir));
-    await (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, distDir), (0, path_1.join)(destDir, distDir));
+    const [productionDistDirfiles] = await Promise.all([
+        (0, utils_2.getProductionDistDirFiles)(sourceDir, distDir),
+        (0, fs_extra_1.mkdirp)((0, path_1.join)(destDir, distDir)),
+    ]);
+    await Promise.all(productionDistDirfiles.map((file) => (0, fs_extra_1.copy)(file, file.replace(sourceDir, destDir), { recursive: true })));
     return { packageJson, frameworksEntry: "next.js", dotEnv };
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
@@ -422,7 +431,8 @@ async function getConfig(dir) {
     var _a;
     var _b;
     let config = {};
-    if ((0, fs_1.existsSync)((0, path_1.join)(dir, "next.config.js"))) {
+    const configFile = await (0, utils_2.whichNextConfigFile)(dir);
+    if (configFile) {
         const version = (0, utils_2.getNextVersion)(dir);
         if (!version)
             throw new Error("Unable to find the next dep, try NPM installing?");
@@ -435,10 +445,10 @@ async function getConfig(dir) {
         }
         else {
             try {
-                config = await (_a = (0, url_1.pathToFileURL)((0, path_1.join)(dir, "next.config.js")).toString(), Promise.resolve().then(() => require(_a)));
+                config = await (_a = (0, url_1.pathToFileURL)((0, path_1.join)(dir, configFile)).toString(), Promise.resolve().then(() => require(_a)));
             }
             catch (e) {
-                throw new Error("Unable to load next.config.js.");
+                throw new Error(`Unable to load ${configFile}.`);
             }
         }
     }

package/lib/frameworks/next/utils.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoutesWithServerAction = exports.hasStaticAppNotFoundComponent = exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
+exports.whichNextConfigFile = exports.getProductionDistDirFiles = exports.getRoutesWithServerAction = exports.hasStaticAppNotFoundComponent = exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
+const glob = require("glob");
 const semver_1 = require("semver");
 const utils_1 = require("../utils");
 const constants_1 = require("./constants");
 const fsutils_1 = require("../../fsutils");
+const utils_2 = require("../../utils");
 exports.I18N_SOURCE = /\/:nextInternalLocale(\([^\)]+\))?/;
 function cleanEscapedChars(path) {
     return path.replace(/\\([(){}:+?*])/g, (a, b) => b);
@@ -101,10 +103,15 @@ async function isUsingImageOptimization(projectDir, distDir) {
 }
 exports.isUsingImageOptimization = isUsingImageOptimization;
 async function isUsingNextImageInAppDirectory(projectDir, nextDir) {
+    const nextImagePath = ["node_modules", "next", "dist", "client", "image"];
+    const nextImageString = utils_2.IS_WINDOWS
+        ?
+            nextImagePath.join(path_1.sep + path_1.sep)
+        : (0, path_1.join)(...nextImagePath);
     const files = (0, glob_1.sync)((0, path_1.join)(projectDir, nextDir, "server", "**", "*client-reference-manifest.js"));
     for (const filepath of files) {
-        const fileContents = await (0, promises_1.readFile)(filepath);
-        if (fileContents.includes("node_modules/next/dist/client/image")) {
+        const fileContents = await (0, promises_1.readFile)(filepath, "utf-8");
+        if (fileContents.includes(nextImageString)) {
             return true;
         }
     }
@@ -218,3 +225,25 @@ function getRoutesWithServerAction(serverReferenceManifest, appPathRoutesManifes
     return Array.from(routesWithServerAction);
 }
 exports.getRoutesWithServerAction = getRoutesWithServerAction;
+async function getProductionDistDirFiles(sourceDir, distDir) {
+    const productionDistDirFiles = await new Promise((resolve, reject) => glob("**", {
+        ignore: [(0, path_1.join)("cache", "webpack", "*-development", "**"), (0, path_1.join)("cache", "eslint", "**")],
+        cwd: (0, path_1.join)(sourceDir, distDir),
+        nodir: true,
+        absolute: true,
+    }, (err, matches) => {
+        if (err)
+            reject(err);
+        resolve(matches);
+    }));
+    return productionDistDirFiles;
+}
+exports.getProductionDistDirFiles = getProductionDistDirFiles;
+async function whichNextConfigFile(dir) {
+    for (const file of constants_1.CONFIG_FILES) {
+        if (await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, file)))
+            return file;
+    }
+    return null;
+}
+exports.whichNextConfigFile = whichNextConfigFile;

package/lib/functional.js

@@ -52,8 +52,8 @@ const zipIn = (other) => (elem, ndx) => {
     return [elem, other[ndx]];
 };
 exports.zipIn = zipIn;
-function assertExhaustive(val) {
-    throw new Error(`Never has a value (${val}).`);
+function assertExhaustive(val, message) {
+    throw new Error(message || `Never has a value (${val}).`);
 }
 exports.assertExhaustive = assertExhaustive;
 function partition(arr, predicate) {

package/lib/functions/events/v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = exports.FIRESTORE_EVENT_REGEX = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.finalized",
@@ -22,4 +22,10 @@ exports.FIRESTORE_EVENTS = [
     "google.cloud.firestore.document.v1.created",
     "google.cloud.firestore.document.v1.updated",
     "google.cloud.firestore.document.v1.deleted",
+    "google.cloud.firestore.document.v1.written.withAuthContext",
+    "google.cloud.firestore.document.v1.created.withAuthContext",
+    "google.cloud.firestore.document.v1.updated.withAuthContext",
+    "google.cloud.firestore.document.v1.deleted.withAuthContext",
 ];
+exports.FIRESTORE_EVENT_REGEX = /^google\.cloud\.firestore\.document\.v1\.[^\.]*$/;
+exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = /^google\.cloud\.firestore\.document\.v1\..*\.withAuthContext$/;

package/lib/functions/secrets.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.versionInUse = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.ensureApi = exports.labels = exports.isFirebaseManaged = void 0;
+exports.describeSecret = exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.versionInUse = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = void 0;
 const utils = require("../utils");
 const poller = require("../operation-poller");
 const gcfV1 = require("../gcp/cloudfunctions");
 const gcfV2 = require("../gcp/cloudfunctionsv2");
-const ensureApiEnabled = require("../ensureApiEnabled");
 const api_1 = require("../api");
 const secretManager_1 = require("../gcp/secretManager");
 const error_1 = require("../error");
@@ -14,8 +13,10 @@ const prompt_1 = require("../prompt");
 const env_1 = require("./env");
 const logger_1 = require("../logger");
 const functional_1 = require("../functional");
+const secretManager_2 = require("../gcp/secretManager");
+const secretManager_3 = require("../gcp/secretManager");
 const projectUtils_1 = require("../projectUtils");
-const FIREBASE_MANAGED = "firebase-managed";
+const Table = require("cli-table");
 const gcfV1PollerOptions = {
     apiOrigin: (0, api_1.functionsOrigin)(),
     apiVersion: "v1",
@@ -28,25 +29,12 @@ const gcfV2PollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-function isFirebaseManaged(secret) {
-    return Object.keys(secret.labels || []).includes(FIREBASE_MANAGED);
-}
-exports.isFirebaseManaged = isFirebaseManaged;
-function labels() {
-    return { [FIREBASE_MANAGED]: "true" };
-}
-exports.labels = labels;
 function toUpperSnakeCase(key) {
     return key
         .replace(/[.-]/g, "_")
         .replace(/([a-z])([A-Z])/g, "$1_$2")
         .toUpperCase();
 }
-function ensureApi(options) {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    return ensureApiEnabled.ensure(projectId, (0, api_1.secretManagerOrigin)(), "secretmanager", true);
-}
-exports.ensureApi = ensureApi;
 async function ensureValidKey(key, options) {
     const transformedKey = toUpperSnakeCase(key);
     if (transformedKey !== key) {
@@ -76,18 +64,34 @@ exports.ensureValidKey = ensureValidKey;
 async function ensureSecret(projectId, name, options) {
     try {
         const secret = await (0, secretManager_1.getSecret)(projectId, name);
-        if (!isFirebaseManaged(secret)) {
+        if ((0, secretManager_1.isAppHostingManaged)(secret)) {
+            (0, utils_1.logWarning)("Your secret is managed by Firebase App Hosting. Continuing will disable automatic deletion of old versions.");
+            const stopTracking = await (0, prompt_1.promptOnce)({
+                name: "doNotTrack",
+                type: "confirm",
+                default: false,
+                message: "Do you wish to continue?",
+            }, options);
+            if (stopTracking) {
+                delete secret.labels[secretManager_2.FIREBASE_MANAGED];
+                await (0, secretManager_1.patchSecret)(secret.projectId, secret.name, secret.labels);
+            }
+            else {
+                throw new Error("A secret cannot be managed by both Firebase App Hosting and Cloud Functions for Firebase");
+            }
+        }
+        else if (!(0, secretManager_2.isFunctionsManaged)(secret)) {
             if (!options.force) {
-                (0, utils_1.logWarning)("Your secret is not managed by Firebase. " +
+                (0, utils_1.logWarning)("Your secret is not managed by Cloud Functions for Firebase. " +
                     "Firebase managed secrets are automatically pruned to reduce your monthly cost for using Secret Manager. ");
                 const confirm = await (0, prompt_1.promptOnce)({
                     name: "updateLabels",
                     type: "confirm",
                     default: true,
-                    message: `Would you like to have your secret ${secret.name} managed by Firebase?`,
+                    message: `Would you like to have your secret ${secret.name} managed by Cloud Functions for Firebase?`,
                 }, options);
                 if (confirm) {
-                    return (0, secretManager_1.patchSecret)(projectId, secret.name, Object.assign(Object.assign({}, secret.labels), labels()));
+                    return (0, secretManager_1.patchSecret)(projectId, secret.name, Object.assign(Object.assign({}, secret.labels), (0, secretManager_3.labels)()));
                 }
             }
         }
@@ -98,7 +102,7 @@ async function ensureSecret(projectId, name, options) {
             throw err;
         }
     }
-    return await (0, secretManager_1.createSecret)(projectId, name, labels());
+    return await (0, secretManager_1.createSecret)(projectId, name, (0, secretManager_3.labels)());
 }
 exports.ensureSecret = ensureSecret;
 function of(endpoints) {
@@ -139,7 +143,7 @@ async function pruneSecrets(projectInfo, endpoints) {
     const { projectId, projectNumber } = projectInfo;
     const pruneKey = (name, version) => `${name}@${version}`;
     const prunedSecrets = new Set();
-    const haveSecrets = await (0, secretManager_1.listSecrets)(projectId, `labels.${FIREBASE_MANAGED}=true`);
+    const haveSecrets = await (0, secretManager_1.listSecrets)(projectId, `labels.${secretManager_2.FIREBASE_MANAGED}=true`);
     for (const secret of haveSecrets) {
         const versions = await (0, secretManager_1.listSecretVersions)(projectId, secret.name, `NOT state: DESTROYED`);
         for (const version of versions) {
@@ -237,3 +241,17 @@ async function updateEndpointSecret(projectInfo, secretVersion, endpoint) {
     }
 }
 exports.updateEndpointSecret = updateEndpointSecret;
+async function describeSecret(key, options) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const versions = await (0, secretManager_1.listSecretVersions)(projectId, key);
+    const table = new Table({
+        head: ["Version", "State"],
+        style: { head: ["yellow"] },
+    });
+    for (const version of versions) {
+        table.push([version.versionId, version.state]);
+    }
+    logger_1.logger.info(table.toString());
+    return { secrets: versions };
+}
+exports.describeSecret = describeSecret;

package/lib/gcp/apphosting.js

@@ -31,9 +31,22 @@ async function getBackend(projectId, location, backendId) {
 }
 exports.getBackend = getBackend;
 async function listBackends(projectId, location) {
+    var _a;
     const name = `projects/${projectId}/locations/${location}/backends`;
-    const res = await exports.client.get(name);
-    return res.body;
+    let pageToken;
+    const res = {
+        backends: [],
+        unreachable: [],
+    };
+    do {
+        const queryParams = pageToken ? { pageToken } : {};
+        const int = await exports.client.get(name, { queryParams });
+        res.backends.push(...(int.body.backends || []));
+        (_a = res.unreachable) === null || _a === void 0 ? void 0 : _a.push(...(int.body.unreachable || []));
+        pageToken = int.body.nextPageToken;
+    } while (pageToken);
+    res.unreachable = [...new Set(res.unreachable)];
+    return res;
 }
 exports.listBackends = listBackends;
 async function deleteBackend(projectId, location, backendId) {

package/lib/gcp/cloudbuild.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceAgentEmail = exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.listConnections = exports.getConnection = exports.createConnection = void 0;
+exports.getDefaultServiceAgent = exports.getDefaultServiceAccount = exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.listConnections = exports.getConnection = exports.createConnection = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const PAGE_SIZE_MAX = 100;
@@ -74,7 +74,11 @@ async function deleteRepository(projectId, location, connectionId, repositoryId)
     return res.body;
 }
 exports.deleteRepository = deleteRepository;
-function serviceAgentEmail(projectNumber) {
+function getDefaultServiceAccount(projectNumber) {
+    return `${projectNumber}@cloudbuild.gserviceaccount.com`;
+}
+exports.getDefaultServiceAccount = getDefaultServiceAccount;
+function getDefaultServiceAgent(projectNumber) {
     return `service-${projectNumber}@gcp-sa-cloudbuild.iam.gserviceaccount.com`;
 }
-exports.serviceAgentEmail = serviceAgentEmail;
+exports.getDefaultServiceAgent = getDefaultServiceAgent;

package/lib/gcp/cloudfunctions.js

@@ -7,7 +7,7 @@ const logger_1 = require("../logger");
 const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
 const proto = require("./proto");
-const runtimes = require("../deploy/functions/runtimes");
+const supported = require("../deploy/functions/runtimes/supported");
 const projectConfig = require("../functions/projectConfig");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
@@ -241,8 +241,8 @@ function endpointFromFunction(gcfFunction) {
         uri = gcfFunction.httpsTrigger.url;
         securityLevel = gcfFunction.httpsTrigger.securityLevel;
     }
-    if (!runtimes.isValidRuntime(gcfFunction.runtime)) {
-        logger_1.logger.debug("GCFv1 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
+    if (!supported.isRuntime(gcfFunction.runtime)) {
+        logger_1.logger.debug("GCF 1st gen function has unsupported runtime:", JSON.stringify(gcfFunction, null, 2));
     }
     const endpoint = Object.assign(Object.assign({ platform: "gcfv1", id,
         project,
@@ -273,9 +273,9 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
-    if (!runtimes.isValidRuntime(endpoint.runtime)) {
+    if (!supported.isRuntime(endpoint.runtime)) {
         throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
-            " This should never happen");
+            " This should never happen", { exit: 1 });
     }
     const gcfFunction = {
         name: backend.functionName(endpoint),

package/lib/gcp/cloudfunctionsv2.js

@@ -7,7 +7,7 @@ const api_1 = require("../api");
 const logger_1 = require("../logger");
 const v2_1 = require("../functions/events/v2");
 const backend = require("../deploy/functions/backend");
-const runtimes = require("../deploy/functions/runtimes");
+const supported = require("../deploy/functions/runtimes/supported");
 const proto = require("./proto");
 const utils = require("../utils");
 const projectConfig = require("../functions/projectConfig");
@@ -175,7 +175,7 @@ function functionFromEndpoint(endpoint) {
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
-    if (!runtimes.isValidRuntime(endpoint.runtime)) {
+    if (!supported.isRuntime(endpoint.runtime)) {
         throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
             " This should never happen");
     }
@@ -337,7 +337,7 @@ function endpointFromFunction(gcfFunction) {
     else {
         trigger = { httpsTrigger: {} };
     }
-    if (!runtimes.isValidRuntime(gcfFunction.buildConfig.runtime)) {
+    if (!supported.isRuntime(gcfFunction.buildConfig.runtime)) {
         logger_1.logger.debug("GCFv2 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
     }
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,

package/lib/gcp/cloudscheduler.js

@@ -8,7 +8,7 @@ const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
-const checkIam_1 = require("../deploy/functions/checkIam");
+const gce = require("../gcp/computeEngine");
 const functional_1 = require("../functional");
 const VERSION = "v1";
 const DEFAULT_TIME_ZONE_V1 = "America/Los_Angeles";
@@ -130,7 +130,7 @@ function jobFromEndpoint(endpoint, location, projectNumber) {
             uri: endpoint.uri,
             httpMethod: "POST",
             oidcToken: {
-                serviceAccountEmail: (_a = endpoint.serviceAccount) !== null && _a !== void 0 ? _a : (0, checkIam_1.getDefaultComputeServiceAgent)(projectNumber),
+                serviceAccountEmail: (_a = endpoint.serviceAccount) !== null && _a !== void 0 ? _a : gce.getDefaultServiceAccount(projectNumber),
             },
         };
     }

package/lib/gcp/computeEngine.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultServiceAccount = void 0;
+function getDefaultServiceAccount(projectNumber) {
+    return `${projectNumber}-compute@developer.gserviceaccount.com`;
+}
+exports.getDefaultServiceAccount = getDefaultServiceAccount;

package/lib/gcp/devConnect.js

@@ -1,24 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.createConnection = exports.client = void 0;
+exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const serviceusage_1 = require("./serviceusage");
 const PAGE_SIZE_MAX = 1000;
+const LOCATION_OVERRIDE = process.env.FIREBASE_DEVELOPERCONNECT_LOCATION_OVERRIDE;
 exports.client = new apiv2_1.Client({
     urlPrefix: (0, api_1.developerConnectOrigin)(),
     auth: true,
     apiVersion: "v1",
 });
-async function createConnection(projectId, location, connectionId, githubConfig) {
+async function createConnection(projectId, location, connectionId, githubConfig = {}) {
     const config = Object.assign(Object.assign({}, githubConfig), { githubApp: "FIREBASE" });
-    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections`, {
+    const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections`, {
         githubConfig: config,
     }, { queryParams: { connectionId } });
     return res.body;
 }
 exports.createConnection = createConnection;
+async function deleteConnection(projectId, location, connectionId) {
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}`;
+    const res = await exports.client.delete(name, { queryParams: { force: "true" } });
+    return res.body;
+}
+exports.deleteConnection = deleteConnection;
 async function getConnection(projectId, location, connectionId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}`;
     const res = await exports.client.get(name);
     return res.body;
 }
@@ -26,7 +34,7 @@ exports.getConnection = getConnection;
 async function listAllConnections(projectId, location) {
     const conns = [];
     const getNextPage = async (pageToken = "") => {
-        const res = await exports.client.get(`/projects/${projectId}/locations/${location}/connections`, {
+        const res = await exports.client.get(`/projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections`, {
             queryParams: {
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
@@ -44,17 +52,17 @@ async function listAllConnections(projectId, location) {
 }
 exports.listAllConnections = listAllConnections;
 async function listAllLinkableGitRepositories(projectId, location, connectionId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}:fetchLinkableRepositories`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}:fetchLinkableGitRepositories`;
     const repos = [];
     const getNextPage = async (pageToken = "") => {
         const res = await exports.client.get(name, {
             queryParams: {
-                PAGE_SIZE_MAX,
+                pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },
         });
-        if (Array.isArray(res.body.repositories)) {
-            repos.push(...res.body.repositories);
+        if (Array.isArray(res.body.linkableGitRepositories)) {
+            repos.push(...res.body.linkableGitRepositories);
         }
         if (res.body.nextPageToken) {
             await getNextPage(res.body.nextPageToken);
@@ -65,12 +73,12 @@ async function listAllLinkableGitRepositories(projectId, location, connectionId)
 }
 exports.listAllLinkableGitRepositories = listAllLinkableGitRepositories;
 async function createGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId, cloneUri) {
-    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
+    const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
     return res.body;
 }
 exports.createGitRepositoryLink = createGitRepositoryLink;
 async function getGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}`;
     const res = await exports.client.get(name);
     return res.body;
 }
@@ -79,3 +87,8 @@ function serviceAgentEmail(projectNumber) {
     return `service-${projectNumber}@${(0, api_1.developerConnectP4SAOrigin)()}`;
 }
 exports.serviceAgentEmail = serviceAgentEmail;
+async function generateP4SA(projectNumber) {
+    const devConnectOrigin = (0, api_1.developerConnectOrigin)();
+    await (0, serviceusage_1.generateServiceIdentityAndPoll)(projectNumber, new URL(devConnectOrigin).hostname, "apphosting");
+}
+exports.generateP4SA = generateP4SA;

package/lib/gcp/iam.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.listServiceAccountKeys = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
+exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.listServiceAccountKeys = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = exports.getDefaultComputeEngineServiceAgent = exports.getDefaultCloudBuildServiceAgent = void 0;
 const api_1 = require("../api");
 const logger_1 = require("../logger");
 const apiv2_1 = require("../apiv2");
 const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.iamOrigin)(), apiVersion: "v1" });
+function getDefaultCloudBuildServiceAgent(projectNumber) {
+    return `${projectNumber}@cloudbuild.gserviceaccount.com`;
+}
+exports.getDefaultCloudBuildServiceAgent = getDefaultCloudBuildServiceAgent;
+function getDefaultComputeEngineServiceAgent(projectNumber) {
+    return `${projectNumber}-compute@developer.gserviceaccount.com`;
+}
+exports.getDefaultComputeEngineServiceAgent = getDefaultComputeEngineServiceAgent;
 async function createServiceAccount(projectId, accountId, description, displayName) {
     const response = await apiClient.post(`/projects/${projectId}/serviceAccounts`, {
         accountId,