Tests with mocha now works. Added minimal documentation

Author: fititnt

README.md

@@ -0,0 +1,22 @@
+# Consul TLS manager v1.0.0-beta
+Simple NodeJS script to store TLS certificates and keys to a Consul KV and
+restore to disk if modified since last check
+
+
+```bash
+$ ./index.js --help
+
+  Usage: index [options]
+
+  Options:
+
+    -h, --help          output usage information
+    -V, --version       output the version number
+    -g, --get           Get Value (default)
+    -s, --set           Set value
+    -u, --url           Consul Host
+    -f, --fqdn [value]  FQDN of key certificate, without last dot e.g. mydomain.com
+    -c, --cert [value]  Path to certificate (e.g. ./folder/mydomain.crt)
+    -k, --key [value]   Path to certificate Key (e.g. ./folder/mydomain.key)
+    -v, --debug         Enable verbose / debug
+```

index.js

@@ -25,35 +25,6 @@ program
         //.option('-c, --cheese [type]', 'Add the specified type of cheese [marble]', 'marble')
         .parse(process.argv);
 
-//console.log('debug:');
-//if (program.get) {
-//  console.log('  - get');
-//}
-//
-//if (program.set) {
-//  console.log('  - set');
-//}
-//
-//if (program.url) {
-//  console.log('  - url');
-//}
-//
-//if (program.fqdn) {
-//  console.log('  - fqdn');
-//}
-//
-//if (program.cert) {
-//  console.log('  - cert');
-//}
-//
-//if (program.key) {
-//  console.log('  - key');
-//}
-//console.log('  - %s set', program.set);
-//console.log('  - %s url', program.url);
-//console.log('  - %s fqdn', program.fqdn);
-
-
 if (program.debug) {
   consulTls.init({debug: true});
 }
@@ -64,14 +35,14 @@ if (program.set) {
       console.log('ERROR:', err);
       return 1;
     }
-    console.log(result);
+    return 0;
   }, program.url, program.fqdn, program.cert, program.key);
-} else {
+} else if (program.get) {
   consulTls.executeRestore(function (err, result) {
     if (err) {
       console.log('ERROR:', err);
       return 1;
     }
-    console.log(result);
+    return 0;
   }, program.url, program.fqdn, program.cert, program.key);
 }

lib/consul-tls.js

@@ -106,7 +106,7 @@ var consulTls = {
             {form: JSON.stringify(data)},
             function (error, response, body) {
               if (!error && response.statusCode === 200) {
-                console.log(body);
+                //console.log(body);
                 cb(null);
               } else {
                 cb({error: response.statusCode, message: error});
@@ -133,7 +133,7 @@ var consulTls = {
     };
     request.put(options, function (error, response, body) {
       if (!error && response.statusCode === 200) {
-        console.log(body);
+        //console.log(body);
         cb(null);
       } else {
         cb({error: response.statusCode, message: error});

test-mocha.js

@@ -3,33 +3,32 @@
  * @todo Finish tests with mocha and remove actual test.js
  */
 
-var exec = require('child_process').exec;
+var exec = require('child_process').exec, fs = require('fs');
 var assert = require('chai').assert;
 
 describe('Store and Restore TLS cert and keys from Consul KV', function () {
-
-  var cmd = './index.js --set --url http://localhost:8500 --fqdn=localhost --cert ./test/localhost.crt --key ./test/localhost.key';
+  var cmd = 'node ./index.js --set --url http://localhost:8500 --fqdn=localhost --cert ./test/localhost.crt --key ./test/localhost.key';
   //console.log('================================================================================');
   //console.log('TEST: set');
   //console.log(cmd);
 
-  it('should save on consul KV', function () {
+  it('should save on consul KV', function (done) {
     exec(cmd, function (error, stdout, stderr) {
       if (error) {
         console.log('error', error);
       }
       if (stderr) {
         console.log('stderr', stderr);
       }
-      assert(!!error);
-      done();
-
+      assert(!error);
       console.log(stdout);
+      done();
     });
   });
 
-  it('should restore from consul KV to disk', function () {
-    var cmd = './index.js --debug --get --url http://localhost:8500 --fqdn=localhost --cert ./test/result-localhost.crt --key ./test/result-localhost.key';
+  it('should restore from consul KV to disk', function (done) {
+    //var cmd = 'node ./index.js --debug --get --url http://localhost:8500 --fqdn=localhost --cert ./test/result-localhost.crt --key ./test/result-localhost.key';
+    var cmd = 'node ./index.js --get --url http://localhost:8500 --fqdn=localhost --cert ./test/result-localhost.crt --key ./test/result-localhost.key';
     //console.log('================================================================================');
     //console.log('TEST: get');
 
@@ -40,15 +39,18 @@ describe('Store and Restore TLS cert and keys from Consul KV', function () {
       if (stderr) {
         console.log('stderr', stderr);
       }
-      assert(!!error);
+      assert(!error);
       console.log(stdout);
 
       done();
     });
   });
 
-  it('files should be equal', function () {
-    
+  it('files should be equal: certificate', function () {
+    assert(fs.readFileSync('./test/localhost.crt', 'utf8') === fs.readFileSync('./test/result-localhost.crt', 'utf8'));
+  });
+  it('files should be equal: key', function () {
+    assert(fs.readFileSync('./test/localhost.key', 'utf8') === fs.readFileSync('./test/result-localhost.key', 'utf8'));
   });
 });
 

test.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+/**
+ * @deprecated file, use test-mocha.js
+ */
+
 var exec = require('child_process').exec, fs = require('fs');
 
 var cmd = './index.js --set --url http://localhost:8500 --fqdn=localhost --cert ./test/localhost.crt --key ./test/localhost.key';