fixed upload config bug

Author: DanCunnington

services/retrieve_and_rank/v1.html

@@ -481,10 +481,6 @@
         <label for="node-input-configname"><i class="fa fa-tag"></i> Configuration Name</label>
         <input type="text" id="node-input-configname" placeholder="Configuration Name">
     </div>
-    <div class="form-row mode configzippath">
-        <label for="node-input-configzippath"><i class="fa fa-tag"></i> Configuration .zip File Path</label>
-        <input type="text" id="node-input-configzippath" placeholder="Configuration .zip File Path">
-    </div>
 </script>
 
 <script type="text/x-red" data-help-name="watson-retrieve-rank-upload-solr-configuration">
@@ -498,8 +494,7 @@
             defaults: {
                 name: {value: ""},
                 clusterid: {value: "", required: true},
-                configname: {value: "", required: true},
-                configzippath: {value: "", required: true}
+                configname: {value: "", required: true}
             },
             credentials: {
               username: {type:"text"},

services/retrieve_and_rank/v1.js

@@ -227,20 +227,42 @@ module.exports = function (RED) {
 
     this.on('input', function(msg) {
       setupRankRetrieveNode(msg,config,this,function(retrieve_and_rank) {
-        var params = {
-          cluster_id: config.clusterid,
-          config_name: config.configname,
-          config_zip_path: config.configzippath
-        };
-        if (!params.cluster_id || !params.config_name || !params.config_zip_path) {
-          var message = 'No cluster id, configuration name or .zip file path specified';
-          node.error(message, msg)
+
+        //zip file comes in on msg.payload as buffer
+        if (!msg.payload instanceof Buffer) {
+          var message = 'Invalid property: msg.payload, must be a Buffer.';
+          node.error(message, msg);
           return;
         }
-        node.status({fill: 'blue', shape: 'ring', text: 'Uploading solr configuration...' });
-        retrieve_and_rank.uploadConfig(params, function (err, res) {
-          node.status({});
-          handleWatsonCallback(null,node,msg,err,res);
+
+        var uploadConfig = function(filePath,cb) {
+          var params = {
+            cluster_id: config.clusterid,
+            config_name: config.configname,
+            config_zip_path: filePath
+          };
+          if (!params.cluster_id || !params.config_name) {
+            var message = 'No cluster id or configuration name specified';
+            return node.error(message, msg);
+          }
+          node.status({fill: 'blue', shape: 'ring', text: 'Uploading solr configuration...' });
+          retrieve_and_rank.uploadConfig(params, function (err, res) {
+            node.status({});
+            handleWatsonCallback(null,node,msg,err,res);
+          });
+        }
+
+        var stream_buffer = function (file, contents, cb) {
+          fs.writeFile(file, contents, function (err) {
+            if (err) throw err;
+            cb(file);
+          });
+        };
+        temp.open({suffix: '.zip'}, function (err, info) {
+          if (err) throw err;
+          stream_buffer(info.path, msg.payload, function (file) {
+            uploadConfig(file, temp.cleanup);
+          });
         });
       });      
     });