Merge pull request #634 from umccr/bugfix/upgrade-lambda-mem-sizes

umccr · Nov 2, 2024 · 6da7013 · 6da7013
2 parents 27f5e3b + 7121cb4
commit 6da7013
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/...cstackface/glue-constructs/nails/part_2/cttso-v2-output-to-pieriandx-ready-event/index.ts b/...cstackface/glue-constructs/nails/part_2/cttso-v2-output-to-pieriandx-ready-event/index.ts
@@ -13,7 +13,9 @@ Given a cttsov2 success event we need to
 import { Construct } from 'constructs';
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
 import path from 'path';
+import { NagSuppressions } from 'cdk-nag';
 import * as sfn from 'aws-cdk-lib/aws-stepfunctions';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
 import * as secretsManager from 'aws-cdk-lib/aws-secretsmanager';
 import * as events from 'aws-cdk-lib/aws-events';
@@ -107,6 +109,7 @@ export class Cttsov2CompleteToPieriandxConstruct extends Construct {
       index: 'get_data_from_redcap.py',
       handler: 'handler',
       timeout: Duration.seconds(60),
+      memorySize: 2048,
     });
 
     const getDeidentifiedCaseMetadataPyLambdaObj = new PythonFunction(
@@ -118,6 +121,7 @@ export class Cttsov2CompleteToPieriandxConstruct extends Construct {
         architecture: lambda.Architecture.ARM_64,
         index: 'get_deidentified_case_metadata.py',
         handler: 'handler',
+        memorySize: 1024,
       }
     );
     const getIdentifiedCaseMetadataPyLambdaObj = new PythonFunction(
@@ -129,6 +133,7 @@ export class Cttsov2CompleteToPieriandxConstruct extends Construct {
         architecture: lambda.Architecture.ARM_64,
         index: 'get_identified_case_metadata.py',
         handler: 'handler',
+        memorySize: 1024,
       }
     );
     const getPieriandxDataFilesPyLambdaObj = new PythonFunction(
@@ -144,6 +149,7 @@ export class Cttsov2CompleteToPieriandxConstruct extends Construct {
         environment: {
           ICAV2_ACCESS_TOKEN_SECRET_ID: props.icav2AccessTokenSecretObj.secretName,
         },
+        memorySize: 1024,
       }
     );
     const getProjectInfoPyLambdaObj = new PythonFunction(this, 'getProjectInfoPyLambdaObj', {
@@ -157,11 +163,22 @@ export class Cttsov2CompleteToPieriandxConstruct extends Construct {
     /*
     Handle lambda permissions
     */
-    props.redcapLambdaObj.latestVersion.grantInvoke(getDataFromRedCapPyLambdaObj.currentVersion);
+    props.redcapLambdaObj.grantInvoke(getDataFromRedCapPyLambdaObj.currentVersion);
     getDataFromRedCapPyLambdaObj.addEnvironment(
       'REDCAP_LAMBDA_FUNCTION_NAME',
       props.redcapLambdaObj.functionName
     );
+    // FIXME - cannot get the 'current' version of an IFunction object
+    NagSuppressions.addResourceSuppressions(
+      getDataFromRedCapPyLambdaObj,
+      [
+        {
+          id: 'AwsSolutions-IAM5',
+          reason: 'Cannot get latest version of redcap lambda function ($LATEST) will not work',
+        },
+      ],
+      true
+    );
 
     // Allow the getPieriandxDataFilesPyLambdaObj to read the secret
     props.icav2AccessTokenSecretObj.grantRead(getPieriandxDataFilesPyLambdaObj.currentVersion);

diff --git a/...2-output-to-pieriandx-ready-event/lambdas/get_data_from_redcap_py/get_data_from_redcap.py b/...2-output-to-pieriandx-ready-event/lambdas/get_data_from_redcap_py/get_data_from_redcap.py
@@ -7,6 +7,7 @@
 """
 
 # Standard imports
+import logging
 import typing
 from typing import List
 from time import sleep
@@ -18,14 +19,14 @@
 import json
 import pytz
 from datetime import datetime
-import logging
 
 if typing.TYPE_CHECKING:
     from mypy_boto3_lambda import LambdaClient
 
 # Set logger
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
+logger.setLevel(level=logging.INFO)
 
 # Globals
 AUS_TIMEZONE = pytz.timezone("Australia/Melbourne")
@@ -86,6 +87,7 @@ def warm_up_lambda():
         )
         return True
     except ClientError as e:
+        print(f"Error warming up lambda: {e}")
         logger.info(f"Error warming up lambda: {e}")
         return False
 
@@ -287,8 +289,10 @@ def handler(event, context) -> Dict:
     :return:
     """
     # Wait for lambda to warm up
+    logger.info("Warming up redcap lambda")
     while not warm_up_lambda():
         sleep(10)
+    logger.info("Redcap lambda warmup complete!")
 
     # Return
     try:
@@ -320,6 +324,25 @@ def handler(event, context) -> Dict:
 #             indent=4
 #         )
 #     )
+
+
+# if __name__ == '__main__':
+#     # Or 'umccr-staging' / 'umccr-production'
+#     environ['AWS_PROFILE'] = 'umccr-development'
+#     environ['AWS_REGION'] = 'ap-southeast-2'
+#     # Or 'redcap-apis-stg-lambda-function' / 'redcap-apis-prod-lambda-function'
+#     environ['REDCAP_LAMBDA_FUNCTION_NAME'] = 'redcap-apis-dev-lambda-function'
+#     print(
+#         json.dumps(
+#             handler(
+#                 event={
+#                     "library_id": "L2401529"
+#                 },
+#                 context=None
+#             ),
+#             indent=4
+#         )
+#     )
 #
 # # {
 # #     "redcap_data": {

diff --git a/...x-ready-event/lambdas/get_deidentified_case_metadata_py/get_deidentified_case_metadata.py b/...x-ready-event/lambdas/get_deidentified_case_metadata_py/get_deidentified_case_metadata.py
@@ -28,7 +28,6 @@
 """
 
 # Imports
-import typing
 from typing import Dict
 
 import pytz
@@ -43,7 +42,7 @@
 # Globals
 AUS_TIMEZONE = pytz.timezone("Australia/Melbourne")
 AUS_TIME = datetime.now(AUS_TIMEZONE)
-AUS_TIME_AS_STR = f"{AUS_TIME.date().isoformat()}T{AUS_TIME.time().isoformat(timespec='seconds')}{AUS_TIME.strftime("%z")}"
+AUS_TIME_AS_STR = f"{AUS_TIME.date().isoformat()}T{AUS_TIME.time().isoformat(timespec='seconds')}{AUS_TIME.strftime('%z')}"
 
 DEFAULT_INDICATION = "NA"