es github env variable

deepjyotk · Apr 17, 2024 · 03a9339 · 03a9339
1 parent 401a9e9
commit 03a9339
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ cdk.out
 local-packages/*
 layers/*
 layers/** 
-venv/*
+venv/*
+local/*
diff --git a/lambdas/ImageInquiry-lf1-frmCDK/ImageInquiry-lf1-frmCDK.py b/lambdas/ImageInquiry-lf1-frmCDK/ImageInquiry-lf1-frmCDK.py
@@ -52,15 +52,15 @@ def lambda_handler(event, context):
 
         # Prepare for OpenSearch index
         host = os.environ.get("OPENSEARCH_HOST_ENDPOINT")
-        esUsername = os.environ['esUsername']
-        esPassword = os.environ['esPassword']
-        logger.debug(f"OpenSearch credentials retrieved: {esUsername}")
+        ESUSERNAME = os.environ['ESUSERNAME']
+        ESPASSWORD = os.environ['ESPASSWORD']
+        logger.debug(f"OpenSearch credentials retrieved: {ESUSERNAME}")
 
 
         if len(custom_labels) > 0:
             labels.extend(custom_labels) 
 
-        auth = (esUsername, esPassword)
+        auth = (ESUSERNAME, ESPASSWORD)
         INDEX_NAME = "photo-label"
         esEndPoint = os.environ["OPENSEARCH_HOST_ENDPOINT"]
 

diff --git a/lambdas/ImageInquiry-lf2-frmCDK/ImageInquiry-lf2-frmCDK.py b/lambdas/ImageInquiry-lf2-frmCDK/ImageInquiry-lf2-frmCDK.py
@@ -83,8 +83,8 @@ def get_photo_path(keys):
     print(f"Host is: {host}")
 
     auth = (
-            os.environ['esUsername'],
-           os.environ['esPassword']
+            os.environ['ESUSERNAME'],
+           os.environ['ESPASSWORD']
     )
 
 

diff --git a/lf1_image_indexing/lf1_image_indexing_stack.py b/lf1_image_indexing/lf1_image_indexing_stack.py
@@ -95,9 +95,9 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                                      layers=[layer1],
                                      timeout= Duration.minutes(10),
                                        environment={
-                                         'OPENSEARCH_HOST_ENDPOINT': 'search-photo-label-os-domain-mdmhp5yj32skks62nywaguso7i.us-east-1.es.amazonaws.com',
-                                         'esUsername': 'deepjyot',
-                                         'esPassword': 'Deep@123'
+                                         'OPENSEARCH_HOST_ENDPOINT': os.environ['OPENSEARCH_HOST_ENDPOINT'],
+                                         'ESUSERNAME': os.environ['ESUSERNAME'],
+                                         'ESPASSWORD': os.environ['ESPASSWORD'],
                                      }
                                      )
         lambda_fn2 = lambda_.Function(self, "ImageInquiry-lf2-frmCDK",
@@ -109,9 +109,9 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                                      layers=[layer2],
                                      timeout= Duration.minutes(10),
                                        environment={
-                                         'OPENSEARCH_HOST_ENDPOINT': 'search-photo-label-os-domain-mdmhp5yj32skks62nywaguso7i.us-east-1.es.amazonaws.com',
-                                         'esUsername': 'deepjyot',
-                                         'esPassword': 'Deep@123'
+                                          'OPENSEARCH_HOST_ENDPOINT': os.environ['OPENSEARCH_HOST_ENDPOINT'],
+                                         'ESUSERNAME': os.environ['ESUSERNAME'],
+                                         'ESPASSWORD': os.environ['ESPASSWORD'],
                                      }
                                      )
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,6 @@
 aws-cdk-lib==2.137.0
-constructs>=10.0.0,<11.0.0
+constructs>=10.0.0,<11.0.0
+opensearch-py==2.5.0
+requests-aws4auth==1.2.3
+utils==1.0.2
+elasticsearch==7.13.4