Backport/backport 279 to 1.x (#391)

* Backport sigV4 into 1.x Signed-off-by: Harsha Vamsi Kalluri <[email protected]> * Fix linting Signed-off-by: Harsha Vamsi Kalluri <[email protected]> * Upgrading AWS types version Signed-off-by: Harsha Vamsi Kalluri <[email protected]> * Upgrading node types version Signed-off-by: Harsha Vamsi Kalluri <[email protected]> --------- Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
opensearch-project · Feb 21, 2023 · aa64b9e · aa64b9e
1 parent 1610e16
commit aa64b9e
Show file tree

Hide file tree

Showing 14 changed files with 890 additions and 120 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ OpenSearch Node.js client
 - [Welcome!](#welcome)
 - [Example use](#example-use)
   - [Setup](#setup)
-  - [Sample code](#sample-code)
+- [Sample code](#sample-code)
 - [Project Resources](#project-resources)
 - [Code of Conduct](#code-of-conduct)
 - [License](#license)
@@ -43,115 +43,10 @@ Then require the client:
 const { Client } = require('@opensearch-project/opensearch')
 ```
 
+## Sample code
 
-### Sample code
+Please see the [USER_GUIDE](USER_GUIDE.md) for code snippets.
 
-```javascript
-'use strict';
-
-var host = 'localhost';
-var protocol = 'https';
-var port = 9200;
-var auth = 'admin:admin'; // For testing only. Don't store credentials in code.
-var ca_certs_path = '/full/path/to/root-ca.pem';
-
-// Optional client certificates if you don't want to use HTTP basic authentication.
-// var client_cert_path = '/full/path/to/client.pem'
-// var client_key_path = '/full/path/to/client-key.pem'
-
-// Create a client with SSL/TLS enabled.
-var { Client } = require('@opensearch-project/opensearch');
-var fs = require('fs');
-var client = new Client({
-    node: protocol + '://' + auth + '@' + host + ':' + port,
-    ssl: {
-        ca: fs.readFileSync(ca_certs_path),
-        // You can turn off certificate verification (rejectUnauthorized: false) if you're using self-signed certificates with a hostname mismatch.
-        // cert: fs.readFileSync(client_cert_path),
-        // key: fs.readFileSync(client_key_path)
-    }
-})
-
-async function search() {
-
-    // Create an index with non-default settings.
-    var index_name = 'books'
-    var settings = {
-        'settings': {
-            'index': {
-                'number_of_shards': 4,
-                'number_of_replicas': 3
-            }
-        }
-    }
-
-    var response = await client.indices.create({
-        index: index_name,
-        body: settings
-    })
-
-    console.log('Creating index:')
-    console.log(response.body)
-
-    // Add a document to the index.
-    var document = {
-        'title': 'The Outsider',
-        'author': 'Stephen King',
-        'year': '2018',
-        'genre': 'Crime fiction'
-    }
-
-    var id = '1'
-
-    var response = await client.index({
-        id: id,
-        index: index_name,
-        body: document,
-        refresh: true
-    })
-
-    console.log('Adding document:')
-    console.log(response.body)
-
-    // Search for the document.
-    var query = {
-        'query': {
-            'match': {
-                'title': {
-                    'query': 'The Outsider'
-                }
-            }
-        }
-    }
-
-    var response = await client.search({
-        index: index_name,
-        body: query
-    })
-
-    console.log('Search results:')
-    console.log(response.body.hits)
-
-    // Delete the document.
-    var response = await client.delete({
-        index: index_name,
-        id: id
-    })
-
-    console.log('Deleting document:')
-    console.log(response.body)
-
-    // Delete the index.
-    var response = await client.indices.delete({
-        index: index_name
-    })
-
-    console.log('Deleting index:')
-    console.log(response.body)
-}
-
-search().catch(console.log)
-```
 
 ## Project Resources
 

diff --git a/USER_GUIDE.md b/USER_GUIDE.md
@@ -0,0 +1,197 @@
+# User Guide
+
+- [User Guide](#user-guide)
+  - [Initializing a Client](#initializing-a-client)
+    - [Authenticate with Amazon OpenSearch Service](#authenticate-with-amazon-opensearch-service)
+      - [Using AWS V2 SDK](#using-aws-v2-sdk)
+      - [Using AWS V3 SDK](#using-aws-v3-sdk)
+  - [Create an Index](#create-an-index)
+  - [Add a Document to the Index](#add-a-document-to-the-index)
+  - [Search for the Document](#search-for-the-document)
+  - [Delete the document](#delete-the-document)
+  - [Delete the index](#delete-the-index)
+
+## Initializing a Client
+```javascript
+'use strict';
+
+var host = 'localhost';
+var protocol = 'https';
+var port = 9200;
+var auth = 'admin:admin'; // For testing only. Don't store credentials in code.
+var ca_certs_path = '/full/path/to/root-ca.pem';
+
+// Optional client certificates if you don't want to use HTTP basic authentication.
+// var client_cert_path = '/full/path/to/client.pem'
+// var client_key_path = '/full/path/to/client-key.pem'
+
+// Create a client with SSL/TLS enabled.
+var { Client } = require('@opensearch-project/opensearch');
+var fs = require('fs');
+var client = new Client({
+  node: protocol + '://' + auth + '@' + host + ':' + port,
+  ssl: {
+    ca: fs.readFileSync(ca_certs_path),
+    // You can turn off certificate verification (rejectUnauthorized: false) if you're using self-signed certificates with a hostname mismatch.
+    // cert: fs.readFileSync(client_cert_path),
+    // key: fs.readFileSync(client_key_path)
+  },
+});
+```
+
+### Authenticate with Amazon OpenSearch Service
+
+#### Using AWS V2 SDK
+
+```javascript
+const AWS = require('aws-sdk'); // V2 SDK.
+const { Client } = require('@opensearch-project/opensearch');
+const { AwsSigv4Signer } = require('@opensearch-project/opensearch/aws');
+
+const client = new Client({
+  ...AwsSigv4Signer({
+    region: 'us-east-1',
+    // Must return a Promise that resolve to an AWS.Credentials object.
+    // This function is used to acquire the credentials when the client start and
+    // when the credentials are expired.
+    // The Client will refresh the Credentials only when they are expired.
+    // With AWS SDK V2, Credentials.refreshPromise is used when available to refresh the credentials.
+
+    // Example with AWS SDK V2:
+    getCredentials: () =>
+      new Promise((resolve, reject) => {
+        // Any other method to acquire a new Credentials object can be used.
+        AWS.config.getCredentials((err, credentials) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(credentials);
+          }
+        });
+      }),
+  }),
+  node: "https://search-xxx.region.es.amazonaws.com", // OpenSearch domain URL
+});
+```
+
+#### Using AWS V3 SDK
+
+```javascript
+const { defaultProvider } = require("@aws-sdk/credential-provider-node"); // V3 SDK.
+const { Client } = require('@opensearch-project/opensearch');
+const { AwsSigv4Signer } = require('@opensearch-project/opensearch/aws');
+
+const client = new Client({
+  ...AwsSigv4Signer({
+    region: 'us-east-1',
+    // Must return a Promise that resolve to an AWS.Credentials object.
+    // This function is used to acquire the credentials when the client start and
+    // when the credentials are expired.
+    // The Client will refresh the Credentials only when they are expired.
+    // With AWS SDK V2, Credentials.refreshPromise is used when available to refresh the credentials.
+
+    // Example with AWS SDK V3:
+    getCredentials: () => {
+      // Any other method to acquire a new Credentials object can be used.
+      const credentialsProvider = defaultProvider();
+      return credentialsProvider();
+    },
+  }),
+  node: "https://search-xxx.region.es.amazonaws.com", // OpenSearch domain URL
+});
+```
+
+## Create an Index
+
+```javascript
+  console.log('Creating index:');
+
+  var index_name = 'books';
+  var settings = {
+    settings: {
+      index: {
+        number_of_shards: 4,
+        number_of_replicas: 3,
+      },
+    },
+  };
+
+  var response = await client.indices.create({
+    index: index_name,
+    body: settings,
+  });
+
+  console.log(response.body);
+```
+
+## Add a Document to the Index
+
+```javascript
+  console.log('Adding document:');
+
+  var document = {
+    title: 'The Outsider',
+    author: 'Stephen King',
+    year: '2018',
+    genre: 'Crime fiction',
+  };
+
+  var id = '1';
+
+  var response = await client.index({
+    id: id,
+    index: index_name,
+    body: document,
+    refresh: true,
+  });
+
+  console.log(response.body);
+```
+
+## Search for the Document
+
+```javascript
+  console.log('Search results:');
+
+  var query = {
+    query: {
+      match: {
+        title: {
+          query: 'The Outsider',
+        },
+      },
+    },
+  };
+
+  var response = await client.search({
+    index: index_name,
+    body: query,
+  });
+
+  console.log(response.body.hits);
+```
+
+## Delete the document
+
+```javascript
+  console.log('Deleting document:');
+
+  var response = await client.delete({
+    index: index_name,
+    id: id,
+  });
+
+  console.log(response.body);
+```
+
+## Delete the index
+
+```javascript
+  console.log('Deleting index:');
+
+  var response = await client.indices.delete({
+    index: index_name,
+  });
+
+  console.log(response.body);
+```
diff --git a/lib/Helpers.js b/lib/Helpers.js
@@ -732,7 +732,7 @@ class Helpers {
                 }
               } else {
                 onDrop({
-                  status: status,
+                  status,
                   error: action[operation].error,
                   operation: serializer.deserialize(bulkBody[indexSlice]),
                   document: operation !== 'delete'