Merge branch 'master' of github.com:FirebasePrivate/firebase-tools

Author: mbleigh

lib/deploy/functions/release.js

@@ -23,7 +23,7 @@ module.exports = function(context, options, payload) {
 
   function _fetchTriggerUrls(ops) {
     return gcp.cloudfunctions.list(projectId, GCP_REGION).then(function(functions) {
-      var httpFunctions = _.chain(functions).filter({ gcsUrl: sourceUrl}).filter('httpsTrigger').value();
+      var httpFunctions = _.chain(functions).filter({ sourceArchiveUrl: sourceUrl}).filter('httpsTrigger').value();
       _.forEach(httpFunctions, function(httpFunc) {
         _.chain(ops).find({ func: httpFunc.name }).assign({ triggerUrl: httpFunc.httpsTrigger.url}).value();
       });
@@ -173,6 +173,28 @@ module.exports = function(context, options, payload) {
         var functionInfo = _.find(functionsInfo, {'name': functionName});
         return _prepFunctionOp(functionInfo, functionName).then(function(functionTrigger) {
           utils.logBullet(chalk.bold.cyan('functions: ') + 'updating function ' + chalk.bold(functionName) + '...');
+          var existingFunction = _.find(existingFunctions, function(func) {
+            return func.name.match(new RegExp('/' + functionName + '$'));
+          });
+          var existingTriggerType = _.get(existingFunction, 'eventTrigger.eventType');
+          var newTriggerType = _.get(functionTrigger, 'eventTrigger.eventType');
+          var isNowDBTrigger = newTriggerType === 'providers/firebase.database/eventTypes/data.write';
+          // Firebase Database triggers used to be an odd prototype that was really a pubsub trigger. GCF won't allow
+          // us to change the trigger type of an existing trigger so we have to delete functions that were based on
+          // the old prototype and create them as real database triggers.
+          if (isNowDBTrigger && newTriggerType !== existingTriggerType) {
+            return gcp.cloudfunctions.delete(projectId, GCP_REGION, functionName)
+              .then(function(call) {
+                return _pollOperations([call]);
+              }).then(function() {
+                return gcp.cloudfunctions.create(
+                  projectId,
+                  GCP_REGION,
+                  functionName,
+                  functionInfo.entryPoint,
+                  functionTrigger, sourceUrl);
+              });
+          }
           return gcp.cloudfunctions.update(projectId, GCP_REGION, functionName, functionInfo.entryPoint, functionTrigger, sourceUrl);
         });
       }).value();