Merge pull request #445 from aws-samples/xuhan-dev

fix: fix credential mismatch for opensearch
aws-samples · Nov 28, 2024 · 8146b0d · 8146b0d
2 parents 292ee45 + fbd244c
commit 8146b0d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/source/lambda/intention/intention.py b/source/lambda/intention/intention.py
@@ -75,6 +75,12 @@
     aos_client = LLMBotOpenSearchClient(aos_endpoint).client
     awsauth = AWS4Auth(refreshable_credentials=credentials,
                    region=region, service="es")
+except sm_client.exceptions.InvalidRequestException:
+    logger.info("InvalidRequestException. It might caused by getting secret value from a deleting secret")
+    logger.info("Fallback to authentication with IAM")
+    aos_client = LLMBotOpenSearchClient(aos_endpoint).client
+    awsauth = AWS4Auth(refreshable_credentials=credentials,
+                   region=region, service="es")
 except Exception as err:
     logger.error("Error retrieving secret '%s': %s", aos_secret, str(err))
     raise

diff --git a/source/lambda/job/glue-job-script.py b/source/lambda/job/glue-job-script.py
@@ -150,6 +150,10 @@ def get_aws_auth():
 
     except sm_client.exceptions.ResourceNotFoundException:
         aws_auth = AWS4Auth(refreshable_credentials=credentials, region=region, service="es")
+    except sm_client.exceptions.InvalidRequestException:
+        logger.info("InvalidRequestException. It might caused by getting secret value from a deleting secret")
+        logger.info("Fallback to authentication with IAM")
+        aws_auth = AWS4Auth(refreshable_credentials=credentials, region=region, service="es")
     except Exception as e:
         logger.error(f"Error retrieving secret '{aos_secret}': {str(e)}")
         raise

diff --git a/source/lambda/online/common_logic/langchain_integration/retrievers/utils/aos_retrievers.py b/source/lambda/online/common_logic/langchain_integration/retrievers/utils/aos_retrievers.py
@@ -46,6 +46,10 @@
 except sm_client.exceptions.ResourceNotFoundException:
     logger.info(f"Secret '{aos_secret}' not found in Secrets Manager")
     aos_client = LLMBotOpenSearchClient(aos_endpoint)
+except sm_client.exceptions.InvalidRequestException:
+    logger.info("InvalidRequestException. It might caused by getting secret value from a deleting secret")
+    logger.info("Fallback to authentication with IAM")
+    aos_client = LLMBotOpenSearchClient(aos_endpoint)
 except Exception as e:
     logger.error(f"Error retrieving secret '{aos_secret}': {str(e)}")
     raise