Fix env variables to include existing environment variables, then override.

Author: brendandburns

.gitignore

@@ -10,4 +10,5 @@ coverage/*
 examples/package-lock.json
 .nyc_output
 kubernetes-client-node-*.tgz
+**/*.swp
 

package-lock.json

@@ -5,6 +5,7 @@ import { User } from './config_types';
 
 export class ExecAuth implements Authenticator {
     private readonly tokenCache: { [key: string]: any } = {};
+    private execFn: (cmd: string, opts: shell.ExecOpts) => shell.ShellReturnValue = shell.exec;
 
     public isAuthProvider(user: User) {
         if (!user) {
@@ -53,11 +54,11 @@ export class ExecAuth implements Authenticator {
         }
         let opts: shell.ExecOpts;
         if (exec.env) {
-            const env = {};
+            const env = process.env;
             exec.env.forEach((elt) => (env[elt.name] = elt.value));
             opts = { env };
         }
-        const result = shell.exec(cmd, opts);
+        const result = this.execFn(cmd, opts);
         if (result.code === 0) {
             const obj = JSON.parse(result.stdout);
             this.tokenCache[user.name] = obj;

src/exec_auth.ts

@@ -0,0 +1,57 @@
+import { expect } from 'chai';
+import { ExecAuth } from './exec_auth';
+import * as shell from 'shelljs';
+
+describe('ExecAuth', () => {
+	it('should correctly exec', async () => {
+		const auth = new ExecAuth();
+		(auth as any).execFn = (command: string, opts: shell.ExecOpts): shell.ShellReturnValue => {
+			return {
+				code: 0,
+				stdout: JSON.stringify({ status: { token: 'foo' } })
+			} as shell.ShellReturnValue;
+		}; 
+
+		const token = auth.getToken({
+			name: 'user',
+			authProvider: {
+				config: {
+					exec: {
+						command: 'echo'
+					}
+				}
+			}
+		});
+		expect(token).to.equal('Bearer foo');
+	});
+
+        it('should exec with env vars', async () => {
+                const auth = new ExecAuth();
+		var optsOut: shell.ExecOpts = {};
+                (auth as any).execFn = (command: string, opts: shell.ExecOpts): shell.ShellReturnValue => {
+			optsOut = opts
+                        return {
+                                code: 0,
+                                stdout: JSON.stringify({ status: { token: 'foo' } })
+                        } as shell.ShellReturnValue;
+                };
+		process.env.BLABBLE = 'flubble';
+                const token = auth.getToken({
+                        name: 'user',
+                        authProvider: {
+                                config: {
+                                        exec: {
+                                                command: 'echo',
+						env: [{
+							name: 'foo',
+							value: 'bar'	
+						}]
+					}
+                                }
+                        }
+                });
+		expect(optsOut.env.foo).to.equal('bar');
+		expect(optsOut.env.PATH).to.equal(process.env.PATH);
+		expect(optsOut.env.BLABBLE).to.equal(process.env.BLABBLE);
+        }); 	
+});