Merge remote-tracking branch 'upstream/master' into add-ingress-setti…

…ngs-support-in-firebase-functions
firebase · joehan · Jan 12, 2021 · Dec 12, 2020 · Dec 27, 2020 · Jan 11, 2021
commit f97c40c6f064e7274220aa874912ca314e3477ec
diff --git a/src/deploy/functions/release.js b/src/deploy/functions/release.js
@@ -298,71 +298,45 @@ module.exports = function(context, options, payload) {
  var existingFunction = _.find(existingFunctions, {
  name: name,
  });
- var existingEventType = _.get(existingFunction, "eventTrigger.eventType");
- var migratingTrigger = false;
- if (
- eventType.match(/google.storage.object./) &&
- existingEventType === "providers/cloud.storage/eventTypes/object.change"
- ) {
- migratingTrigger = true;
- } else if (
- eventType === "google.pubsub.topic.publish" &&
- existingEventType === "providers/cloud.pubsub/eventTypes/topic.publish"
- ) {
- migratingTrigger = true;
- }
- if (migratingTrigger) {
- throw new FirebaseError(
- "Function " +
- clc.bold(functionName) +
- " was deployed using a legacy trigger type and cannot be updated without deleting " +
- "the previous function. Follow the instructions on " +
- clc.underline(
- "https://firebase.google.com/docs/functions/manage-functions#modify-trigger"
- ) +
- " for how to change the trigger without losing events.\n"
- );
- } else {
- var options = {
- projectId: projectId,
- region: region,
- functionName: functionName,
- trigger: functionTrigger,
- sourceUploadUrl: sourceUrl,
- labels: _.assign({}, deploymentTool.labels, functionInfo.labels),
- availableMemoryMb: functionInfo.availableMemoryMb,
- timeout: functionInfo.timeout,
- runtime: runtime,
- maxInstances: functionInfo.maxInstances,
- vpcConnector: functionInfo.vpcConnector,
- vpcConnectorEgressSettings: functionInfo.vpcConnectorEgressSettings,
- serviceAccountEmail: functionInfo.serviceAccountEmail,
- ingressSettings: functionInfo.ingressSettings,
- environmentVariables: _.assign(
- {},
- existingFunction.environmentVariables,
- defaultEnvVariables
- ),
- };
- utils.logBullet(
- clc.bold.cyan("functions: ") +
- "updating " +
- friendlyRuntimeName(runtime) +
- " function " +
- clc.bold(helper.getFunctionLabel(name)) +
- "..."
- );
- logger.debug("Trigger is: ", JSON.stringify(functionTrigger));
- _startTimer(name, "update");
-
- deployments.push({
- name: name,
- retryFunction: function() {
- return gcp.cloudfunctions.update(options);
- },
- trigger: functionTrigger,
- });
- }
+ var options = {
+ projectId: projectId,
+ region: region,
+ functionName: functionName,
+ trigger: functionTrigger,
+ sourceUploadUrl: sourceUrl,
+ labels: _.assign({}, deploymentTool.labels, functionInfo.labels),
+ availableMemoryMb: functionInfo.availableMemoryMb,
+ timeout: functionInfo.timeout,
+ runtime: runtime,
+ maxInstances: functionInfo.maxInstances,
+ vpcConnector: functionInfo.vpcConnector,
+ vpcConnectorEgressSettings: functionInfo.vpcConnectorEgressSettings,
+ serviceAccountEmail: functionInfo.serviceAccountEmail,
+ ingressSettings: functionInfo.ingressSettings,
+ environmentVariables: _.assign(
+ {},
+ existingFunction.environmentVariables,
+ defaultEnvVariables
+ ),
+ };
+ utils.logBullet(
+ clc.bold.cyan("functions: ") +
+ "updating " +
+ friendlyRuntimeName(runtime) +
+ " function " +
+ clc.bold(helper.getFunctionLabel(name)) +
+ "..."
+ );
+ logger.debug("Trigger is: ", JSON.stringify(functionTrigger));
+ _startTimer(name, "update");
+
+ deployments.push({
+ name: name,
+ retryFunction: function() {
+ return gcp.cloudfunctions.update(options);
+ },
+ trigger: functionTrigger,
+ });
  })
  .value();