Merge branch 'main' into feature/CCM-13610-Expose-key-metrics-to-Cloudwatch

Author: masl2

.github/actions/acceptance-tests/action.yml

@@ -37,7 +37,6 @@ runs:
     - name: "Repo setup"
       uses: ./.github/actions/node-install
       with:
-        node-version: ${{ steps.nodejs_version.outputs.nodejs_version }}
         GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
 
     - name: "Set PR NUMBER"

.github/actions/node-install/action.yaml

@@ -2,9 +2,6 @@ name: 'npm install and setup'
 description: 'Setup node, authenticate github package repository and perform clean npm install'
 
 inputs:
-  node-version:
-    description: 'Node.js version'
-    required: true
   GITHUB_TOKEN:
     description: "Token for access to github package registry"
     required: true
@@ -15,7 +12,7 @@ runs:
     - name: 'Use Node.js'
       uses: actions/setup-node@v6
       with:
-        node-version: '${{ inputs.node-version }}'
+        node-version-file: '.tool-versions'
         registry-url: 'https://npm.pkg.github.com'
         scope: '@nhsdigital'
 

.github/workflows/pr_closed.yaml

@@ -80,7 +80,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ inputs.nodejs_version }}
+          node-version-file: '.tool-versions'
           registry-url: 'https://npm.pkg.github.com'
 
       - name: check if local version differs from latest published version
@@ -113,19 +113,14 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5.0.0
-      - name: Setup NodeJS
-        uses: actions/setup-node@v4
+      - name: "Repo setup"
+        uses: ./.github/actions/node-install
         with:
-          node-version: ${{ inputs.nodejs_version }}
-          registry-url: 'https://npm.pkg.github.com'
-      - name: "Install dependencies"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npm ci
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Run provider contract tests"
         run: make test-contract
         env:
-          GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-event-schemas:
     name: Publish event schemas package to GitHub package registry
@@ -145,7 +140,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ inputs.nodejs_version }}
+          node-version-file: '.tool-versions'
           registry-url: 'https://npm.pkg.github.com'
 
       - name: Install dependencies

Makefile

@@ -106,6 +106,9 @@ test-component:
 test-performance:
 	(cd tests && npm install && npm run test:performance)
 
+test-contract: # Run provider contract tests @Testing
+	npm run test:contracts --workspace tests/contracts/provider
+
 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,6 +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_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 |
@@ -34,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/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,9 +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                 = var.enable_event_cache
+
   shared_infra_account_id = var.shared_infra_account_id
 }

infrastructure/terraform/components/api/variables.tf

@@ -162,3 +162,28 @@ variable "core_environment" {
   default     = "prod"
 
 }
+
+# Event Pub/Sub cache settings
+variable "enable_event_cache" {
+  type        = bool
+  description = "Enable caching of events to an S3 bucket"
+  default     = false
+}
+
+variable "enable_sns_delivery_logging" {
+  type        = bool
+  description = "Enable SNS Delivery Failure Notifications"
+  default     = false
+}
+
+variable "sns_success_logging_sample_percent" {
+  type        = number
+  description = "Enable SNS Delivery Successful Sample Percentage"
+  default     = 0
+}
+
+variable "enable_api_data_trace" {
+  type        = bool
+  description = "Enable API Gateway data trace logging"
+  default     = false
+}