post merge fixes

Author: alexnuttall

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

@@ -1,4 +1,4 @@
-module "get_routing_config_lambda" {
+module "create_routing_config_lambda" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.22/terraform-lambda.zip"
 
   project        = var.project
@@ -9,11 +9,11 @@ module "get_routing_config_lambda" {
 
   kms_key_arn = var.kms_key_arn
 
-  function_name = "get-routing-config"
+  function_name = "create-routing-config"
 
-  function_module_name  = "get-routing-config"
+  function_module_name  = "create-routing-config"
   handler_function_name = "handler"
-  description           = "Get Routing Config API endpoint"
+  description           = "Create Routing Config API endpoint"
 
   memory  = 512
   timeout = 3
@@ -28,20 +28,20 @@ module "get_routing_config_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist/get-routing-config"
+  function_code_dir       = "backend-api/dist/created-routing-config"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
   log_subscription_role_arn = var.log_subscription_role_arn
 }
 
-data "aws_iam_policy_document" "get_routing_config_lambda_policy" {
+data "aws_iam_policy_document" "create_routing_config_lambda_policy" {
   statement {
     sid    = "AllowDynamoAccess"
     effect = "Allow"
 
     actions = [
-      "dynamodb:GetItem",
+      "dynamodb:PutItem",
     ]
 
     resources = [

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

@@ -1,4 +1,4 @@
-module "create_routing_config_lambda" {
+module "get_routing_config_lambda" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.22/terraform-lambda.zip"
 
   project        = var.project
@@ -9,11 +9,11 @@ module "create_routing_config_lambda" {
 
   kms_key_arn = var.kms_key_arn
 
-  function_name = "create-routing-config"
+  function_name = "get-routing-config"
 
-  function_module_name  = "create-routing-config"
+  function_module_name  = "get-routing-config"
   handler_function_name = "handler"
-  description           = "Create Routing Config API endpoint"
+  description           = "Get Routing Config API endpoint"
 
   memory  = 512
   timeout = 3
@@ -28,20 +28,20 @@ module "create_routing_config_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist/created-routing-config"
+  function_code_dir       = "backend-api/dist/get-routing-config"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
   log_subscription_role_arn = var.log_subscription_role_arn
 }
 
-data "aws_iam_policy_document" "create_routing_config_lambda_policy" {
+data "aws_iam_policy_document" "get_routing_config_lambda_policy" {
   statement {
     sid    = "AllowDynamoAccess"
     effect = "Allow"
 
     actions = [
-      "dynamodb:PutItem",
+      "dynamodb:GetItem",
     ]
 
     resources = [

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -297,8 +297,15 @@
       "ClientConfiguration": {
         "properties": {
           "campaignId": {
+            "deprecated": true,
             "type": "string"
           },
+          "campaignIds": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
           "features": {
             "$ref": "#/components/schemas/ClientFeatures"
           }
@@ -752,30 +759,22 @@
         ],
         "type": "string"
       },
-      "UploadLetterProperties": {
-        "properties": {
-          "files": {
-            "$ref": "#/components/schemas/LetterFiles"
-          },
-          "language": {
-            "$ref": "#/components/schemas/Language"
-          },
-          "letterType": {
-            "$ref": "#/components/schemas/LetterType"
+  "UploadLetterProperties": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BaseLetterTemplateProperties"
           },
-          "templateType": {
-            "enum": [
-              "LETTER"
-            ],
-            "type": "string"
+          {
+            "properties": {
+              "campaignId": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "campaignId"
+            ]
           }
-        },
-        "required": [
-          "letterType",
-          "language",
-          "templateType"
-        ],
-        "type": "object"
+        ]
       },
       "VersionedFileDetails": {
         "properties": {