Fix: Error related to saving subrecipients for treasury-report genera…

…tion (#454) * fix: naming and permissions * fix: ensure lambdas have access to get and put subrecipients file
usdigitalresponse · Sep 27, 2024 · 80cae1e · 80cae1e
1 parent 2fd8210
commit 80cae1e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/api/src/functions/processValidationJson/processValidationJson.ts b/api/src/functions/processValidationJson/processValidationJson.ts
@@ -223,7 +223,7 @@ export const processRecord = async (
       }
 
       try {
-        const subrecipientKey = `treasuryreports/${organizationId}/${reportingPeriod.id}/subrecipients`
+        const subrecipientKey = `treasuryreports/${organizationId}/${reportingPeriod.id}/subrecipients.json`
         const { startDate, endDate } = reportingPeriod
         const subrecipientsWithUploads = await db.subrecipient.findMany({
           where: { createdAt: { lte: endDate, gte: startDate } },

diff --git a/python/src/functions/subrecipient_treasury_report_gen.py b/python/src/functions/subrecipient_treasury_report_gen.py
@@ -98,7 +98,7 @@ def process_event(
                 download_s3_object(
                     client=s3_client,
                     bucket=os.environ["REPORTING_DATA_BUCKET_NAME"],
-                    key=f"treasuryreports/{organization_id}/{reporting_period_id}/subrecipients",
+                    key=f"treasuryreports/{organization_id}/{reporting_period_id}/subrecipients.json",
                     destination=recent_subrecipients_file,
                 )
             except ClientError as e:
@@ -224,7 +224,7 @@ def upload_workbook(
     Handles upload of workbook to S3, both in xlsx and csv formats
     """
 
-    with tempfile.NamedTemporaryFile("w") as new_xlsx_file:
+    with tempfile.NamedTemporaryFile("rb+") as new_xlsx_file:
         workbook.save(new_xlsx_file.name)
         upload_generated_file_to_s3(
             s3client,
@@ -237,7 +237,7 @@ def upload_workbook(
             new_xlsx_file,
         )
 
-    with tempfile.NamedTemporaryFile("w") as new_csv_file:
+    with tempfile.NamedTemporaryFile("r+") as new_csv_file:
         convert_xlsx_to_csv(
             new_csv_file,
             workbook,

diff --git a/terraform/functions.tf b/terraform/functions.tf
@@ -438,6 +438,17 @@ module "lambda_function-processValidationJson" {
         "${module.reporting_data_bucket.bucket_arn}/uploads/*/*/*/*/*.json",
       ]
     }
+    AllowUploadSubrecipientsFile = {
+      effect = "Allow"
+      actions = [
+        "s3:PutObject",
+      ]
+      resources = [
+        # These are temporary files shared across services containing subrecipient data.
+        # Path: treasuryreports/{organization_id}/{reporting_period_id}/subrecipients.json
+        "${module.reporting_data_bucket.bucket_arn}/treasuryreports/*/*/subrecipients.json",
+      ]
+    }
   }
 
   // Artifacts

diff --git a/terraform/treasury_generation_lambda_functions.tf b/terraform/treasury_generation_lambda_functions.tf
@@ -46,8 +46,8 @@ module "lambda_function-subrecipientTreasuryReportGen" {
       ]
       resources = [
         # These are temporary files shared across services containing subrecipient data.
-        # Path: /{organization_id}/{reporting_period_id}/subrecipients
-        "${module.reporting_data_bucket.bucket_arn}/*/*/subrecipients",
+        # Path: treasuryreports/{organization_id}/{reporting_period_id}/subrecipients.json
+        "${module.reporting_data_bucket.bucket_arn}/treasuryreports/*/*/subrecipients.json",
       ]
     }
     AllowDownloadTreasuryOutputTemplates = {