Merge pull request #5 from mergermarket/1.1.0

Release 1.1.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@acuris/aws-es-connection",
   "private": false,
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "AWS ElasticSearch connection for the @elastic/elasticsearch ES client",
   "keywords": [
     "aws",
@@ -21,7 +21,9 @@
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["dist/**/*"],
+  "files": [
+    "dist/**/*"
+  ],
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc",

src/index.test.ts

@@ -1,5 +1,5 @@
 import { createAWSConnection, awsCredsifyAll, awsGetCredentials} from './index'
-import AWS from 'aws-sdk'
+import * as AWS from 'aws-sdk'
 import { Client } from '@elastic/elasticsearch'
 
 describe('aws-es-connection', () => {
@@ -104,7 +104,7 @@ describe('aws-es-connection', () => {
       await esClient.index({ index: indexName, refresh: 'wait_for', body: doc3 })
 
       const result = await esClient.search({ index: indexName, q: 'Hello' })
-      expect(result.body.hits.total).toBe(2)
+      expect(result.body.hits.total.value).toBe(2)
     } finally {
       // Clean up
       await esClient.indices.delete({ index: indexName })

src/index.ts

@@ -1,5 +1,5 @@
-import AWS from 'aws-sdk'
-import http from 'http'
+import * as AWS from 'aws-sdk'
+import { request, ClientRequest, ClientRequestArgs } from 'http'
 import { sign } from 'aws4'
 import { Client, Connection } from '@elastic/elasticsearch'
 
@@ -13,8 +13,8 @@ class AWSConnection extends Connection {
     this.makeRequest = this.signedRequest
   }
 
-  private signedRequest(reqParams: http.ClientRequestArgs): http.ClientRequest {
-    return http.request(sign(reqParams, this.awsCredentials))
+  private signedRequest(reqParams: ClientRequestArgs): ClientRequest {
+    return request(sign(reqParams, this.awsCredentials))
   }
 }
 

src/whitelisted-props.ts

@@ -1,4 +1,8 @@
 export default [
+  'async_search',
+  'async_search',
+  'asyncSearch',
+  'autoscaling',
   'bulk',
   'cat',
   'ccr',
@@ -8,14 +12,18 @@ export default [
   'count',
   'create',
   'data_frame',
+  'data_frame_transform_deprecated',
   'dataFrame',
+  'dataFrameTransformDeprecated',
   'delete',
   'delete_by_query',
   'deleteByQuery',
   'delete_by_query_rethrottle',
   'deleteByQueryRethrottle',
   'delete_script',
   'deleteScript',
+  'enrich',
+  'eql',
   'exists',
   'exists_source',
   'existsSource',
@@ -25,6 +33,10 @@ export default [
   'get',
   'get_script',
   'getScript',
+  'get_script_context',
+  'getScriptContext',
+  'get_script_languages',
+  'getScriptLanguages',
   'get_source',
   'getSource',
   'graph',
@@ -53,6 +65,7 @@ export default [
   'reindexRethrottle',
   'render_search_template',
   'renderSearchTemplate',
+  'rollup',
   'scripts_painless_execute',
   'scriptsPainlessExecute',
   'scroll',
@@ -68,6 +81,7 @@ export default [
   'ssl',
   'tasks',
   'termvectors',
+  'transform',
   'update',
   'update_by_query',
   'updateByQuery',

tsconfig.json

@@ -1,12 +1,10 @@
 {
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
     "module": "commonjs",
     "outDir": "./dist/",
     "target": "es6",
     "declaration": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/**/*.test.ts"]
 }