From e5b650c0c52ccd48f2e52f24d868856df5b0e414 Mon Sep 17 00:00:00 2001 From: sudobangbang Date: Mon, 26 Aug 2024 12:17:59 -0600 Subject: [PATCH] Fold in RDS and Lambda Changes from 1.2.1 Release Two Weeks Ago (#33) * .gitignore * fold in RDS and lambda changes --------- Co-authored-by: ranchodeluxe --- .../lambda_function.py | 16 +--------------- terraform/veda-wfs3/rds.tf | 1 + 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/terraform/veda-wfs3/functions/s3_event_bridge_to_sfn_execute/lambda_function.py b/terraform/veda-wfs3/functions/s3_event_bridge_to_sfn_execute/lambda_function.py index 806e49d..4a15a6f 100644 --- a/terraform/veda-wfs3/functions/s3_event_bridge_to_sfn_execute/lambda_function.py +++ b/terraform/veda-wfs3/functions/s3_event_bridge_to_sfn_execute/lambda_function.py @@ -4,6 +4,7 @@ import base64 import ast import json +#mwaa_env_name = 'veda-pipeline-dev-mwaa' mwaa_env_name = 'veda-pipeline-staging-mwaa' dag_name = 'veda_discover' mwaa_cli_command = 'dags trigger' @@ -20,25 +21,10 @@ def lambda_handler(event, context): s3_filename_no_ext = os.path.splitext(s3_filename_target)[0] print(f"[ S3 FILENAME NO EXT ]: {s3_filename_no_ext}") - if s3_filename_target.endswith(".gpkg"): - return { - 'statusCode': 200, - 'body': json.dumps('Hello from Lambda!') - } - - if s3_event_key.startswith("EIS/FEDSoutput-v3"): - return { - 'statusCode': 200, - 'body': json.dumps('Hello from Lambda!') - } - bucket_key_prefix = "EIS/FEDSoutput/Snapshot/" - if s3_event_key.startswith("EIS/FEDSoutput-v3"): - bucket_key_prefix = "EIS/FEDSoutput-v3/Snapshot/" if s3_filename_no_ext.startswith("lf_"): bucket_key_prefix = "EIS/FEDSoutput/LFArchive/" - # get web token mwaa_cli_token = client.create_cli_token( Name=mwaa_env_name diff --git a/terraform/veda-wfs3/rds.tf b/terraform/veda-wfs3/rds.tf index 05db52c..39b8d28 100644 --- a/terraform/veda-wfs3/rds.tf +++ b/terraform/veda-wfs3/rds.tf @@ -54,6 +54,7 @@ resource "aws_db_instance" "db" { db_subnet_group_name = aws_db_subnet_group.db.name vpc_security_group_ids = module.networking.security_groups_ids skip_final_snapshot = true + ca_cert_identifier = "rds-ca-rsa4096-g1" apply_immediately = true backup_retention_period = 7 username = "postgres"