CCM-8861: Fixes to environment variables and logging

Author: chris-elliott-nhsd

infrastructure/terraform/modules/backend-api/module_lambda_sftp_poll.tf

@@ -12,12 +12,12 @@ module "lambda_sftp_poll" {
   execution_role_policy_document = data.aws_iam_policy_document.sftp_poll.json
 
   environment_variables = {
-    CREDENTIALS_TTL_MS     = 900 * 1000
-    CSI                    = local.csi
-    QUARANTINE_BUCKET_NAME = module.s3bucket_quarantine.id
-    NODE_OPTIONS           = "--enable-source-maps",
-    REGION                 = var.region
-    SFTP_ENVIRONMENT       = local.sftp_environment
+    CREDENTIALS_TTL_SECONDS = 900
+    CSI                     = local.csi
+    QUARANTINE_BUCKET_NAME  = module.s3bucket_quarantine.id
+    NODE_OPTIONS            = "--enable-source-maps",
+    REGION                  = var.region
+    SFTP_ENVIRONMENT        = local.sftp_environment
   }
 
   timeout = 20

lambdas/sftp-letters/src/app/poll.ts

@@ -18,6 +18,11 @@ export class App {
     copyPath: string,
     pastePath: string
   ) {
+    this.logger.info({
+      description: 'Copying folder',
+      copyPath,
+      pastePath,
+    });
     const isDir = (await sftpClient.exists(copyPath)) === 'd';
 
     if (!isDir) {
@@ -29,11 +34,6 @@ export class App {
 
     for (const sftpFile of sftpFiles) {
       if (sftpFile.type === 'd') {
-        this.logger.info({
-          description: 'Copying folder',
-          copyPath,
-          pastePath,
-        });
         await this.copyFolder(
           sftpClient,
           `${copyPath}/${sftpFile.name}`,
@@ -42,7 +42,6 @@ export class App {
       }
 
       if (sftpFile.type === '-') {
-        this.logger.info({ description: 'Copying file', copyPath, pastePath });
         await this.copyFile(
           sftpClient,
           `${copyPath}/${sftpFile.name}`,
@@ -70,6 +69,7 @@ export class App {
     copyPath: string,
     pastePath: string
   ) {
+    this.logger.info({ description: 'Copying file', copyPath, pastePath });
     try {
       const data = (await sftpClient.get(copyPath)) as Buffer;