Merge pull request #31 from awslabs/release/1.1.3

fix: Remove dependency for us-east-1, add environment variable for de…
awslabs · Dec 19, 2023 · f598ef3 · f598ef3
2 parents 3752a76 + 6e7a1c3
commit f598ef3
Show file tree

Hide file tree

Showing 21 changed files with 178 additions and 126 deletions.
diff --git a/api/archive/archive/main.py b/api/archive/archive/main.py
@@ -21,6 +21,8 @@
 import datetime
 import uuid
 
+REGION = os.getenv("REGION")
+
 # region Logging
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
@@ -35,7 +37,7 @@
 
 # endregion
 
-dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+dynamodb = boto3.resource('dynamodb', region_name=REGION)
 ssm = boto3.client('ssm')
 
 

diff --git a/api/archive/expiration/main.py b/api/archive/expiration/main.py
@@ -21,6 +21,8 @@
 import traceback
 from datetime import datetime
 
+REGION = os.getenv("REGION")
+
 # region Logging
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
@@ -69,7 +71,7 @@ def build_response(http_code, body):
 def lambda_handler(event, context):
     logger.info(mask_sensitive_data(event))
 
-    dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+    dynamodb = boto3.resource('dynamodb', region_name=REGION)
 
     body = json.loads(
         event["body"]) if "body" in event else json.loads(event)

diff --git a/api/archive/legal/main.py b/api/archive/legal/main.py
@@ -19,9 +19,11 @@
 import os
 import traceback
 
+REGION = os.getenv("REGION")
+
 s3 = boto3.resource('s3')
 s3_client = boto3.client('s3')
-dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+dynamodb = boto3.resource('dynamodb', region_name=REGION)
 ssm = boto3.client('ssm')
 
 # region Logging

diff --git a/api/archive/validate/main.py b/api/archive/validate/main.py
@@ -21,6 +21,8 @@
 import datetime
 import uuid
 
+REGION = os.getenv("REGION")
+
 # region Logging
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
@@ -64,7 +66,7 @@ def build_response(http_code, body):
 
 def lambda_handler(event, context):
     logger.info(mask_sensitive_data(event))
-    dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+    dynamodb = boto3.resource('dynamodb', region_name=REGION)
     ssm = boto3.client('ssm')
 
     try:

diff --git a/api/archives/list/main.py b/api/archives/list/main.py
@@ -21,6 +21,7 @@
 
 from decimal import Decimal
 
+REGION = os.getenv("REGION")
 
 class DecimalEncoder(json.JSONEncoder):
     def default(self, obj):
@@ -42,7 +43,7 @@ def default(self, obj):
 # endregion
 
 ssm = boto3.client('ssm')
-dynamodb = boto3.resource('dynamodb', region_name="us-east-1")
+dynamodb = boto3.resource('dynamodb', region_name=REGION)
 
 def mask_sensitive_data(event):
     # remove sensitive data from request object before logging

diff --git a/api/job/run/main.py b/api/job/run/main.py
@@ -20,6 +20,8 @@
 import traceback
 import uuid
 
+REGION = os.getenv("REGION")
+
 # region Logging
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
@@ -36,7 +38,7 @@
 
 ssm = boto3.client('ssm')
 client = boto3.client('stepfunctions')
-dynamodb = boto3.resource('dynamodb', region_name='us-east-1')
+dynamodb = boto3.resource('dynamodb', region_name=REGION)
 
 def mask_sensitive_data(event):
     # remove sensitive data from request object before logging

diff --git a/deploy/package-lock.json b/deploy/package-lock.json