address review comments

firebase · Nov 12, 2018 · 1b7bc67 · 1b7bc67
1 parent 589b62d
commit 1b7bc67
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/deploy/functions/release.js b/src/deploy/functions/release.js
@@ -367,7 +367,7 @@ module.exports = function(context, options, payload) {
         .filter({ state: "fulfilled" })
         .map("value")
         .value();
-      const numFailedDeployments = failedDeployments.length + failedCalls.length;
+      failedDeployments = failedCalls.map((error) => error.context.function);
 
       return _fetchTriggerUrls(projectId, successfulCalls, sourceUrl)
         .then(function() {
@@ -381,18 +381,16 @@ module.exports = function(context, options, payload) {
         })
         .then(() => {
           if (deployments.length > 0) {
-            track("Functions Deploy (Result)", "failure", numFailedDeployments);
+            track("Functions Deploy (Result)", "failure", failedDeployments.length);
             track(
               "Functions Deploy (Result)",
               "success",
-              deployments.length - numFailedDeployments
+              deployments.length - failedDeployments.length
             );
           }
-          if (numFailedDeployments > 0) {
+          if (failedDeployments.length > 0) {
             logger.info("\n\nFunctions deploy had errors with the following functions:");
-            const sortedFailedDeployments = failedDeployments
-              .concat(failedCalls.map((call) => call.context.function))
-              .sort();
+            const sortedFailedDeployments = failedDeployments.sort();
             for (let i = 0; i < sortedFailedDeployments.length; i++) {
               logger.info(`\t${sortedFailedDeployments[i]}`);
             }

diff --git a/src/gcp/cloudfunctions.js b/src/gcp/cloudfunctions.js
@@ -1,6 +1,7 @@
 "use strict";
 
 var api = require("../api");
+const FirebaseError = require("../error");
 var utils = require("../utils");
 var _ = require("lodash");
 var logger = require("../logger");
@@ -19,8 +20,12 @@ function _functionsOpLogReject(func, type, err) {
   } else {
     logger.info(err.message);
   }
-  err.context = { function: func };
-  return Promise.reject(err);
+  return Promise.reject(
+    new FirebaseError(`Failed to ${type} function ${func}`, {
+      original: err,
+      context: { function: func },
+    })
+  );
 }
 
 function _generateUploadUrl(projectId, location) {