Addressed review comments - Updated IDF open search module version, A…

…dded Port as configurable parameter
awslabs · May 23, 2024 · ad0e94d · ad0e94d
1 parent d3ab066
commit ad0e94d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/manifests/fmops-qna-rag/storage-modules.yaml b/manifests/fmops-qna-rag/storage-modules.yaml
@@ -1,6 +1,6 @@
 ---
 name: opensearch
-path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch/
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch?ref=release/1.7.0&depth=1
 targetAccount: primary
 targetRegion: us-east-1
 parameters:

diff --git a/manifests/storage-modules.yaml b/manifests/storage-modules.yaml
@@ -53,7 +53,7 @@ parameters:
     value: DESTROY
 ---
 name: opensearch
-path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch/
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch?ref=release/1.7.0&depth=1
 targetAccount: primary
 targetRegion: us-east-1
 parameters:

diff --git a/modules/fmops/qna-rag/app.py b/modules/fmops/qna-rag/app.py
@@ -19,6 +19,7 @@ def _param(name: str) -> str:
 vpc_id = os.getenv(_param("VPC_ID"))
 cognito_pool_id = os.getenv(_param("COGNITO_POOL_ID"))
 os_domain_endpoint = os.getenv(_param("OS_DOMAIN_ENDPOINT"))
+os_domain_port = os.getenv(_param("OS_DOMAIN_PORT"), "443")
 os_security_group_id = os.getenv(_param("OS_SECURITY_GROUP_ID"))
 input_asset_bucket_name = os.getenv(_param("INPUT_ASSET_BUCKET"))
 
@@ -42,6 +43,7 @@ def _param(name: str) -> str:
     vpc_id=vpc_id,
     cognito_pool_id=cognito_pool_id,
     os_domain_endpoint=os_domain_endpoint,
+    os_domain_port=os_domain_port,
     os_security_group_id=os_security_group_id,
     os_index_name="rag-index",
     input_asset_bucket_name=input_asset_bucket_name,

diff --git a/modules/fmops/qna-rag/stack.py b/modules/fmops/qna-rag/stack.py
@@ -22,6 +22,7 @@ def __init__(
         vpc_id: str,
         cognito_pool_id: str,
         os_domain_endpoint: str,
+        os_domain_port: str,
         os_security_group_id: str,
         os_index_name: str,
         input_asset_bucket_name: Optional[str],
@@ -95,7 +96,7 @@ def __init__(
         )
         os_security_group.add_ingress_rule(
             peer=security_group,
-            connection=ec2.Port.tcp(443),
+            connection=ec2.Port.tcp(int(os_domain_port)),
             description="Allow inbound HTTPS to open search from embeddings lambda and question answering lambda",
         )
 

diff --git a/modules/fmops/qna-rag/tests/test_stack.py b/modules/fmops/qna-rag/tests/test_stack.py
@@ -38,6 +38,7 @@ def stack_model_package_input() -> cdk.Stack:
         vpc_id=vpc_id,
         cognito_pool_id=cognito_pool_id,
         os_domain_endpoint=os_domain_endpoint,
+        os_domain_port="443",
         os_security_group_id=os_security_group_id,
         os_index_name="sample",
         input_asset_bucket_name="input-bucket",