Updated ARN layers to enable support for new Lambda deployments (update to botocore required updated dependencies)

Author: MatinF

deploy-aws-lambda/arn-layers/lambda_layer_arns.csv

@@ -1,17 +1,17 @@
-ap-northeast-1,arn:aws:lambda:ap-northeast-1:319723967016:layer:canedge-influxdb-writer-2:10
-ap-northeast-2,arn:aws:lambda:ap-northeast-2:319723967016:layer:canedge-influxdb-writer-2:10
-ap-northeast-3,arn:aws:lambda:ap-northeast-3:319723967016:layer:canedge-influxdb-writer-2:10
-ap-south-1,arn:aws:lambda:ap-south-1:319723967016:layer:canedge-influxdb-writer-2:10
-ap-southeast-1,arn:aws:lambda:ap-southeast-1:319723967016:layer:canedge-influxdb-writer-2:10
-ap-southeast-2,arn:aws:lambda:ap-southeast-2:319723967016:layer:canedge-influxdb-writer-2:10
-ca-central-1,arn:aws:lambda:ca-central-1:319723967016:layer:canedge-influxdb-writer-2:10
-eu-central-1,arn:aws:lambda:eu-central-1:319723967016:layer:canedge-influxdb-writer-2:12
-eu-north-1,arn:aws:lambda:eu-north-1:319723967016:layer:canedge-influxdb-writer-2:12
-eu-west-1,arn:aws:lambda:eu-west-1:319723967016:layer:canedge-influxdb-writer-2:10
-eu-west-2,arn:aws:lambda:eu-west-2:319723967016:layer:canedge-influxdb-writer-2:10
-eu-west-3,arn:aws:lambda:eu-west-3:319723967016:layer:canedge-influxdb-writer-2:10
-sa-east-1,arn:aws:lambda:sa-east-1:319723967016:layer:canedge-influxdb-writer-2:10
-us-east-1,arn:aws:lambda:us-east-1:319723967016:layer:canedge-influxdb-writer-2:10
-us-east-2,arn:aws:lambda:us-east-2:319723967016:layer:canedge-influxdb-writer-2:10
-us-west-1,arn:aws:lambda:us-west-1:319723967016:layer:canedge-influxdb-writer-2:10
-us-west-2,arn:aws:lambda:us-west-2:319723967016:layer:canedge-influxdb-writer-2:10
+ap-northeast-1,arn:aws:lambda:ap-northeast-1:319723967016:layer:canedge-influxdb-writer-2:11
+ap-northeast-2,arn:aws:lambda:ap-northeast-2:319723967016:layer:canedge-influxdb-writer-2:11
+ap-northeast-3,arn:aws:lambda:ap-northeast-3:319723967016:layer:canedge-influxdb-writer-2:11
+ap-south-1,arn:aws:lambda:ap-south-1:319723967016:layer:canedge-influxdb-writer-2:11
+ap-southeast-1,arn:aws:lambda:ap-southeast-1:319723967016:layer:canedge-influxdb-writer-2:11
+ap-southeast-2,arn:aws:lambda:ap-southeast-2:319723967016:layer:canedge-influxdb-writer-2:11
+ca-central-1,arn:aws:lambda:ca-central-1:319723967016:layer:canedge-influxdb-writer-2:11
+eu-central-1,arn:aws:lambda:eu-central-1:319723967016:layer:canedge-influxdb-writer-2:16
+eu-north-1,arn:aws:lambda:eu-north-1:319723967016:layer:canedge-influxdb-writer-2:17
+eu-west-1,arn:aws:lambda:eu-west-1:319723967016:layer:canedge-influxdb-writer-2:11
+eu-west-2,arn:aws:lambda:eu-west-2:319723967016:layer:canedge-influxdb-writer-2:11
+eu-west-3,arn:aws:lambda:eu-west-3:319723967016:layer:canedge-influxdb-writer-2:11
+sa-east-1,arn:aws:lambda:sa-east-1:319723967016:layer:canedge-influxdb-writer-2:11
+us-east-1,arn:aws:lambda:us-east-1:319723967016:layer:canedge-influxdb-writer-2:11
+us-east-2,arn:aws:lambda:us-east-2:319723967016:layer:canedge-influxdb-writer-2:11
+us-west-1,arn:aws:lambda:us-west-1:319723967016:layer:canedge-influxdb-writer-2:11
+us-west-2,arn:aws:lambda:us-west-2:319723967016:layer:canedge-influxdb-writer-2:11

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

@@ -1,33 +1,34 @@
-aiobotocore==2.1.2
+aiobotocore==2.5.0
 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.9
+botocore==1.29.76
+can_decoder>=0.1.9
 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
+fsspec==2023.4.0
 future==0.18.3
 idna==3.4
 influxdb-client==1.35.0
+J1939-PGN==0.4
 jmespath==0.10.0
-mdf-iter>=2.0.5
+mdf_iter>=2.0.5
 multidict==6.0.2
 numpy==1.24.1
 pandas==1.5.3
 python-dateutil==2.8.2
 pytz==2022.1
-s3fs==2022.2.0
+reactivex==4.0.4
+s3fs==2023.4.0
 six==1.16.0
-typing-extensions==4.1.1
+typing_extensions==4.1.1
 urllib3==1.26.9
 wrapt==1.14.0
 yarl==1.7.2
-J1939-PGN==0.4

requirements.txt

@@ -1,33 +1,34 @@
-aiobotocore==2.1.2
+aiobotocore==2.5.0
 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.9
+botocore==1.29.76
+can_decoder>=0.1.9
 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
+fsspec==2023.4.0
 future==0.18.3
 idna==3.4
 influxdb-client==1.35.0
+J1939-PGN==0.4
 jmespath==0.10.0
-mdf-iter>=2.0.5
+mdf_iter>=2.0.5
 multidict==6.0.2
 numpy==1.24.1
 pandas==1.5.3
 python-dateutil==2.8.2
 pytz==2022.1
-s3fs==2022.2.0
+reactivex==4.0.4
+s3fs==2023.4.0
 six==1.16.0
-typing-extensions==4.1.1
+typing_extensions==4.1.1
 urllib3==1.26.9
 wrapt==1.14.0
 yarl==1.7.2
-J1939-PGN==0.4

utils.py

@@ -498,7 +498,7 @@ def combine_tp_frames(self, df_raw):
                     df_raw_res_id_new = pd.DataFrame(frame_list, columns=base_frame.index, index=frame_timestamp_list)
                     df_raw.append(df_raw_res_id_new)
 
-        df_raw = pd.concat(df_raw,join='inner')
+        df_raw = pd.concat(df_raw,join='outer')
         df_raw.index.name = "TimeStamp"
         df_raw = df_raw.sort_index()
         return df_raw