Merge pull request #459 from NHSDigital/release/2025-01-02

Release/2025 01 02

Author: megan-bower4

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2025-01-02
+- [PI-688] Changelog ETL - delete an AS
+- [PI-690] Changelog ETL - modify / add to an MHS
+- [PI-694] Changelog ETL - modify / remove from an MHS
+- [PI-692] Changelog ETL - modify / replace in an MHS
+
 ## 2024-12-27
 - [PI-602] Update spine_as Questionnaire
 - [PI-687] ETL: Delete an MHS

VERSION

@@ -1 +1 @@
-2024.12.27
+2025.01.02

changelog/2025-01-02.md

@@ -0,0 +1,4 @@
+- [PI-688] Changelog ETL - delete an AS
+- [PI-690] Changelog ETL - modify / add to an MHS
+- [PI-694] Changelog ETL - modify / remove from an MHS
+- [PI-692] Changelog ETL - modify / replace in an MHS

infrastructure/terraform/per_account/dev/main.tf

@@ -27,6 +27,13 @@ JSON
   }
 }
 
+module "billing_alarms" {
+  source      = "../modules/billing_alarms"
+  project     = local.project
+  limit       = var.budget_limit
+  environment = terraform.workspace
+}
+
 module "iam__api-gateway-to-cloudwatch" {
   source  = "../modules/iam__api-gateway-to-cloudwatch"
   project = local.project

infrastructure/terraform/per_account/dev/terraform.tf

@@ -13,5 +13,17 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 5.20.0"
     }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.0"
+    }
+    external = {
+      source  = "hashicorp/external"
+      version = "~> 2.0"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2.0"
+    }
   }
 }

infrastructure/terraform/per_account/dev/vars.tf

@@ -21,3 +21,8 @@ variable "updated_date" {
 variable "workspace_type" {
   default = "PERSISTENT"
 }
+
+variable "budget_limit" {
+  default = "1050"
+  type    = string
+}

infrastructure/terraform/per_account/int/main.tf

@@ -27,6 +27,13 @@ JSON
   }
 }
 
+module "billing_alarms" {
+  source      = "../modules/billing_alarms"
+  project     = local.project
+  limit       = var.budget_limit
+  environment = terraform.workspace
+}
+
 module "iam__api-gateway-to-cloudwatch" {
   source  = "../modules/iam__api-gateway-to-cloudwatch"
   project = local.project

infrastructure/terraform/per_account/int/vars.tf

@@ -21,3 +21,8 @@ variable "updated_date" {
 variable "workspace_type" {
   default = "PERSISTENT"
 }
+
+variable "budget_limit" {
+  default = "385"
+  type    = string
+}

infrastructure/terraform/per_account/mgmt/main.tf

@@ -27,6 +27,13 @@ JSON
   }
 }
 
+module "billing_alarms" {
+  source      = "../modules/billing_alarms"
+  project     = local.project
+  limit       = var.budget_limit
+  environment = terraform.workspace
+}
+
 module "route53" {
   source    = "./modules/route53"
   workspace = terraform.workspace

infrastructure/terraform/per_account/mgmt/vars.tf

@@ -21,3 +21,8 @@ variable "updated_date" {
 variable "workspace_type" {
   default = "PERSISTENT"
 }
+
+variable "budget_limit" {
+  default = "450"
+  type    = string
+}