Merge pull request #78 from gjs29/master

Allow user config when creating a Solr cluster

Author: germanattanasio

examples/retrieve_and_rank_lifecycle.v1.js

@@ -21,7 +21,7 @@ async.series([
   },
 
   function createCluster(done) {
-    retrieve.createCluster({}, function getId(err, res) {
+    retrieve.createCluster({cluster_name: 'example_cluster', cluster_size: '1'}, function getId(err, res) {
       if (err) {
         return console.log('Error creating Solr cluster: ' + JSON.stringify(err));
       }

services/retrieve_and_rank/v1.js

@@ -62,12 +62,22 @@ RetrieveAndRank.prototype.deleteClusters = function(params, callback) {
  * Creates a Solr cluster.
  *
  * @param params An Object representing the parameters for this service call.
- *   This request currently does not require any parameters.
+ *   Optional params
+ *     - cluster_name: name to use for identifying the cluster in responses
+ *     - cluster_size: size of the cluster to create
  *
  * @param callback The callback.
  */
 RetrieveAndRank.prototype.createCluster = function(params, callback) {
-  return sendRequest('POST', solrClustersPath(), this._options, callback);
+  // Avoid modifying the global options by making a deep copy
+  var createOptions = JSON.parse(JSON.stringify(this._options));
+  createOptions.body = JSON.stringify(params || {});
+  if (createOptions.headers === undefined) {
+    createOptions.headers = {};
+  }
+  createOptions.headers['Content-Type'] = 'application/json';
+
+  return sendRequest('POST', solrClustersPath(), createOptions, callback);
 };
 
 /**

services/search/v1.js

@@ -64,12 +64,22 @@ Search.prototype.deleteClusters = function(params, callback) {
  * Creates a Solr cluster.
  *
  * @param params An Object representing the parameters for this service call.
- *   This request currently does not require any parameters.
+ *   Optional params
+ *     - cluster_name: name to use for identifying the cluster in responses
+ *     - cluster_size: size of the cluster to create
  *
  * @param callback The callback.
  */
 Search.prototype.createCluster = function(params, callback) {
-  return sendRequest('POST', solrClustersPath(), this._options, callback);
+  // Avoid modifying the global options by making a deep copy
+  var createOptions = JSON.parse(JSON.stringify(this._options));
+  createOptions.body = JSON.stringify(params || {});
+  if (createOptions.headers === undefined) {
+    createOptions.headers = {};
+  }
+  createOptions.headers['Content-Type'] = 'application/json';
+
+  return sendRequest('POST', solrClustersPath(), createOptions, callback);
 };
 
 /**

test/test.retrieve_and_rank.v1.js

@@ -95,13 +95,27 @@ describe('retrieve_and_rank', function() {
     });
   });
 
-  it('can create a Solr cluster', function(done) {
+  it('can create a Solr cluster without specified config', function(done) {
     search.createCluster({}, function(error, data) {
       assert.equal(data, createResponse);
       done();
     });
   });
 
+  it('sets headers and body of request when creating a Solr cluster based on params', function(done) {
+    var createParams = {
+      cluster_size: '2',
+      cluster_name: 'the_cluster',
+      some_other_option: 'some_other_value'
+    };
+
+    var response = search.createCluster(createParams, function(error, data) {});
+
+    assert.equal(response.headers['Content-Type'], 'application/json');
+    assert.deepEqual(JSON.parse(response.body), createParams);
+    done();
+  });
+
   it('can poll a Solr cluster', function(done) {
     search.pollCluster({clusterId: clusterId}, function(error, data) {
       assert.equal(data, pollResponse);

test/test.search.v1.js

@@ -95,13 +95,27 @@ describe('search', function() {
     });
   });
 
-  it('can create a Solr cluster', function(done) {
+  it('can create a Solr cluster without specified config', function(done) {
     search.createCluster({}, function(error, data) {
       assert.equal(data, createResponse);
       done();
     });
   });
 
+  it('sets headers and body of request when creating a Solr cluster based on params', function(done) {
+    var createParams = {
+      cluster_size: '2',
+      cluster_name: 'the_cluster',
+      some_other_option: 'some_other_value'
+    };
+
+    var response = search.createCluster(createParams, function(error, data) {});
+
+    assert.equal(response.headers['Content-Type'], 'application/json');
+    assert.deepEqual(JSON.parse(response.body), createParams);
+    done();
+  });
+
   it('can poll a Solr cluster', function(done) {
     search.pollCluster({clusterId: clusterId}, function(error, data) {
       assert.equal(data, pollResponse);