vvauth 0.3.5 → 1.0.1

package/index.js

@@ -6,6 +6,7 @@ const fs    = require('fs');
 const path  = require('path');
 const url   = require('url');
 const {spawn} = require('child_process');
+const passthru = require('nyks/child_process/passthru');
 
 const {parse} = require('yaml');
 const semver     = require('semver');
@@ -18,6 +19,8 @@ const request    = require('nyks/http/request');
 const drain      = require('nyks/stream/drain');
 const replaceEnv = require('nyks/string/replaceEnv');
 const promiser   = require('nyks/function/promiser');
+const {args} = require('nyks/process/parseArgs')();
+
 
 const {OpenSSHAgent} = require('ssh2/lib/agent');
 const debug = require('debug');
@@ -30,11 +33,11 @@ const logger  = {
 
 
 const VAUTH_RC = [process.env.VAUTHRC, path.join(process.cwd(), ".vauthrc"), path.join(os.homedir(), ".vauthrc")];
-const FUNCTION_NAME = "vauth";
-const FUNCTION_DECL = "function vauth() { source <(/usr/bin/env vvauth --ir://raw --source --ir://run=$1 \"${@:2}\"); }";
+const FUNCTION_NAME = "venv";
+const FUNCTION_DECL = `function ${FUNCTION_NAME}() { source <(/usr/bin/env vauth env --source); }`;
 
 class vvauth {
-  constructor(rc = null) {
+  constructor() {
 
 
     let {dependencies = {}} = require(path.resolve('package.json'));
@@ -46,14 +49,11 @@ class vvauth {
     }
 
     this.rc = {};
-    if(rc) {
-      this.rc = rc;
-    } else {
-      let vauth_rc = VAUTH_RC.filter(path => path && fs.existsSync(path))[0];
-      if(vauth_rc) {
-        let body = fs.readFileSync(vauth_rc, 'utf8');
-        this.rc = walk(parse(body), v =>  replaceEnv(v, {env : process.env}));
-      }
+
+    let vauth_rc = VAUTH_RC.filter(path => path && fs.existsSync(path))[0];
+    if(vauth_rc) {
+      let body = fs.readFileSync(vauth_rc, 'utf8');
+      this.rc = walk(parse(body), v =>  replaceEnv(v, {env : process.env}));
     }
 
     this.VAULT_ADDR = this.rc.vault_addr;
@@ -65,6 +65,13 @@ class vvauth {
     console.error("vauth bound to '%s'", this.VAULT_ADDR);
   }
 
+  async run() {
+    let args = process.argv.slice(process.argv.indexOf("run") + 1);
+    let env = await this.env(), cmd = args.shift();
+    await passthru(cmd, args, {env : {...process.env, ...env}}).catch((err) => (console.error("run failure : ", err), process.exit(1)));
+    process.exit();
+  }
+
   async connect() {
     let VAULT_TOKEN, {rc : {ssh_auth, jwt_auth}} = this;
 
@@ -162,6 +169,7 @@ class vvauth {
       this._publish_env(env);
       process.exit();
     }
+    return env;
   }
 
 
@@ -270,8 +278,9 @@ const shellEscape = (arg) =>  {
 };
 
 //ensure module is called directly, i.e. not required
-if(module.parent === null)
-  require('cnyks/lib/bundle')(vvauth);
-
+if(module.parent === null) {
+  let cmd = args.shift();
+  require('cnyks/lib/bundle')(vvauth, null, cmd ? [`--ir://run=${cmd}`, '--ir://raw'] : []);
+}
 
 module.exports = vvauth;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "vvauth",
-  "version": "0.3.5",
+  "version": "1.0.1",
   "description": "Vault Auth helper",
   "main": "index.js",
   "bin": {
-    "vvauth": "./index.js"
+    "vauth": "./index.js"
   },
   "scripts": {
     "eslint": "eslint ."
@@ -12,9 +12,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "cnyks": "^3.0.6",
+    "cnyks": "^3.2.1",
     "debug": "^4.3.4",
-    "mout": "^1.0.0",
+    "mout": "^1.2.4",
     "nyks": "^6.15.0",
     "semver": "^7.5.4",
     "ssh2": "^1.16.0",