Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eema1-NRL-693-addCloudWatchAlarmForLambdaError

Author: eesa456

terraform/account-wide-infrastructure/prod/domain.tf

@@ -1,4 +1,5 @@
 
+
 module "dev-custom-domain-name" {
   source                = "../modules/env-custom-domain-name"
   domain_name           = var.prod_api_domain_name

terraform/account-wide-infrastructure/prod/rds-cluster-vpc.tf

@@ -6,54 +6,5 @@ variable "assume_role" {}
 
 variable "prod_api_domain_name" {
   description = "The internal DNS name of the API Gateway for the prod environment"
-  default     = "api.record-locator.national.nhs.uk"
-}
-
-variable "private_subnet_cidr_blocks" {
-  description = "Available CIDR blocks for private subnets"
-  type        = list(string)
-  default = [
-    "10.0.1.0/24",
-    "10.0.2.0/24",
-    "10.0.3.0/24",
-    "10.0.4.0/24",
-  ]
-}
-
-variable "subnet_count" {
-  description = "Number of subnets"
-  type        = map(number)
-  default = {
-    private = 3
-  }
-}
-
-variable "vpc_cidr_block" {
-  description = "CIDR block for VPC"
-  type        = string
-  default     = "10.0.0.0/16"
-}
-
-variable "engine_version" {
-  description = "engine version for rds cluster"
-  type        = string
-  default     = "15.2"
-}
-
-variable "engine" {
-  description = "enginer for the rds cluster"
-  type        = string
-  default     = "aurora-postgresql"
-}
-
-variable "user_name" {
-  description = "user name for the database cluster"
-  type        = string
-  default     = "nrlf"
-}
-
-variable "instance_type" {
-  description = "Instance type for the database instance"
-  type        = string
-  default     = "db.t3.medium"
+  default     = "prod.api.record-locator.national.nhs.uk"
 }

terraform/account-wide-infrastructure/prod/rds.tf

@@ -16,15 +16,15 @@ variable "qasandbox_api_domain_name" {
 
 variable "int_api_domain_name" {
   description = "The internal DNS name of the API Gateway for the int environment"
-  default     = "api.int.record-locator.national.nhs.uk"
+  default     = "int.api.record-locator.int.national.nhs.uk"
 }
 
 variable "intsandbox_api_domain_name" {
   description = "The internal DNS name of the API Gateway for the int sandbox environment"
-  default     = "api-sandbox.int.record-locator.national.nhs.uk"
+  default     = "int-sandbox.api.record-locator.int.national.nhs.uk"
 }
 
 variable "ref_api_domain_name" {
   description = "The internal DNS name of the API Gateway for the ref environment"
-  default     = "api.ref.record-locator.national.nhs.uk"
+  default     = "ref.api.record-locator.ref.national.nhs.uk"
 }