Merge pull request watson-developer-cloud#232 from watson-developer-cloud/config_path

Config path

Author: germanattanasio

services/retrieve_and_rank/v1.js

@@ -304,30 +304,35 @@ RetrieveAndRank.prototype.listConfigs = function(params, callback) {
 RetrieveAndRank.prototype.uploadConfig = function(params, callback) {
   params = params || {};
 
-  if (!params.config_zip_path) {
+  if (!params || !params.config_zip_path) {
     callback(new Error('Missing required parameters: config_zip_path'));
     return;
-  } else if (!typeof(params.config_zip_path) === 'string') {
-    callback(new Error('Parameters config_zip_path is not a string'));
+  }
+  var configFile = null;
+  if (typeof params.config_zip_path === 'string') {
+    configFile = fs.createReadStream(params.config_zip_path);
+  } else if (isStream(params.config_zip_path)) {
+    configFile = params.config_zip_path;
+  } else {
+    callback(new Error('config_zip_path needs to be a String or Stream'));
     return;
   }
-  var configFile = fs.readFileSync(params.config_zip_path);
 
   var parameters = {
     options: {
       url: '/v1/solr_clusters/{cluster_id}/config/{config_name}',
       method: 'POST',
-      path: params,
-      body: configFile,
-      headers: {
-        'content-type': 'application/zip'
-      }
+      path: params
     },
     requiredParams: ['cluster_id', 'config_name'],
     defaultOptions: this._options
   };
 
-  return requestFactory(parameters, callback);
+  return configFile.on('response', function(response) {
+    // Replace content-type
+    response.headers['content-type'] = 'application/zip';
+  }).pipe(requestFactory(parameters, callback));
+
 };
 
 /**

test/test.retrieve_and_rank.v1.js

@@ -98,14 +98,14 @@ describe('retrieve_and_rank', function() {
   it('can list Solr clusters', function(done) {
     search.listClusters({}, function(error, data) {
       assert.equal(data, listResponse);
-      done();
+      done(error);
     });
   });
 
   it('can create a Solr cluster without specified config', function(done) {
     search.createCluster({}, function(error, data) {
       assert.equal(data, createResponse);
-      done();
+      done(error);
     });
   });
 
@@ -171,7 +171,7 @@ describe('retrieve_and_rank', function() {
       },
       function(error, data) {
         assert.equal(data, configUploadResponse);
-        done();
+        done(error);
       });
   });
 
@@ -210,7 +210,7 @@ describe('retrieve_and_rank', function() {
       config_name: configName
     }, function(error, data) {
       assert.equal(data, configGetResponse);
-      done();
+      done(error);
     });
   });
 
@@ -230,7 +230,7 @@ describe('retrieve_and_rank', function() {
       config_name: configName
     }, function(error, data) {
       assert.equal(data, configDeleteResponse);
-      done();
+      done(error);
     });
   });
 
@@ -252,7 +252,7 @@ describe('retrieve_and_rank', function() {
       },
       function(error, data) {
         assert.equal(data, collectionCreateResponse);
-        done();
+        done(error);
       });
   });
 
@@ -278,7 +278,7 @@ describe('retrieve_and_rank', function() {
       cluster_id: clusterId
     }, function(error, data) {
       assert.equal(data, collectionListResponse);
-      done();
+      done(error);
     });
   });
 
@@ -292,7 +292,7 @@ describe('retrieve_and_rank', function() {
       collection_name: collectionName
     }, function(error, data) {
       assert.equal(data, collectionDeleteResponse);
-      done();
+      done(error);
     });
   });
 
@@ -365,28 +365,28 @@ describe('retrieve_and_rank', function() {
     }, function(error, data) {
       assert.equal(data, createRankerResponse);
       assert.equal(req.method, 'POST');
-      done();
+      done(error);
     });
   });
   it('should generate a valid payload when getting the rankers', function(done) {
     var req = search.listRankers(null, function(error, data) {
       assert.equal(data, getRankerResponse);
       assert.equal(req.method, 'GET');
-      done();
+      done(error);
     });
   });
   it('should generate a valid payload when getting the ranker status', function(done) {
     var req = search.rankerStatus({ranker_id : rankerId}, function(error, data) {
       assert.equal(data, getRankerResponse);
       assert.equal(req.method, 'GET');
-      done();
+      done(error);
     });
   });
   it('should generate a valid payload when deleting a ranker', function(done) {
     var req = search.deleteRanker({ranker_id : rankerId}, function(error, data) {
       assert.equal(data, deleteRankerResponse);
       assert.equal(req.method, 'DELETE');
-      done();
+      done(error);
     });
   });