firebase-tools 11.16.0 → 11.17.0

package/lib/deploy/extensions/planner.js

@@ -122,12 +122,13 @@ async function want(args) {
 exports.want = want;
 async function resolveVersion(ref) {
     const extensionRef = refs.toExtensionRef(ref);
-    const versions = await extensionsApi.listExtensionVersions(extensionRef);
+    const versions = await extensionsApi.listExtensionVersions(extensionRef, undefined, true);
     if (versions.length === 0) {
         throw new error_1.FirebaseError(`No versions found for ${extensionRef}`);
     }
     if (!ref.version || ref.version === "latest") {
         return versions
+            .filter((ev) => ev.spec.version !== undefined)
             .map((ev) => ev.spec.version)
             .sort(semver.compare)
             .pop();

package/lib/deploy/functions/build.js

@@ -160,6 +160,9 @@ function toBackend(build, paramValues) {
     const bkEndpoints = [];
     for (const endpointId of Object.keys(build.endpoints)) {
         const bdEndpoint = build.endpoints[endpointId];
+        if (r.resolveBoolean(bdEndpoint.omit || false)) {
+            continue;
+        }
         let regions = bdEndpoint.region;
         if (typeof regions === "undefined") {
             regions = [api.functionsDefaultRegion];

package/lib/deploy/functions/deploy.js

@@ -80,7 +80,7 @@ async function deploy(context, options, payload) {
     await (0, checkIam_1.checkHttpIam)(context, options, payload);
     const uploads = [];
     for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
-        if (shouldUploadBeSkipped(wantBackend, haveBackend)) {
+        if (shouldUploadBeSkipped(context, wantBackend, haveBackend)) {
             continue;
         }
         uploads.push(uploadCodebase(context, codebase, wantBackend));
@@ -88,7 +88,10 @@ async function deploy(context, options, payload) {
     await Promise.all(uploads);
 }
 exports.deploy = deploy;
-function shouldUploadBeSkipped(wantBackend, haveBackend) {
+function shouldUploadBeSkipped(context, wantBackend, haveBackend) {
+    if (context.filters && context.filters.length > 0) {
+        return false;
+    }
     const wantEndpoints = backend.allEndpoints(wantBackend);
     const haveEndpoints = backend.allEndpoints(haveBackend);
     if (wantEndpoints.length !== haveEndpoints.length) {

package/lib/deploy/functions/release/fabricator.js

@@ -167,9 +167,9 @@ class Fabricator {
         if (apiFunction.httpsTrigger) {
             apiFunction.httpsTrigger.securityLevel = "SECURE_ALWAYS";
         }
-        apiFunction.sourceToken = await scraper.tokenPromise();
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.createFunction(apiFunction);
             return poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         })
@@ -301,9 +301,9 @@ class Fabricator {
             throw new Error("Precondition failed");
         }
         const apiFunction = gcf.functionFromEndpoint(endpoint, sourceUrl);
-        apiFunction.sourceToken = await scraper.tokenPromise();
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.updateFunction(apiFunction);
             return await poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         })

package/lib/deploy/functions/release/sourceTokenScraper.js

@@ -1,18 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceTokenScraper = void 0;
+const error_1 = require("../../../error");
+const functional_1 = require("../../../functional");
 const logger_1 = require("../../../logger");
 class SourceTokenScraper {
-    constructor() {
-        this.firstCall = true;
+    constructor(validDurationMs = 1500000) {
+        this.tokenValidDurationMs = validDurationMs;
         this.promise = new Promise((resolve) => (this.resolve = resolve));
+        this.fetchState = "NONE";
     }
-    tokenPromise() {
-        if (this.firstCall) {
-            this.firstCall = false;
-            return Promise.resolve(undefined);
+    async getToken() {
+        if (this.fetchState === "NONE") {
+            this.fetchState = "FETCHING";
+            return undefined;
         }
-        return this.promise;
+        else if (this.fetchState === "FETCHING") {
+            return this.promise;
+        }
+        else if (this.fetchState === "VALID") {
+            if (this.isTokenExpired()) {
+                this.fetchState = "FETCHING";
+                this.promise = new Promise((resolve) => (this.resolve = resolve));
+                return undefined;
+            }
+            return this.promise;
+        }
+        else {
+            (0, functional_1.assertExhaustive)(this.fetchState);
+        }
+    }
+    isTokenExpired() {
+        if (this.expiry === undefined) {
+            throw new error_1.FirebaseError("Your deployment is checking the expiration of a source token that has not yet been polled. " +
+                "Hitting this case should never happen and should be considered a bug. " +
+                "Please file an issue at https://github.com/firebase/firebase-tools/issues " +
+                "and try deploying your functions again.");
+        }
+        return Date.now() >= this.expiry;
     }
     get poller() {
         return (op) => {
@@ -21,6 +46,8 @@ class SourceTokenScraper {
                 const [, , , region] = ((_c = (_b = op.metadata) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.split("/")) || [];
                 logger_1.logger.debug(`Got source token ${(_d = op.metadata) === null || _d === void 0 ? void 0 : _d.sourceToken} for region ${region}`);
                 this.resolve((_e = op.metadata) === null || _e === void 0 ? void 0 : _e.sourceToken);
+                this.fetchState = "VALID";
+                this.expiry = Date.now() + this.tokenValidDurationMs;
             }
         };
     }

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -51,6 +51,7 @@ function assertBuildEndpoint(ep, id) {
         region: "array",
         platform: (platform) => build.AllFunctionsPlatforms.includes(platform),
         entryPoint: "string",
+        omit: "Field<boolean>?",
         availableMemoryMb: (mem) => mem === null || isCEL(mem) || build.isValidMemoryOption(mem),
         maxInstances: "Field<number>?",
         minInstances: "Field<number>?",
@@ -259,7 +260,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     if ("serviceAccountEmail" in ep) {
         parsed.serviceAccount = ep.serviceAccountEmail;
     }
-    (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
+    (0, proto_1.copyIfPresent)(parsed, ep, "omit", "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
     (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
         if (!senvs) {
             return null;

package/lib/deploy/lifecycleHooks.js

@@ -40,12 +40,13 @@ function runCommand(command, childOptions) {
     });
 }
 function getChildEnvironment(target, overallOptions, config) {
+    var _a;
     const projectId = needProjectId(overallOptions);
     const projectDir = overallOptions.projectRoot;
     let resourceDir;
     switch (target) {
         case "hosting":
-            resourceDir = overallOptions.config.path(config.public);
+            resourceDir = overallOptions.config.path((_a = config.public) !== null && _a !== void 0 ? _a : config.source);
             break;
         case "functions":
             resourceDir = overallOptions.config.path(config.source);