From af0e0c5c319e6c63bbe8d39d770e2eb45672f05f Mon Sep 17 00:00:00 2001
From: Lee Henson <lee.m.henson@gmail.com>
Date: Thu, 31 Jan 2019 10:12:00 +0000
Subject: [PATCH] [http-aws-es] type awsConfig as AWS.Config instead of
 handcrafted subset

---
 types/http-aws-es/http-aws-es-tests.ts | 29 +++++++++++++-------------
 types/http-aws-es/index.d.ts           | 11 ++--------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/types/http-aws-es/http-aws-es-tests.ts b/types/http-aws-es/http-aws-es-tests.ts
index acd5248817..18ae2b666c 100644
--- a/types/http-aws-es/http-aws-es-tests.ts
+++ b/types/http-aws-es/http-aws-es-tests.ts
@@ -1,42 +1,43 @@
-import { EnvironmentCredentials } from "aws-sdk/lib/core";
+import * as AWS from "aws-sdk";
 import { Client } from "elasticsearch";
 import HttpAmazonESConnector = require("http-aws-es");
 
 new Client({
-    awsConfig: {
-        accessKey: "AKID",
+    awsConfig: new AWS.Config({
+        accessKeyId: "AKID",
         region: "us-east-1",
-        secretKey: "secret",
-    },
+        secretAccessKey: "secret",
+    }),
     connectionClass: HttpAmazonESConnector,
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
 new Client({
-    awsConfig: {
-        accessKey: "AKID",
+    awsConfig: new AWS.Config({
+        accessKeyId: "AKID",
         region: "us-east-1",
-        secretKey: "secret",
-    },
+        secretAccessKey: "secret",
+    }),
     connectionClass: require("http-aws-es"),
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
-const myCredentials = new EnvironmentCredentials("AWS");
+const myCredentials = new AWS.EnvironmentCredentials("AWS");
+
 new Client({
-    awsConfig: {
+    awsConfig: new AWS.Config({
         credentials: myCredentials,
         region: "us-east-1",
-    },
+    }),
     connectionClass: HttpAmazonESConnector,
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
 
 new Client({
-    awsConfig: {
+    awsConfig: new AWS.Config({
         credentials: myCredentials,
         region: "us-east-1",
-    },
+    }),
     connectionClass: require("http-aws-es"),
     host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
 });
diff --git a/types/http-aws-es/index.d.ts b/types/http-aws-es/index.d.ts
index 15a803076f..2a6ca11629 100644
--- a/types/http-aws-es/index.d.ts
+++ b/types/http-aws-es/index.d.ts
@@ -7,18 +7,11 @@
 /// <reference types="node" />
 
 import * as e from "elasticsearch";
-import { Credentials } from "aws-sdk/lib/core";
+import * as AWS from "aws-sdk";
 
 declare module "elasticsearch" {
-    interface AmazonESOptions {
-        accessKey?: string;
-        credentials?: Credentials;
-        region: string;
-        secretKey?: string;
-    }
-
     interface ConfigOptions {
-        awsConfig?: AmazonESOptions;
+        awsConfig?: AWS.Config;
     }
 }