Merge branch 'develop' into dev/Abzu-193657-s57-bess-fix

UKHO · Jan 27, 2025 · d04a48f · d04a48f
2 parents 6cca86e + bbcb393
commit d04a48f
Show file tree

Hide file tree

Showing 26 changed files with 1,037 additions and 1,172 deletions.
diff --git a/Deployment/src/Modules/APIM/Modules/ExchangeSetService/main.tf b/Deployment/src/Modules/APIM/Modules/ExchangeSetService/main.tf
@@ -210,14 +210,6 @@ resource "azurerm_api_management_product" "ess_ui_product" {
   published             = true
 }
 
-# ESS product-Group mapping
-resource "azurerm_api_management_product_group" "ess_ui_product_group_mappping" {
-  resource_group_name = data.azurerm_resource_group.rg.name
-  api_management_name = data.azurerm_api_management.apim_instance.name
-  product_id          = azurerm_api_management_product.ess_ui_product.product_id
-  group_name          = azurerm_api_management_group.ess_management_group.name
-}
-
 # Add ESS API to ESS UI Product
 resource "azurerm_api_management_product_api" "ess_ui_product_api_mapping" {
   resource_group_name = data.azurerm_resource_group.rg.name

diff --git a/Deployment/src/Modules/APIM/variables.tf b/Deployment/src/Modules/APIM/variables.tf
@@ -66,10 +66,12 @@ variable "b2c_client_id" {
 variable "env_suffix" {
   type = map(string)
   default = {
-    "dev"     = "Dev"
-    "qa"      = "QA"
-    "vne"     = "VNE"
-    "vni"     = "VNI"
+    "dev"         = "Dev"
+    "qa"          = "QA"
+    "vne"         = "VNE"
+    "vni"         = "VNI"
+    "iat"         = "IAT"
+    "pre"         = "Pre"
   }
 }
 

diff --git a/Deployment/src/main.tf b/Deployment/src/main.tf
@@ -219,7 +219,7 @@ module "azure-dashboard" {
 }
 module "cache_storage" {
   source                                = "./Modules/CacheStorage"
-  name                                  = local.env_name == "prod" && var.storage_suffix == "v2" ? "${local.service_name}${local.env_name}cachestorageukho2" : "${local.service_name}${local.env_name}cachestorageukho${var.storage_suffix}"
+  name                                  = (local.env_name == "prod" || local.env_name == "pre") && var.storage_suffix == "v2" ? "${local.service_name}${local.env_name}cachestorageukho2" : "${local.service_name}${local.env_name}cachestorageukho${var.storage_suffix}"
   resource_group_name                   = azurerm_resource_group.rg.name
   allowed_ips                           = var.allowed_ips  
   location                              = var.location

diff --git a/Deployment/src/variables.tf b/Deployment/src/variables.tf
@@ -9,7 +9,7 @@ variable "resource_group_name" {
 }
 
 locals {
-  env_name				= lower(terraform.workspace)
+  env_name			    = lower(terraform.workspace)
   service_name			= "ess"
   web_app_name		    = "${local.service_name}-${local.env_name}-webapp${var.suffix}"
   key_vault_name		= "${local.service_name}-ukho-${local.env_name}-kv${var.suffix}"
@@ -59,6 +59,14 @@ variable "app_service_sku" {
 	    tier = "PremiumV3"
 	    size = "P1v3"
         }
+    "iat"     = {
+      tier = "PremiumV3"
+      size = "P1v3"
+        }
+    "pre"  = {
+	    tier = "PremiumV3"
+	    size = "P1v3"
+        }
     "prod"   = {
 	    tier = "PremiumV3"
 	    size = "P1v3"
@@ -102,4 +110,4 @@ variable "agent_2204_subnet" {
 
 variable "agent_prd_subnet" {
   type = string
-}
+}
diff --git a/Deployment/templates/Deploy.yml b/Deployment/templates/Deploy.yml