Merge pull request #26 from scality/dev/ft/errors

(errors) Implement arsenal errors in RESTClient
scality · Mar 8, 2016 · e1e2a45 · e1e2a45
2 parents 3fe408f + 1d7fe86
commit e1e2a45
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/lib/RESTClient.js b/lib/RESTClient.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const errors = require('arsenal').errors;
 const assert = require('assert');
 const http = require('http');
 const querystring = require('querystring');
@@ -9,6 +10,19 @@ const Logger = require('werelogs');
 const shuffle = require('arsenal').shuffle;
 const conf = require('../config.json');
 
+function errorMap(mdError) {
+    const map = {
+        NoSuchBucket: 'NoSuchBucket',
+        BucketAlreadyExists: 'BucketAlreadyExists',
+        NoSuchKey: 'NoSuchKey',
+        DBNotFound: 'NoSuchBucket',
+        DBAlreadyExists: 'BucketAlreadyExists',
+        ObjNotFound: 'NoSuchKey',
+        NotImplemented: 'NotImplemented',
+    };
+    return map[mdError] ? map[mdError] : 'InternalError';
+}
+
 class RESTClient {
     /**
      * Constructor for a REST client to bucketd
@@ -196,9 +210,9 @@ class RESTClient {
                       `code=${code} ret=${ret}`);
             return callback(null, ret);
         }
-        const error = new Error(res.statusMessage);
+
+        const error = errors[errorMap(res.statusMessage)];
         error.isExpected = true;
-        error.code = code;
         log.debug(`direct request to endpoint returned an expected ` +
                   `error code=${res.statusCode} ret=${res.statusMessage}`);
         return callback(error, ret);

diff --git a/tests/unit/simple_tests.js b/tests/unit/simple_tests.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const errors = require('arsenal').errors;
 const assert = require('assert');
 const http = require('http');
 const RESTClient = require('../../index.js').RESTClient;
@@ -70,9 +71,8 @@ describe('Unit tests with mockup server', function tests() {
     it('should try to create an already existing bucket and fail', done => {
         client.createBucket(existBucket.name, reqUids, '{}', (err) => {
             if (err) {
-                const error = new Error('BucketAlreadyExists');
+                const error = errors.BucketAlreadyExists;
                 error.isExpected = true;
-                error.code = 409;
                 assert.deepStrictEqual(err, error);
                 return done();
             }
@@ -98,9 +98,8 @@ describe('Unit tests with mockup server', function tests() {
 
     it('should get Raft informations on an unexisting bucket', done => {
         client.getRaftInformation(nonExistBucket.name, reqUids, (err, data) => {
-            const error = new Error('NoSuchBucket');
+            const error = errors.NoSuchBucket;
             error.isExpected = true;
-            error.code = 404;
             assert.deepStrictEqual(err, error);
             return done();
             done(err);
@@ -110,9 +109,8 @@ describe('Unit tests with mockup server', function tests() {
     it('should fetch non-existing bucket, sending back an error', done => {
         client.getBucketAttributes(nonExistBucket.name, reqUids, (err) => {
             if (err) {
-                const error = new Error('NoSuchBucket');
+                const error = errors.NoSuchBucket;
                 error.isExpected = true;
-                error.code = 404;
                 assert.deepStrictEqual(err, error);
                 return done();
             }
@@ -127,9 +125,8 @@ describe('Unit tests with mockup server', function tests() {
     it('should fetch non-existing bucket, sending back an error', done => {
         client.deleteBucket(nonExistBucket.name, reqUids, err => {
             if (err) {
-                const error = new Error('NoSuchBucket');
+                const error = errors.NoSuchBucket;
                 error.isExpected = true;
-                error.code = 404;
                 assert.deepStrictEqual(err, error);
                 return done();
             }