Merge branch 'master'

Author: almas-liaqat

lambda_typescript/src/index.ts

@@ -6,7 +6,7 @@ export const handler = async (event: any): Promise<any> => {
   const operation = event.httpMethod;
   const dynamoDBTableName = process.env.DYNAMODB_TABLE_NAME || 'DefaultTableName';
 
-  if (operation === 'POST') {
+  if (operation === 'POST' && event.path === '/event') {
     // Handle the POST request to create a new item
     const params = {
       TableName: dynamoDBTableName,
@@ -26,7 +26,7 @@ export const handler = async (event: any): Promise<any> => {
         body: JSON.stringify('Error creating the item.'),
       };
     }
-  } else if (operation === 'GET') {
+  } else if (operation === 'GET' && event.path === '/event') {
     // Handle the GET request to retrieve an item
     const params = {
       TableName: dynamoDBTableName,
@@ -55,7 +55,7 @@ export const handler = async (event: any): Promise<any> => {
         body: JSON.stringify('Error retrieving the item.'),
       };
     }
-  } else if (operation === 'DELETE') {
+  } else if (operation === 'DELETE' && event.path === '/event') {
     // Handle the DELETE request to delete an item
     const params = {
       TableName: dynamoDBTableName,

openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.0.0"
+  }
+}

terraform/batch-processing.tf

@@ -3,4 +3,5 @@ module "batch-processing" {
     environment = local.environment
     prefix = local.prefix
     short_prefix = local.short_prefix
+    service_domain_name = module.api_gateway.service_domain_name
 }

terraform/batch-processing/lambda.tf

@@ -16,4 +16,12 @@ resource "aws_lambda_function" "batch_processing_lambda" {
     handler          = "batch_processing.lambda_handler"
     runtime          = "python3.9"
     source_code_hash = data.archive_file.lambda_zip.output_base64sha256
+
+    environment {
+    variables = {
+      "SERVICE_DOMAIN_NAME" : var.service_domain_name
+    }
+  }
 }
+
+

terraform/batch-processing/src/batch_processing.py

@@ -1,20 +1,88 @@
+import http.client
 from time import time
 from boto3 import resource
+import json
+import uuid
+import os
 
 
-def lambda_handler(_event, _context):
-    source_bucket_name = _event.get("Records")[0].get("s3").get("bucket").get("name")
-    dest_bucket_name = source_bucket_name.replace("source", "destination")
-    output_bucket = resource('s3').Bucket(dest_bucket_name)
+def lambda_handler(event, context):
+    if "Records" in event and isinstance(event["Records"], list) and len(event["Records"]) > 0:
+        response_list = []
 
-    # Write some placeholder bytestring data to a file in the bucket,
-    # so we can test that the lambda writes to the correct output bucket.
-    filename = f"output_report_{time()}.txt"
-    data = (b'Test file to see if the lambda writes to the correct s3 bucket. '
-            b'If our AWS bill skyrockets, this file has been written to the wrong bucket!')
+        for obj in event["Records"]:
+            s3_record = obj["s3"]
+            if "bucket" in s3_record and isinstance(s3_record["bucket"], dict):
+                source_bucket_name = s3_record["bucket"].get("name")
 
-    output_bucket.put_object(Body=data, Key=filename)
+                if "object" in s3_record and isinstance(s3_record["object"], dict):
+                    dest_bucket_name = source_bucket_name.replace("source", "destination")
+                    output_bucket = resource('s3').Bucket(dest_bucket_name)
+                    api_gateway_url = os.getenv("SERVICE_DOMAIN_NAME")
+                    object_path = s3_record["object"]
 
-    return {
-        'statusCode': 200
-    }
+                    try:
+                        headers = {
+                            "Content-Type": "application/json",
+                            "User-Agent": "batch-processing-lambda"
+                        }
+
+                        request_body = json.dumps(object_path)
+                        filename = f"output_report_{time()}.txt"
+                        request_id = str(uuid.uuid4())
+
+                        payload_for_output_bucket = {
+                            "timestamp": filename,
+                            "level": request_body,
+                            "request": {
+                                "x-request-id": request_id,
+                                "x-correlation-id": request_id
+                            }
+                        }
+
+                        payload_for_api_gateway = {
+                            "id": request_id,
+                            "message": request_body
+                        }
+
+                        payload_bytes_output_bucket = json.dumps(payload_for_output_bucket).encode('utf-8')
+                        payload_bytes_api_gateway = json.dumps(payload_for_api_gateway).encode('utf-8')
+
+                        connection = http.client.HTTPSConnection(api_gateway_url)
+                        connection.request("POST", "/", payload_bytes_api_gateway, headers=headers)
+
+                        response = connection.getresponse()
+                        json_data = json.loads(response.read().decode('utf-8'))
+                        connection.close()
+
+                        response_object = {
+                            'statusCode': response.status,
+                            'json': json_data,
+                            'file': filename
+                        }
+
+                        if response.status in [200, 201]:
+                            response_object.update({
+                                'body': 'Successfully sent JSON data to the API Gateway.'
+                            })
+                        else:
+                            response_object.update({
+                                'body': response.reason
+                            })
+                            output_bucket.put_object(Body=payload_bytes_output_bucket, Key="body")
+
+                        response_list.append(response_object)
+
+                    except Exception as e:
+                        output_bucket.put_object(Body=payload_bytes_output_bucket, Key="body")
+                        response_list.append({
+                            'statusCode': 500,
+                            'body': 'internal server error',
+                            'message': str(e)
+                        })
+        return response_list
+    else:
+        return {
+            'statusCode': 400,
+            'body': 'Invalid event structure.'
+        }

terraform/batch-processing/variables.tf

@@ -1,3 +1,4 @@
 variable "prefix" {}
 variable "short_prefix" {}
 variable "environment" {}
+variable "service_domain_name" {}

tests/test_lambda.py

@@ -61,9 +61,11 @@ def test_lambda_crud_nhs_login(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
 
 
 @pytest.mark.smoketest
+@pytest.mark.debug
 @pytest.mark.nhsd_apim_authorization({"access": "application", "level": "level3"})
 def test_lambda_crud_app_restricted(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
     """
     Test for the POST,GET and Delete for Lambda endpoints. Using app-restricted
     """
+    print(nhsd_apim_proxy_url)
     lambda_crud(nhsd_apim_proxy_url, nhsd_apim_auth_headers)