Merge pull request #2 from NCIOCPL/goac

Goac

Author: bryanpizzillo

bin/estools

@@ -18,6 +18,8 @@ require('../cmds/isindexavailable.js')(program);
 
 program
 	//Common options to ALL commands.
+	.option('-P, --protocol <protocol>', 'http or https. (default: http)', 'http')	
+
 	.option(
 		'-s --server <server>', 
 		'The elasticsearch node IP or Name to connect to. (default: localhost)', 

cmds/indexesforalias.js

@@ -41,13 +41,15 @@ internals.commandAction = function(aliasname, cmd) {
 	//Add Verbose Check
 	if (cmd.parent.verbose) {
 		console.log("Alias Name: " + aliasname);
+		console.log("Protocol: " + cmd.parent.protocol);
 		console.log("Server: " + cmd.parent.server);
 		console.log("Port: " + cmd.parent.port);
+		console.log(cmd.parent.protocol + '://' + cmd.parent.server + ':' + cmd.parent.port);
 	}
 
 	//Setup elastic search client.
 	var client = new elasticsearch.Client({
-		host: 'http://' + cmd.parent.server + ':' + cmd.parent.port,
+		host: cmd.parent.protocol + '://' + cmd.parent.server + ':' + cmd.parent.port,
 		log: 'error'
 	});
 

cmds/isindexavailable.js

@@ -40,13 +40,15 @@ internals.commandAction = function(indexname, cmd) {
 	//Add Verbose Check
 	if (cmd.parent.verbose) {
 		console.log("Index Name: " + indexname);
+		console.log("Protocol: " + cmd.parent.protocol);
 		console.log("Server: " + cmd.parent.server);
 		console.log("Port: " + cmd.parent.port);
+		console.log(cmd.parent.protocol + '://' + cmd.parent.server + ':' + cmd.parent.port);
 	}
 
 	//Setup elastic search client.
 	var client = new elasticsearch.Client({
-		host: 'http://' + cmd.parent.server + ':' + cmd.parent.port,
+		host: cmd.parent.protocol + '://' + cmd.parent.server + ':' + cmd.parent.port,
 		log: 'error'
 	});
 

cmds/oldsnapshots.js

@@ -57,15 +57,18 @@ internals.commandAction = function(repository, cmd) {
 	if (cmd.parent.verbose) {
 		console.log("Repository: " + repository);
 		console.log("Number of Days: " + cmd.num_days);
+		console.log("Protocol: " + cmd.parent.protocol);
 		console.log("Server: " + cmd.parent.server); //Program Option
 		console.log("Port: " + cmd.parent.port); //Program Option
+		console.log(cmd.parent.protocol + '://' + cmd.parent.server + ':' + cmd.parent.port);
 	}
 
 	//So we should be good to go here.
 	internals.getSnapshotsFromRepo(
 		{
 			repo: repository,
 			num_days: cmd.num_days,
+			protocol: cmd.parent.protocol,
 			server: cmd.parent.server,
 			port: cmd.parent.port
 		}, function(err, results) {
@@ -103,7 +106,7 @@ internals.getSnapshotsFromRepo = function(opts, resultsCallback) {
 
 	//Setup elastic search client.
 	var client = new elasticsearch.Client({
-		host: 'http://' + opts.server + ':' + opts.port,
+		host: opts.protocol + '://' + opts.server + ':' + opts.port,
 		log: 'error'
 	});
 

package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "autocmdr": "~0.0.7",
     "commander": "~2.0.0",
-    "elasticsearch": "^10.1.2",
+    "elasticsearch": "^13.3.1",
     "lodash": "^4.0.0",
     "moment": "^2.11.1"
   },