UML-3727: rename and Lambda RIE (#2994)

* UML-3727: event receiver lambda * update name to event-receiver * remove old files * rename resources * fix typo * fix typo * use svc prefix and suffix * add if statement back * fix missed -
ministryofjustice · Dec 10, 2024 · aab3c5e · aab3c5e
1 parent f3bdb7c
commit aab3c5e
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 23 deletions.
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -75,8 +75,8 @@ jobs:
             run_unit_tests: 'true'
             run_integration_tests: 'false'
             artifact_to_dl: ''
-          - svc_prefix: 'ingestion'
-            svc_suffix: 'lambda'
+          - svc_prefix: 'event'
+            svc_suffix: 'receiver'
             build_development_docker: 'false'
             run_unit_tests: 'false'
             run_integration_tests: 'false'
@@ -264,9 +264,10 @@ jobs:
           elif [[ "${SVC_PREFIX}" = "stats_upload" ]]; then
             docker build --no-cache --file lambda-functions/upload-statistics/Dockerfile --tag stats_upload_lambda:latest lambda-functions/upload-statistics
 
-          elif [[ "${SVC_PREFIX}" = "ingestion" ]]; then
-            docker build --file lambda-functions/ingestion-lambda/Dockerfile --tag ingestion_lambda:latest lambda-functions/ingestion-lambda
-
+          elif [[ "${SVC_PREFIX}" = "event" ]]; then
+            if [[ "${SVC_SUFFIX}" = "receiver" ]]; then
+              docker build --file lambda-functions/${SVC_PREFIX}-${SVC_SUFFIX}/Dockerfile --tag ${SVC_PREFIX}_${SVC_SUFFIX}:latest lambda-functions/${SVC_PREFIX}-${SVC_SUFFIX}
+            fi
           fi
         if: (inputs.specific_path == 'all' || inputs.specific_path == matrix.svc_prefix)
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -268,6 +268,26 @@ services:
     ports:
       - 9007:8080
 
+
+  # ---------------------------
+  # Lambda for ingestion from MLPA
+
+  event-reciever-lambda:
+    container_name: event-reciever
+    build:
+      context: ./lambda-functions/event-reciever
+      dockerfile: Dockerfile
+    environment:
+      ENVIRONMENT: local
+      REGION: eu-west-1
+      AWS_ACCESS_KEY_ID: 'devkey'
+      AWS_SECRET_ACCESS_KEY: 'secretdevkey'
+    volumes:
+      - ./lambda-functions/event-reciever/app:/function/app
+      - ./lambda-functions/.aws-lambda-rie:/aws-lambda
+    ports:
+      - 9008:8080
+
   proxy:
     container_name: proxy
     image: traefik:3.0

diff --git a/lambda-functions/ingestion-lambda/Dockerfile → lambda-functions/event-receiver/Dockerfile b/lambda-functions/ingestion-lambda/Dockerfile → lambda-functions/event-receiver/Dockerfile
diff --git a/...da-functions/ingestion-lambda/app/main.go → lambda-functions/event-receiver/app/main.go b/...da-functions/ingestion-lambda/app/main.go → lambda-functions/event-receiver/app/main.go
diff --git a/lambda-functions/ingestion-lambda/go.mod → lambda-functions/event-receiver/go.mod b/lambda-functions/ingestion-lambda/go.mod → lambda-functions/event-receiver/go.mod
diff --git a/lambda-functions/ingestion-lambda/go.sum → lambda-functions/event-receiver/go.sum b/lambda-functions/ingestion-lambda/go.sum → lambda-functions/event-receiver/go.sum
diff --git a/terraform/account/region.tf b/terraform/account/region.tf
@@ -8,7 +8,7 @@ module "eu_west_1" {
   environment_name         = local.environment
   lambda_container_version = var.lambda_container_version
   vpc_flow_logs_iam_role   = aws_iam_role.vpc_flow_logs
-  ingestion_lambda_enabled = true
+  event_receiver_enabled   = true
 
   depends_on = [
     module.cloudwatch_mrk,
@@ -36,7 +36,7 @@ module "eu_west_2" {
   environment_name         = local.environment
   lambda_container_version = var.lambda_container_version
   vpc_flow_logs_iam_role   = aws_iam_role.vpc_flow_logs
-  ingestion_lambda_enabled = false
+  event_receiver_enabled   = false
 
   depends_on = [
     module.cloudwatch_mrk,

diff --git a/terraform/account/region/lambda_functions.tf b/terraform/account/region/lambda_functions.tf
@@ -8,18 +8,18 @@ data "aws_ecr_repository" "ship_to_opg_metrics" {
   provider = aws.management
 }
 
-data "aws_ecr_repository" "ingestion_repo" {
-  name     = "use_an_lpa/ingestion_lambda"
+data "aws_ecr_repository" "event_receiver_repo" {
+  name     = "use_an_lpa/event_receiver"
   provider = aws.management
 }
 
-module "ingestion_lambda" {
-  count                               = var.ingestion_lambda_enabled ? 1 : 0
+module "event_receiver" {
+  count                               = var.event_receiver_enabled ? 1 : 0
   source                              = "./modules/lambda_function"
-  lambda_name                         = "ingestion-lambda-${var.account_name}"
+  lambda_name                         = "event-receiver-${var.account_name}"
   working_directory                   = "/"
-  image_uri                           = "${data.aws_ecr_repository.ingestion_repo.repository_url}:${var.lambda_container_version}"
-  ecr_arn                             = data.aws_ecr_repository.ingestion_repo.arn
+  image_uri                           = "${data.aws_ecr_repository.event_receiver_repo.repository_url}:${var.lambda_container_version}"
+  ecr_arn                             = data.aws_ecr_repository.event_receiver_repo.arn
   aws_cloudwatch_log_group_kms_key_id = data.aws_kms_alias.cloudwatch_mrk.arn
 
   providers = {

diff --git a/terraform/account/region/variables.tf b/terraform/account/region/variables.tf
@@ -37,8 +37,8 @@ variable "environment_name" {
   type        = string
 }
 
-variable "ingestion_lambda_enabled" {
-  description = "Enable the ingestion lambda"
+variable "event_receiver_enabled" {
+  description = "Enable the event receiver Lambda"
   type        = bool
 }
 variable "lambda_container_version" {

diff --git a/terraform/account/terraform.tfvars.json b/terraform/account/terraform.tfvars.json
@@ -8,7 +8,7 @@
     "development": {
       "account_id": "367815980639",
       "cloudwatch_application_insights_enabled": true,
-      "ingestion_lambda_enabled": true,
+      "event_receiver_enabled": true,
       "shared_account_id": "679638075911",
       "is_production": false,
       "retention_in_days": 7,
@@ -27,7 +27,9 @@
           "int.lpa-codes.api.opg.service.justice.gov.uk.",
           "dev.lpa.api.opg.service.justice.gov.uk."
         ],
-        "domains_blocked": ["*."]
+        "domains_blocked": [
+          "*."
+        ]
       },
       "dynamodb_cloudtrail": {
         "enabled": false,
@@ -47,7 +49,7 @@
     "preproduction": {
       "account_id": "888228022356",
       "cloudwatch_application_insights_enabled": false,
-      "ingestion_lambda_enabled": false,
+      "event_receiver_enabled": false,
       "shared_account_id": "679638075911",
       "is_production": false,
       "retention_in_days": 7,
@@ -66,7 +68,9 @@
           "int.lpa-codes.api.opg.service.justice.gov.uk.",
           "dev.lpa.api.opg.service.justice.gov.uk."
         ],
-        "domains_blocked": ["*."]
+        "domains_blocked": [
+          "*."
+        ]
       },
       "dynamodb_cloudtrail": {
         "enabled": false,
@@ -86,7 +90,7 @@
     "production": {
       "account_id": "690083044361",
       "cloudwatch_application_insights_enabled": true,
-      "ingestion_lambda_enabled": false,
+      "event_receiver_enabled": false,
       "shared_account_id": "679638075911",
       "is_production": true,
       "retention_in_days": 400,
@@ -105,7 +109,9 @@
           "lpa-codes.api.opg.service.justice.gov.uk.",
           "lpa.api.opg.service.justice.gov.uk."
         ],
-        "domains_blocked": ["*."]
+        "domains_blocked": [
+          "*."
+        ]
       },
       "dynamodb_cloudtrail": {
         "enabled": true,

diff --git a/terraform/account/variables.tf b/terraform/account/variables.tf
@@ -20,7 +20,7 @@ variable "accounts" {
       account_id                              = string
       cloudwatch_application_insights_enabled = bool
       shared_account_id                       = number
-      ingestion_lambda_enabled                = bool
+      event_receiver_enabled                  = bool
       is_production                           = bool
       retention_in_days                       = number
       pagerduty_service_name                  = string