AWS SDK v3 Support (#34)

* feat: support aws-sdk v3

* chore: lint fixes

* chore: doc cleanup for aws-sdk v3

Author: James Renaud

README.md

@@ -21,38 +21,77 @@ npm install --save aws-elasticsearch-connector @elastic/elasticsearch aws-sdk
 ### Using global configuration
 
 ```javascript
-const { Client } = require('@elastic/elasticsearch')
-const AWS = require('aws-sdk')
-const createAwsElasticsearchConnector = require('aws-elasticsearch-connector')
+const { Client } = require("@elastic/elasticsearch");
+const AWS = require("aws-sdk");
+const createAwsElasticsearchConnector = require("aws-elasticsearch-connector");
 
 // (Optional) load profile credentials from file
 AWS.config.update({
-  profile: 'my-profile'
-})
+  profile: "my-profile",
+});
 
 const client = new Client({
   ...createAwsElasticsearchConnector(AWS.config),
-  node: 'https://my-elasticsearch-cluster.us-east-1.es.amazonaws.com'
-})
+  node: "https://my-elasticsearch-cluster.us-east-1.es.amazonaws.com",
+});
 ```
 
 ### Using specific configuration
 
 ```javascript
-const { Client } = require('@elastic/elasticsearch')
-const AWS = require('aws-sdk')
-const createAwsElasticsearchConnector = require('aws-elasticsearch-connector')
+const { Client } = require("@elastic/elasticsearch");
+const AWS = require("aws-sdk");
+const createAwsElasticsearchConnector = require("aws-elasticsearch-connector");
 
 const awsConfig = new AWS.Config({
   // Your credentials and settings here, see
   // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Config.html#constructor-property
-})
+});
 
 const client = new Client({
   ...createAwsElasticsearchConnector(awsConfig),
-  node: 'https://my-elasticsearch-cluster.us-east-1.es.amazonaws.com'
-})
-````
+  node: "https://my-elasticsearch-cluster.us-east-1.es.amazonaws.com",
+});
+```
+
+### Using aws-sdk v3
+
+```javascript
+const { STSClient, AssumeRoleCommand } = require("@aws-sdk/client-sts");
+const { Client } = require("@elastic/elasticsearch");
+const createAwsElasticsearchConnector = require("./src/index.js");
+
+async function ping() {
+  const creds = await assumeRole(
+    "arn:aws:iam::0123456789012:role/Administrator",
+    "us-east-1"
+  );
+  const client = new Client({
+    ...createAwsElasticsearchConnector({
+      region: "us-east-1",
+      credentials: creds,
+    }),
+    node: "https://my-elasticsearch-cluster.us-east-1.es.amazonaws.com",
+  });
+  const response = await client.ping();
+  console.log(`Got Response`, response);
+}
+
+async function assumeRole(roleArn, region) {
+  const client = new STSClient({ region });
+  const response = await client.send(
+    new AssumeRoleCommand({
+      RoleArn: roleArn,
+      RoleSessionName: "aws-es-connection",
+    })
+  );
+  return {
+    accessKeyId: response.Credentials.AccessKeyId,
+    secretAccessKey: response.Credentials.SecretAccessKey,
+    sessionToken: response.Credentials.SessionToken,
+  };
+}
+```
 
 ## Test
 

src/AmazonTransport.js

@@ -17,16 +17,25 @@ module.exports = awsConfig => {
         options = {}
       }
 
-      // Promise support
-      if (typeof callback === 'undefined') {
-        return awaitAwsCredentials(awsConfig)
-          .then(() => super.request(params, options))
-      }
+      // check if getCredentials exists, if so this is an aws-sdk v2 global config object
+      if (typeof awsConfig.getCredentials !== 'function') {
+        if (typeof callback === 'undefined') {
+          return super.request(params, options)
+        } else {
+          super.request(params, options, callback)
+        }
+      } else {
+        // Promise support
+        if (typeof callback === 'undefined') {
+          return awaitAwsCredentials(awsConfig)
+            .then(() => super.request(params, options))
+        }
 
-      // Callback support
-      awaitAwsCredentials(awsConfig)
-        .then(() => super.request(params, options, callback))
-        .catch(callback)
+        // Callback support
+        awaitAwsCredentials(awsConfig)
+          .then(() => super.request(params, options, callback))
+          .catch(callback)
+      }
     }
   }