Merge branch 'main' into task/FTRS-2102-community-distance-pharmacies

Author: lukasz-jercha-nhs

infrastructure/environments/ref/etl_ods.tfvars

@@ -1,5 +1,5 @@
 apim_base_url = "https://ref.api.service.nhs.uk"
-ods_url       = "https://ref.api.service.nhs.uk/organisation-data-terminology-api/fhir/Organization"
+ods_url       = "https://int.api.service.nhs.uk/organisation-data-terminology-api/fhir/Organization"
 
 extractor_lambda_logs_retention   = 30
 transformer_lambda_logs_retention = 30

infrastructure/stacks/slack_notifier/data.tf

@@ -40,6 +40,12 @@ data "aws_s3_object" "slack_notifier_lambda" {
   key    = "${local.artefact_base_path}/${var.project}-slack-notifier-lambda.zip"
 }
 
+data "aws_s3_object" "common_packages_layer" {
+  count  = local.stack_enabled
+  bucket = local.artefacts_bucket
+  key    = "${local.artefact_base_path}/${var.project}-python-packages-layer.zip"
+}
+
 data "aws_s3_object" "python_dependency_layer" {
   count  = local.stack_enabled
   bucket = local.artefacts_bucket

infrastructure/stacks/slack_notifier/lambda.tf

@@ -15,6 +15,7 @@ module "slack_lambda" {
 
   layers = [
     aws_lambda_layer_version.python_dependency_layer[0].arn,
+    aws_lambda_layer_version.common_packages_layer[0].arn,
   ]
 
   subnet_ids         = data.aws_subnets.private[0].ids

infrastructure/stacks/slack_notifier/lambda_layers.tf

@@ -1,3 +1,13 @@
+resource "aws_lambda_layer_version" "common_packages_layer" {
+  count               = local.stack_enabled
+  layer_name          = "${local.resource_prefix}-common-packages-layer"
+  s3_bucket           = local.artefacts_bucket
+  s3_key              = "${local.artefact_base_path}/${var.project}-python-packages-layer.zip"
+  s3_object_version   = data.aws_s3_object.common_packages_layer[0].version_id
+  compatible_runtimes = [var.lambda_runtime]
+  description         = "Common Python packages including ftrs_common"
+}
+
 resource "aws_lambda_layer_version" "python_dependency_layer" {
   count               = local.stack_enabled
   layer_name          = "${local.resource_prefix}-python-dependency-layer"