Merge branch 'master' into master

Author: aviadhahami

README.md

@@ -93,7 +93,8 @@ Now you are able to run all of the other [examples]:
 node example/policies.js
 ```
 
-##Connecting to vault through a bastion host
+## Connecting to vault through a bastion host
+
 To connect to a vault server in a private network with a bastion host, you'll need to first open a connection:
 ```bash
 ssh -D <socks4Port> bastion.example.com
@@ -111,7 +112,9 @@ const options = {
 
 const vault = require('node-vault')(options);
 ```
+
 [![Backers](https://opencollective.com/node-vault/tiers/backers.svg?avatarHeight=80&width=600)](https://opencollective.com/node-vault/contribute)
+
 [examples]: https://github.com/kr1sp1n/node-vault/tree/master/example
 [docker-compose.yml]: https://github.com/kr1sp1n/node-vault/tree/master/docker-compose.yml
 [Vault]: https://vaultproject.io/

features.md

@@ -172,6 +172,11 @@
 `POST /auth/{{mount_point}}{{^mount_point}}kubernetes{{/mount_point}}/login`
 
 
+## vault.awsIamLogin
+
+`POST /auth/{{mount_point}}{{^mount_point}}aws{{/mount_point}}/login`
+
+
 ## vault.userpassLogin
 
 `POST /auth/{{mount_point}}{{^mount_point}}userpass{{/mount_point}}/login/{{username}}`

index.d.ts

@@ -69,9 +69,11 @@ declare namespace NodeVault {
         revoke(options?: Option): Promise<any>;
         revokePrefix(options?: Option): Promise<any>;
         rotate(options?: Option): Promise<any>;
+        gcpLogin(options?: Option): Promise<any>;
         githubLogin(options?: Option): Promise<any>;
         userpassLogin(options?: Option): Promise<any>;
         kubernetesLogin(options?: Option): Promise<any>;
+        awsIamLogin(options?: Option): Promise<any>;
         tokenAccessors(options?: Option): Promise<any>;
         tokenCreate(options?: Option): Promise<any>;
         tokenCreateOrphan(options?: Option): Promise<any>;
@@ -121,6 +123,9 @@ declare namespace NodeVault {
 
         apiVersion?: string;
         endpoint?: string;
+        namespace?: string;
+        noCustomHTTPVerbs?: boolean;
+        pathPrefix?: string;
         token?: string;
         requestOptions?: request.CoreOptions;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-vault",
-  "version": "0.9.18",
+  "version": "0.9.22",
   "description": "Javascript client for HashiCorp's Vault",
   "main": "./src/index.js",
   "scripts": {
@@ -64,14 +64,17 @@
     "Charles Phillips (https://github.com/doublerebel)",
     "David Drewery (https://github.com/EXPEddrewery)",
     "Dustin (https://github.com/at88mph)",
+    "Jason Nguyen (https://github.com/gofightnguyen)",
     "Jeff Sisson (https://github.com/saranrapjs)",
     "Jonathan Bastnagel (https://github.com/inkadnb)",
     "Julian Amelung (https://github.com/julianbei)",
     "Karthik Kumar Viswanathan (https://github.com/guilt)",
+    "Kevin Stiehl (https://github.com/kstiehl)",
     "Konstantin Matsiushonak (https://github.com/kakoc)",
     "Mario Pareja (https://github.com/mpareja)",
     "Mark Frost (https://github.com/frostmar)",
     "Owen Farrell (https://github.com/owenfarrell)",
+    "Parker Johansen (https://github.com/auroq)",
     "Patrick Rainier Juen (https://github.com/uLan08)",
     "Phred Lane (https://github.com/fearphage)",
     "Ryan Lewis (https://github.com/ryanlewis)",
@@ -84,7 +87,9 @@
     "Tom Vogel (https://github.com/tavogel)",
     "Trevor Robinson (https://github.com/trevorr)",
     "Vineet Bhatia (https://github.com/firefoxNX)",
-    "Vladyslav Mashkin (https://github.com/jsdream)"
+    "Vladyslav Mashkin (https://github.com/jsdream)",
+    "Wes Novack (https://github.com/wes-novack)",
+    "Zach Lintz (https://github.com/zlintz)"
   ],
   "license": "MIT",
   "bugs": {

src/commands.js

@@ -474,6 +474,41 @@ module.exports = {
       res: tokenResponse,
     },
   },
+  awsIamLogin: {
+    method: 'POST',
+    path: '/auth/{{mount_point}}{{^mount_point}}aws{{/mount_point}}/login',
+    tokenSource: true,
+    schema: {
+      req: {
+        type: 'object',
+        properties: {
+          role: {
+            type: 'string',
+          },
+          iam_http_request_method: {
+            type: 'string',
+          },
+          iam_request_url: {
+            type: 'string',
+          },
+          iam_request_body: {
+            type: 'string',
+          },
+          iam_request_headers: {
+            type: 'string',
+          },
+        },
+        required: [
+          'role',
+          'iam_http_request_method',
+          'iam_request_url',
+          'iam_request_body',
+          'iam_request_headers',
+        ],
+      },
+      res: tokenResponse,
+    },
+  },
   userpassLogin: {
     method: 'POST',
     path: '/auth/{{mount_point}}{{^mount_point}}userpass{{/mount_point}}/login/{{username}}',

src/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-let debug = require('debug')('node-vault');
-let tv4 = require('tv4');
-let commands = require('./commands.js');
-let mustache = require('mustache');
-let rp = require('request-promise-native');
+const originalDebug = require('debug')('node-vault');
+const originalTv4 = require('tv4');
+const originalCommands = require('./commands.js');
+const originalMustache = require('mustache');
+const originalRp = require('request-promise-native');
 
 class VaultError extends Error {}
 
@@ -20,10 +20,10 @@ class ApiResponseError extends VaultError {
 
 module.exports = (config = {}) => {
   // load conditional dependencies
-  debug = config.debug || debug;
-  tv4 = config.tv4 || tv4;
-  commands = config.commands || commands;
-  mustache = config.mustache || mustache;
+  const debug = config.debug || originalDebug;
+  const tv4 = config.tv4 || originalTv4;
+  const commands = config.commands || originalCommands;
+  const mustache = config.mustache || originalMustache;
 
   const rpDefaults = {
     json: true,
@@ -38,7 +38,7 @@ module.exports = (config = {}) => {
     });
   }
 
-  rp = (config['request-promise'] || rp).defaults(rpDefaults);
+  const rp = (config['request-promise'] || originalRp).defaults(rpDefaults);
   const client = {};
 
   function handleVaultResponse(response) {