From 93b05d69b764854ba37c1d5a52825c1c25423288 Mon Sep 17 00:00:00 2001
From: Mark <mark.a.mcadam@gmail.com>
Date: Thu, 18 Jun 2020 17:44:07 -0700
Subject: [PATCH] reorganizes the es_session auth credentials

---
 Pipfile.lock       | 37 +++++++++++++++++++------------------
 src/app/queries.py | 20 +++++++++++---------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 8c2d8d2..9ec8b34 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -32,17 +32,18 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:1c37c727e0e6f872f5262a893a1ed5422ef0f1ed6075d35b809e20c3072dad5b"
+                "sha256:6a9cdab2db28330ffa3e6f08bb2bc07bc757d2019e4acf0c8376b72c63e7cc6b",
+                "sha256:f02c0c02f632285da124e560934145de64690000bf6348df8f1eb45239f0e9df"
             ],
             "index": "pypi",
-            "version": "==1.13.25"
+            "version": "==1.14.6"
         },
         "botocore": {
             "hashes": [
-                "sha256:66a92cc8cb070483d1c013748a96b9bf76cfb8dbcba9ffd942dae749e432afe1",
-                "sha256:b55b3acab42b58c24481a9fbb33d53fb7d8d03dfc0338af0132f6c5010006d0d"
+                "sha256:a5737a5215f9db23344752a4d2a43646c104e6d500a2d6f9409624d2e58c92f1",
+                "sha256:c8b5143e2eaac20ce0d7238fd8ef33f7969139ccd616edb54fd3a482cdfd0e6c"
             ],
-            "version": "==1.16.25"
+            "version": "==1.17.6"
         },
         "certifi": {
             "hashes": [
@@ -76,11 +77,11 @@
         },
         "elasticsearch": {
             "hashes": [
-                "sha256:9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c",
-                "sha256:e9138aa9de7624a6c6fbf5d0300bb11617cfe0a056fc6731665748731961d693"
+                "sha256:6fb566dd23b91b5871ce12212888674b4cf33374e92b71b1080916c931e44dcb",
+                "sha256:e637d8cf4e27e279b5ff8ca8edc0c086f4b5df4bf2b48e2f950b7833aca3a792"
             ],
             "index": "pypi",
-            "version": "==7.7.1"
+            "version": "==7.8.0"
         },
         "fastapi": {
             "hashes": [
@@ -136,7 +137,7 @@
                 "sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545",
                 "sha256:15ec6c0fd909e893e3a08b3a7c76ecb149122fb14b7efe1199ddd4c7c57ea958"
             ],
-            "markers": "python_version < '3.8'",
+            "markers": "python_version == '3.7'",
             "version": "==1.6.1"
         },
         "jmespath": {
@@ -148,10 +149,10 @@
         },
         "more-itertools": {
             "hashes": [
-                "sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be",
-                "sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982"
+                "sha256:68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5",
+                "sha256:b78134b2063dd214000685165d81c154522c3ee0a1c0d4d113c80361c234c5a2"
             ],
-            "version": "==8.3.0"
+            "version": "==8.4.0"
         },
         "numpy": {
             "hashes": [
@@ -226,10 +227,10 @@
         },
         "py": {
             "hashes": [
-                "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa",
-                "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0"
+                "sha256:a673fa23d7000440cc885c17dbd34fafcb7d7a6e230b29f6766400de36a33c44",
+                "sha256:f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b"
             ],
-            "version": "==1.8.1"
+            "version": "==1.8.2"
         },
         "pydantic": {
             "hashes": [
@@ -287,11 +288,11 @@
         },
         "requests": {
             "hashes": [
-                "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee",
-                "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
+                "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b",
+                "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"
             ],
             "index": "pypi",
-            "version": "==2.23.0"
+            "version": "==2.24.0"
         },
         "requests-aws4auth": {
             "hashes": [
diff --git a/src/app/queries.py b/src/app/queries.py
index 407ce84..213c7d1 100644
--- a/src/app/queries.py
+++ b/src/app/queries.py
@@ -13,17 +13,19 @@
 region = os.environ["REGION"]
 service = "es"
 
-class ESConnection(AWSAuthConnection):
-    def __init__(self, region, **kwargs):
-        super(ESConnection, self).__init__(**kwargs)
-        self._set_auth_region_name(region)
-        self._set_auth_service_name("es")
+session = boto3.Session()
+credentials = session.get_credentials()
 
+awsauth = AssumeRoleAWS4Auth(credentials, region, service)
+
+es = Elasticsearch(
+    hosts=[host],
+    http_auth=awsauth,
+    use_ssl=True,
+    verify_certs=True,
+    connection_class=RequestsHttpConnection,
+)
 
-es = ESConnection(
-    region=region, 
-    host=host,
-    is_secure=False)
 
 # es = Elasticsearch()