renamed getError_ to getStatus_

callmehiphop · callmehiphop · commit eeb06e76ed6e · 2016-07-15T14:36:43.000-04:00
diff --git a/lib/common/grpc-service.js b/lib/common/grpc-service.js
@@ -244,7 +244,7 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
 
       service[protoOpts.method](reqOpts, grpcOpts, function(err, resp) {
         if (err) {
-          respError = GrpcService.getError_(err);
+          respError = GrpcService.getStatus_(err);
 
           if (respError) {
             onResponse(null, respError);
@@ -326,7 +326,7 @@ GrpcService.prototype.requestStream = function(protoOpts, reqOpts) {
     request: function() {
       return service[protoOpts.method](reqOpts, grpcOpts)
         .on('status', function(status) {
-          var grcpStatus = GrpcService.getError_(status);
+          var grcpStatus = GrpcService.getStatus_(status);
 
           this.emit('response', grcpStatus || status);
         });
@@ -335,7 +335,7 @@ GrpcService.prototype.requestStream = function(protoOpts, reqOpts) {
 
   return retryRequest(null, retryOpts)
     .on('error', function(err) {
-      var grpcError = GrpcService.getError_(err);
+      var grpcError = GrpcService.getStatus_(err);
 
       stream.destroy(grpcError || err);
     })
@@ -447,22 +447,22 @@ GrpcService.createDeadline_ = function(timeout) {
 };
 
 /**
- * Checks for a grpc error code and extends the Error object with additional
+ * Checks for a grpc status code and extends the status object with additional
  * information.
  *
  * @private
  *
- * @param {error} err - The original request error.
- * @return {error|null}
+ * @param {error|object} status - The original status object.
+ * @return {error|object|null}
  */
-GrpcService.getError_ = function(err) {
-  if (err && GRPC_ERROR_CODE_TO_HTTP[err.code]) {
-    var defaultErrorDetails = GRPC_ERROR_CODE_TO_HTTP[err.code];
-    var errorObj = is.error(err) ? new Error() : {};
-
-    return extend(true, errorObj, err, {
-      code: defaultErrorDetails.code,
-      message: err.message || defaultErrorDetails.message
+GrpcService.getStatus_ = function(status) {
+  if (status && GRPC_ERROR_CODE_TO_HTTP[status.code]) {
+    var defaultStatusDetails = GRPC_ERROR_CODE_TO_HTTP[status.code];
+    var statusObj = is.error(status) ? new Error() : {};
+
+    return extend(true, statusObj, status, {
+      code: defaultStatusDetails.code,
+      message: status.message || defaultStatusDetails.message
     });
   }
   return null;
diff --git a/test/common/grpc-service.js b/test/common/grpc-service.js
@@ -1120,13 +1120,13 @@ describe('GrpcService', function() {
     });
   });
 
-  describe('getError_', function() {
-    it('should retrieve the HTTP error from the gRPC error map', function() {
+  describe('getStatus_', function() {
+    it('should retrieve the HTTP code from the gRPC error map', function() {
       var errorMap = GrpcService.GRPC_ERROR_CODE_TO_HTTP;
       var codes = Object.keys(errorMap);
 
       codes.forEach(function(code) {
-        var error = GrpcService.getError_({ code: code });
+        var error = GrpcService.getStatus_({ code: code });
 
         assert.notStrictEqual(error, errorMap[code]);
         assert.deepEqual(error, errorMap[code]);
@@ -1141,12 +1141,12 @@ describe('GrpcService', function() {
         message: errorMessage
       };
 
-      var error = GrpcService.getError_(err);
+      var error = GrpcService.getStatus_(err);
       assert.strictEqual(error.message, errorMessage);
     });
 
-    it('should return the original object for unknown errors', function() {
-      var error = GrpcService.getError_({ code: 9999 });
+    it('should return null for unknown errors', function() {
+      var error = GrpcService.getStatus_({ code: 9999 });
 
       assert.strictEqual(error, null);
     });
