Merge branch 'main' into feature/CCM-12963-E2ETests

Author: Namitha-Prabhu

.gitleaksignore

@@ -23,3 +23,5 @@ e12407e09151898bfd8d049d57eee9db9977d56b:.github/copilot-instructions.md:generic
 debc75a97cfe551a69fd1e8694be483213322a9d:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10
 777eb4047ad06b9e939a292ee18664a0ffee4f29:tests/resources/prepared-letter.json:generic-api-key:4
 4fa1923947bbff2387218d698d766cbb7c121a0f:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:npm-access-token:9
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:github-pat:7

Makefile

@@ -103,6 +103,9 @@ config:: _install-dependencies version # Configure development environment (main
 test-component:
 	(cd tests && npm install && npm run test:component)
 
+test-performance:
+	(cd tests && npm install && npm run test:performance)
+
 version:
 	rm -f .version
 	make version-create-effective-file dir=.

VERSION

@@ -1 +1 @@
-1.1.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
+1.1.2-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}

infrastructure/terraform/components/api/README.md

@@ -17,7 +17,9 @@ No requirements.
 | <a name="input_core_environment"></a> [core\_environment](#input\_core\_environment) | Environment of Core | `string` | `"prod"` | no |
 | <a name="input_default_tags"></a> [default\_tags](#input\_default\_tags) | A map of default tags to apply to all taggable resources within the component | `map(string)` | `{}` | no |
 | <a name="input_disable_gateway_execute_endpoint"></a> [disable\_gateway\_execute\_endpoint](#input\_disable\_gateway\_execute\_endpoint) | Disable the execution endpoint for the API Gateway | `bool` | `true` | no |
-| <a name="input_enable_backups"></a> [enable\_backups](#input\_enable\_backups) | Enable backups | `bool` | `false` | no |
+| <a name="input_enable_api_data_trace"></a> [enable\_api\_data\_trace](#input\_enable\_api\_data\_trace) | Enable API Gateway data trace logging | `bool` | `false` | no |
+| <a name="input_enable_event_cache"></a> [enable\_event\_cache](#input\_enable\_event\_cache) | Enable caching of events to an S3 bucket | `bool` | `false` | no |
+| <a name="input_enable_sns_delivery_logging"></a> [enable\_sns\_delivery\_logging](#input\_enable\_sns\_delivery\_logging) | Enable SNS Delivery Failure Notifications | `bool` | `false` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the tfscaffold environment | `string` | n/a | yes |
 | <a name="input_eventpub_control_plane_bus_arn"></a> [eventpub\_control\_plane\_bus\_arn](#input\_eventpub\_control\_plane\_bus\_arn) | ARN of the EventBridge control plane bus for eventpub | `string` | `""` | no |
 | <a name="input_eventpub_data_plane_bus_arn"></a> [eventpub\_data\_plane\_bus\_arn](#input\_eventpub\_data\_plane\_bus\_arn) | ARN of the EventBridge data plane bus for eventpub | `string` | `""` | no |
@@ -35,6 +37,7 @@ No requirements.
 | <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |
 | <a name="input_shared_infra_account_id"></a> [shared\_infra\_account\_id](#input\_shared\_infra\_account\_id) | The AWS Account ID of the shared infrastructure account | `string` | `"000000000000"` | no |
+| <a name="input_sns_success_logging_sample_percent"></a> [sns\_success\_logging\_sample\_percent](#input\_sns\_success\_logging\_sample\_percent) | Enable SNS Delivery Successful Sample Percentage | `number` | `0` | no |
 ## Modules
 
 | Name | Source | Version |

infrastructure/terraform/components/api/api_gateway_method_settings.tf

@@ -6,6 +6,6 @@ resource "aws_api_gateway_method_settings" "main" {
   settings {
     metrics_enabled    = true
     logging_level      = "INFO"
-    data_trace_enabled = true
+    data_trace_enabled = var.enable_api_data_trace
   }
 }

infrastructure/terraform/components/api/ddb_table_letters.tf

@@ -41,5 +41,10 @@ resource "aws_dynamodb_table" "letters" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/ddb_table_mi.tf

@@ -24,5 +24,10 @@ resource "aws_dynamodb_table" "mi" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/ddb_table_suppliers.tf

@@ -30,5 +30,10 @@ resource "aws_dynamodb_table" "suppliers" {
     enabled = true
   }
 
-  tags = var.default_tags
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
 }

infrastructure/terraform/components/api/modules_eventpub.tf

@@ -19,11 +19,11 @@ module "eventpub" {
   force_destroy = var.force_destroy
 
   event_cache_buffer_interval        = 500
-  enable_sns_delivery_logging        = true
-  sns_success_logging_sample_percent = 0
+  enable_sns_delivery_logging        = var.enable_sns_delivery_logging
+  sns_success_logging_sample_percent = var.sns_success_logging_sample_percent
 
   event_cache_expiry_days = 30
-  enable_event_cache      = true
+  enable_event_cache      = var.enable_event_cache
 
   data_plane_bus_arn    = var.eventpub_data_plane_bus_arn
   control_plane_bus_arn = var.eventpub_control_plane_bus_arn

infrastructure/terraform/components/api/modules_eventsub.tf

@@ -18,10 +18,11 @@ module "eventsub" {
   force_destroy         = var.force_destroy
 
   event_cache_buffer_interval        = 500
-  enable_sns_delivery_logging        = true
-  sns_success_logging_sample_percent = 0
+  enable_sns_delivery_logging        = var.enable_sns_delivery_logging
+  sns_success_logging_sample_percent = var.sns_success_logging_sample_percent
 
   event_cache_expiry_days = 30
-  enable_event_cache      = true
+  enable_event_cache                 = var.enable_event_cache
+
   shared_infra_account_id = var.shared_infra_account_id
 }