Updated requirements.txt to use latest can_decoder (removing canmatrix warnings). Also, fixed deployment script to explicitly define region

Author: MatinF

deploy-aws-lambda/arn-layers/requirements.txt

@@ -0,0 +1,33 @@
+aiobotocore==2.1.2
+aiohttp==3.8.1
+aioitertools==0.10.0
+aiosignal==1.2.0
+async-timeout==4.0.2
+attrs==21.4.0
+botocore==1.23.24
+can-decoder>=0.1.5
+canedge-browser>=0.0.8
+canmatrix==0.9.5
+certifi==2021.10.8
+charset-normalizer==2.0.12
+click==8.1.2
+colorama==0.4.4
+frozenlist==1.3.0
+fsspec==2022.2.0
+future==0.18.3
+idna==3.4
+influxdb-client==1.35.0
+jmespath==0.10.0
+mdf-iter>=2.0.4
+multidict==6.0.2
+numpy==1.24.1
+pandas==1.5.3
+python-dateutil==2.8.2
+pytz==2022.1
+s3fs==2022.2.0
+six==1.16.0
+typing-extensions==4.1.1
+urllib3==1.26.9
+wrapt==1.14.0
+yarl==1.7.2
+J1939-PGN==0.4

deploy-aws-lambda/delete_aws_lambda.py

@@ -13,6 +13,14 @@
 # define initial variables
 AWS_ACCESS_KEY = inp.key
 AWS_SECRET_KEY = inp.secret
+
+try:
+    REGION = inp.endpoint.split(".")[1]
+except:
+    print(f"Unable to extract region from {inp.endpoint} - check if correct syntax is used ala http://s3.region.amazonaws.com")
+    print("Exiting script")
+    sys.exit()
+    
 S3_BUCKET = inp.devices[0].split("/")[0]
 
 LAMBDA_ROLE_NAME = "canedge-influxdb-lambda-role"
@@ -33,7 +41,7 @@
 
 # Configure boto3 client
 session = boto3.Session(
-    aws_access_key_id=AWS_ACCESS_KEY, aws_secret_access_key=AWS_SECRET_KEY
+    aws_access_key_id=AWS_ACCESS_KEY, aws_secret_access_key=AWS_SECRET_KEY, region_name=REGION
 )
 
 # Get AWS S3 bucket region
@@ -103,3 +111,5 @@
     print(f"--------------\nRemoved all event triggers from S3 bucket {S3_BUCKET}")
 except Exception as e:
     print(e)
+
+print("\nDeletion completed.")

deploy-aws-lambda/deploy_aws_lambda.py

@@ -18,6 +18,14 @@
 # define initial variables
 AWS_ACCESS_KEY = inp.key
 AWS_SECRET_KEY = inp.secret
+
+try:
+    REGION = inp.endpoint.split(".")[1]
+except:
+    print(f"Unable to extract region from {inp.endpoint} - check if correct syntax is used ala http://s3.region.amazonaws.com")
+    print("Exiting script")
+    sys.exit()
+    
 S3_BUCKET = inp.devices[0].split("/")[0]
 LAMBDA_ROLE_NAME = "canedge-influxdb-lambda-role"
 LAMBDA_FUNCTION_NAME = "canedge-influxdb-writer"
@@ -38,20 +46,20 @@
 )
 print("- Ensure that the S3 credentials in your inputs.py have admin permissions")
 print(
-    "- If you have previously deployed a Lambda function, use the clear_lambda.py to remove it"
+    "- If you have previously deployed a Lambda function, use the deletion script to remove it"
 )
 
 # Configure boto3 client
 session = boto3.Session(
-    aws_access_key_id=AWS_ACCESS_KEY, aws_secret_access_key=AWS_SECRET_KEY
+    aws_access_key_id=AWS_ACCESS_KEY, aws_secret_access_key=AWS_SECRET_KEY, region_name=REGION
 )
 
 # Get AWS S3 bucket region
 s3 = session.client("s3")
 
 try:
     response = s3.get_bucket_location(Bucket=S3_BUCKET)
-    REGION = response["LocationConstraint"]
+    REGION_BUCKET = response["LocationConstraint"]
 except Exception as e:
     print("\n")
     print(e)
@@ -60,14 +68,22 @@
     print("- Please check if the 1st entry in your 'devices' list correctly includes your S3 bucket name")
     print("- Exiting script")
     sys.exit()
+    
+if REGION_BUCKET != REGION:
+    print(f"WARNING: Bucket region is {REGION_BUCKET} and differs from session region {REGION} - please review.")
+    print("- Exiting script")
+
+    sys.exit()
+    
+
 
 # Get AWS account ID
 sts = session.client("sts")
 response = sts.get_caller_identity()
 AWS_ACCOUNT_ID = response["Account"]
 
 print(
-    f"--------------\nConfigured AWS boto3 client and extracted S3 bucket region {REGION} and account ID {AWS_ACCOUNT_ID}"
+    f"--------------\nConfigured AWS boto3 client and account ID {AWS_ACCOUNT_ID}"
 )
 
 temp_dir = tempfile.mkdtemp()
@@ -138,11 +154,8 @@
     print(
         f"--------------\nAttached role policy AmazonS3FullAccess"
     )
-    print("Waiting 10 seconds ...")
-    time.sleep(10)
-  
-    print("Waiting 10 seconds ...")
-    time.sleep(10)
+    print("Waiting 20 seconds ...")
+    time.sleep(20)
 
 # Create the lambda function if it does not already exist
 lambda_client = session.client("lambda")

deploy-aws-lambda/requirements.txt

@@ -5,7 +5,7 @@ aiosignal==1.2.0
 async-timeout==4.0.2
 attrs==21.4.0
 botocore==1.23.24
-can-decoder>=0.1.3
+can-decoder>=0.1.5
 canedge-browser>=0.0.8
 canmatrix==0.9.5
 certifi==2021.10.8