Feature/ess performance issue fix dev

Deployment/src/Modules/APIM/Modules/ExchangeSetService/main.tf

@@ -226,12 +226,42 @@ resource "azurerm_api_management_product_api" "ess_ui_product_api_mapping" {
   product_id          = azurerm_api_management_product.ess_ui_product.product_id
 }
 
+resource "azurerm_api_management_api" "ess_ui_api" {
+  resource_group_name = data.azurerm_resource_group.rg.name
+  api_management_name = data.azurerm_api_management.apim_instance.name
+  name                = lower(replace(var.apim_ui_api_name, " ", "-"))
+  display_name        = var.apim_ui_api_name
+  description         = var.apim_ui_api_description
+  revision            = "1"
+  path                = var.apim_ui_api_path
+  protocols           = ["https"]
+  service_url         = var.apim_api_backend_url
+
+  subscription_key_parameter_names {
+    header = "Ocp-Apim-Subscription-Key"
+    query  = "subscription-key"
+  }
+
+  import {
+    content_format = "openapi"
+    content_value  = var.apim_ui_openapi
+  }
+}
+
+# Add ESS UI API to ESS Product
+resource "azurerm_api_management_product_api" "ess_product_ui_api_mapping" {
+  resource_group_name = data.azurerm_resource_group.rg.name
+  api_management_name = data.azurerm_api_management.apim_instance.name
+  api_name            = azurerm_api_management_api.ess_ui_api.name
+  product_id          = azurerm_api_management_product.ess_ui_product.product_id
+}
+
 # ESS UI Product poliy
 resource "azurerm_api_management_product_policy" "ess_ui_product_policy" {
   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
-  depends_on          = [azurerm_api_management_product.ess_ui_product, azurerm_api_management_product_api.ess_ui_product_api_mapping]
+  depends_on          = [azurerm_api_management_product.ess_ui_product, azurerm_api_management_product_api.ess_ui_product_api_mapping, azurerm_api_management_product_api.ess_product_ui_api_mapping]
 
   xml_content = <<XML
 	<policies>

Deployment/src/Modules/APIM/Modules/ExchangeSetService/variables.tf

@@ -14,6 +14,10 @@ variable "apim_api_path" {
   type = string
 }
 
+variable "apim_ui_api_path" {
+  type = string
+}
+
 variable "apim_api_backend_url" {
   type        = string
   description = "The URL of the backend service serving the API."
@@ -51,10 +55,22 @@ variable "apim_api_description" {
   type = string
 }
 
+variable "apim_ui_api_name" {
+  type = string
+}
+
+variable "apim_ui_api_description" {
+  type = string
+}
+
 variable "apim_api_openapi" {
   type = string
 }
 
+variable "apim_ui_openapi" {
+  type = string
+}
+
 variable "client_credentials_operation_id" {
   type    = string  
 }

Deployment/src/Modules/APIM/azure.tf

@@ -9,7 +9,6 @@ terraform {
   required_version = "=1.7.2"
   backend "azurerm" {
     container_name = "tfstate"
-    key            = "terraform.ess.apim.deployment.tfplan"
   }
 }
 

Deployment/src/Modules/APIM/main.tf

@@ -3,15 +3,19 @@ module "exchange_set_service" {
   apim_name							= var.apim_name
   apim_rg							= var.apim_rg
   env_name							= local.env_name
-  apim_api_path						= local.apim_api_path 
+  apim_api_path						= local.apim_api_path
+  apim_ui_api_path                  = local.apim_ui_api_path
   apim_api_backend_url				= var.apim_api_backend_url
   apim_group_name					= local.group_name
   apim_group_description			= var.group_description
   apim_ess_product_name				= local.product_name
   apim_ess_product_description		= var.product_description
   apim_api_name						= local.api_name
+  apim_ui_api_name					= local.ui_api_name
   apim_api_description				= var.api_description
+  apim_ui_api_description			= var.ui_api_description
   apim_api_openapi					= local.apim_api_openapi
+  apim_ui_openapi					= local.apim_ui_openapi   
   product_rate_limit				= var.product_rate_limit
   product_quota						= var.product_quota
   client_credentials_operation_id   = var.client_credentials_operation_id

Deployment/src/Modules/APIM/variables.tf

@@ -40,6 +40,16 @@ variable "api_description" {
     default = "The Exchange Set Service APIs to request ENC Exchange Sets for loading onto an ECDIS."
 }
 
+variable "ui_api_name" {
+    type = string
+    default = "Exchange Set Service UI API"
+}
+
+variable "ui_api_description" {
+    type = string
+    default = "The Exchange Set Service UI api to facilitate ESS UI Application Requests."
+}
+
 variable "ui_product_name" {
     type = string
     default = "Exchange Set Service UI"
@@ -111,14 +121,25 @@ variable "cors_origin_values" {
   type = string  
 }
 
+variable "suffix" {
+    default = ""
+}
+
+variable "pathsuffix" {
+    default = ""
+}
+
 locals {
   env_name				= lower(terraform.workspace)
   service_name			= "ess"
-  group_name            = local.env_name == "prod" ? var.group_name : "${var.group_name} ${var.env_suffix[local.env_name]}"
-  product_name          = local.env_name == "prod" ? var.product_name : "${var.product_name} ${var.env_suffix[local.env_name]}"
-  ui_product_name       = local.env_name == "prod" ? var.ui_product_name : "${var.ui_product_name} ${var.env_suffix[local.env_name]}"
-  api_name              = local.env_name == "prod" ? var.api_name : "${var.api_name} ${var.env_suffix[local.env_name]}"
-  apim_api_path         = local.env_name == "prod" ? local.service_name : "${local.service_name}-${local.env_name}"
+  group_name            = local.env_name == "prod" ? "${var.group_name}${var.suffix}" : "${var.group_name} ${var.env_suffix[local.env_name]}${var.suffix}"
+  product_name          = local.env_name == "prod" ? "${var.product_name}${var.suffix}" : "${var.product_name} ${var.env_suffix[local.env_name]}${var.suffix}"
+  ui_product_name       = local.env_name == "prod" ? "${var.ui_product_name}${var.suffix}" : "${var.ui_product_name} ${var.env_suffix[local.env_name]}${var.suffix}"
+  api_name              = local.env_name == "prod" ? "${var.api_name}${var.suffix}" : "${var.api_name} ${var.env_suffix[local.env_name]}${var.suffix}"
+  ui_api_name           = local.env_name == "prod" ? "${var.ui_api_name}${var.suffix}" : "${var.ui_api_name} ${var.env_suffix[local.env_name]}${var.suffix}"
+  apim_api_path         = local.env_name == "prod" ? "${local.service_name}${var.pathsuffix}" : "${local.service_name}-${local.env_name}${var.pathsuffix}"
+  apim_ui_api_path      = local.env_name == "prod" ? "${local.service_name}-ui-${var.pathsuffix}" : "${local.service_name}-ui-${local.env_name}${var.pathsuffix}"
   apim_api_openapi      = file("${path.module}/exchangeSetService_OpenApi_definition.yaml")
+  apim_ui_openapi       = file("${path.module}/exchangeSetService_Ui_OpenApi_definition.yaml")
   cors_origins          = split(";", var.cors_origin_values)
 }

Deployment/src/Modules/CacheStorage/main.tf

@@ -1,5 +1,5 @@
 resource "azurerm_storage_account" "ess_cache_storage" {
-  name = lower("${var.service_name}${var.env_name}cachestorageukho")
+  name = lower("${var.name}")
   resource_group_name = var.resource_group_name
   location = var.location
   account_tier = "Standard"

Deployment/src/Modules/CacheStorage/variables.tf

@@ -6,10 +6,6 @@ variable "location" {
   type = string
 }
 
-variable "env_name" {
-  type  = string
-}
-
 variable "tags" {
 }
 
@@ -36,4 +32,7 @@ variable "medium_exchange_set_subnets" {
 }
 
 variable "large_exchange_set_subnets" {
-} 
+}
+
+variable name {
+}

Deployment/src/Modules/EventHub/main.tf

@@ -16,21 +16,21 @@ resource "azurerm_eventhub" "eventhub" {
 }
 
 resource "azurerm_eventhub_consumer_group" "logstash_consumer_group" {
-  name                = "logstash"
+  name                = "logstash${var.suffix}"
   namespace_name      = azurerm_eventhub_namespace.eventhub_namespace.name
   eventhub_name       = azurerm_eventhub.eventhub.name
   resource_group_name = var.resource_group_name
 }
 
 resource "azurerm_eventhub_consumer_group" "logging_application_consumer_group" {
-  name                = "loggingApplication"
+  name                = "loggingApplication${var.suffix}"
   namespace_name      = azurerm_eventhub_namespace.eventhub_namespace.name
   eventhub_name       = azurerm_eventhub.eventhub.name
   resource_group_name = var.resource_group_name
 }
 
 resource "azurerm_eventhub_authorization_rule" "logstash" {
-  name                = "logstashAccessKey"
+  name                = "logstashAccessKey${var.suffix}"
   namespace_name      = azurerm_eventhub_namespace.eventhub_namespace.name
   eventhub_name       = azurerm_eventhub.eventhub.name
   resource_group_name = var.resource_group_name
@@ -40,7 +40,7 @@ resource "azurerm_eventhub_authorization_rule" "logstash" {
 }
 
 resource "azurerm_eventhub_authorization_rule" "log" {
-  name                = "logAccessKey"
+  name                = "logAccessKey${var.suffix}"
   namespace_name      = azurerm_eventhub_namespace.eventhub_namespace.name
   eventhub_name       = azurerm_eventhub.eventhub.name
   resource_group_name = var.resource_group_name

Deployment/src/Modules/EventHub/variables.tf

@@ -29,3 +29,7 @@ variable "allowed_ips" {
 variable "tags" {
 
 }
+
+variable "suffix" {
+  default     = ""
+}

Deployment/src/Modules/FulfilmentKeyVault/main.tf

@@ -1,7 +1,7 @@
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_key_vault" "small_exchange_set_kv" {
-  name                        = lower("${var.service_name}-ukho-${var.env_name}-sxs-kv")
+  name                        = lower("${var.service_name}-ukho-${var.env_name}-sxs-kv${var.suffix}")
   location                    = var.location
   resource_group_name         = var.resource_group_name
   enabled_for_disk_encryption = true
@@ -69,7 +69,7 @@ resource "azurerm_key_vault_secret" "small_exchange_set_passed_in_secrets" {
 #Medium exchange set
 
 resource "azurerm_key_vault" "medium_exchange_set_kv" {
-  name                        = lower("${var.service_name}-ukho-${var.env_name}-mxs-kv")
+  name                        = lower("${var.service_name}-ukho-${var.env_name}-mxs-kv${var.suffix}")
   location                    = var.location
   resource_group_name         = var.resource_group_name
   enabled_for_disk_encryption = true
@@ -136,7 +136,7 @@ resource "azurerm_key_vault_secret" "medium_exchange_set_passed_in_secrets" {
 
 #Large exchange set
 resource "azurerm_key_vault" "large_exchange_set_kv" {
-  name                        = lower("${var.service_name}-ukho-${var.env_name}-lxs-kv")
+  name                        = lower("${var.service_name}-ukho-${var.env_name}-lxs-kv${var.suffix}")
   location                    = var.location
   resource_group_name         = var.resource_group_name
   enabled_for_disk_encryption = true

Deployment/src/Modules/FulfilmentKeyVault/variables.tf

@@ -53,4 +53,8 @@ variable "large_exchange_set_secrets" {
 
 variable "agent_subnet" {
   type = string
+}
+
+variable "suffix" {
+  default     = ""
 }

Deployment/src/Modules/FulfilmentStorage/main.tf

@@ -1,5 +1,5 @@
 resource "azurerm_storage_account" "small_exchange_set_storage" {
-  name = lower("${var.service_name}${var.env_name}sxsstorageukho")
+  name = lower("${var.service_name}${var.env_name}sxsstorageukho${var.suffix}")
   resource_group_name = var.resource_group_name
   location = var.location
   account_tier = "Standard"
@@ -30,7 +30,7 @@ resource "azurerm_storage_queue" "small_exchange_set_storage_queue" {
 #Medium exchange set storage
 
 resource "azurerm_storage_account" "medium_exchange_set_storage" {
-  name = lower("${var.service_name}${var.env_name}mxsstorageukho")
+  name = lower("${var.service_name}${var.env_name}mxsstorageukho${var.suffix}")
   resource_group_name = var.resource_group_name
   location = var.location
   account_tier = "Standard"
@@ -61,7 +61,7 @@ resource "azurerm_storage_queue" "medium_exchange_set_storage_queue" {
 #Large exchange set storage
 
 resource "azurerm_storage_account" "large_exchange_set_storage" {
-  name = lower("${var.service_name}${var.env_name}lxsstorageukho")
+  name = lower("${var.service_name}${var.env_name}lxsstorageukho${var.suffix}")
   resource_group_name = var.resource_group_name
   location = var.location
   account_tier = "Standard"

Deployment/src/Modules/FulfilmentStorage/variables.tf

@@ -41,4 +41,8 @@ variable "large_exchange_set_subnets" {
 
 variable "agent_subnet" {
   type = string
+}
+
+variable "suffix" {
+  default     = ""
 }

Deployment/src/Modules/FulfilmentWebapps/main.tf

@@ -1,6 +1,6 @@
 resource "azurerm_app_service_plan" "small_exchange_set_app_service_plan" {
   count               = var.exchange_set_config.SmallExchangeSetInstance
-  name                = "${local.small_exchange_set_name}-${sum([1,count.index])}-asp"
+  name                = "${local.small_exchange_set_name}-${sum([1,count.index])}-asp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
 
@@ -13,7 +13,7 @@ resource "azurerm_app_service_plan" "small_exchange_set_app_service_plan" {
 
 resource "azurerm_app_service" "small_exchange_set_webapp" {
   count               = var.exchange_set_config.SmallExchangeSetInstance
-  name                = "${local.small_exchange_set_name}-${sum([1,count.index])}-webapp"
+  name                = "${local.small_exchange_set_name}-${sum([1,count.index])}-webapp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
   app_service_plan_id = azurerm_app_service_plan.small_exchange_set_app_service_plan[count.index].id
@@ -84,7 +84,7 @@ resource "azurerm_app_service_slot_virtual_network_swift_connection" "small_exch
 #Medium exchange set
 resource "azurerm_app_service_plan" "medium_exchange_set_app_service_plan" {
   count               = var.exchange_set_config.MediumExchangeSetInstance
-  name                = "${local.medium_exchange_set_name}-${sum([1,count.index])}-asp"
+  name                = "${local.medium_exchange_set_name}-${sum([1,count.index])}-asp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
 
@@ -97,7 +97,7 @@ resource "azurerm_app_service_plan" "medium_exchange_set_app_service_plan" {
 
 resource "azurerm_app_service" "medium_exchange_set_webapp" {
   count               = var.exchange_set_config.MediumExchangeSetInstance
-  name                = "${local.medium_exchange_set_name}-${sum([1,count.index])}-webapp"
+  name                = "${local.medium_exchange_set_name}-${sum([1,count.index])}-webapp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
   app_service_plan_id = azurerm_app_service_plan.medium_exchange_set_app_service_plan[count.index].id
@@ -168,7 +168,7 @@ resource "azurerm_app_service_slot_virtual_network_swift_connection" "medium_exc
 #Large exchange set
 resource "azurerm_app_service_plan" "large_exchange_set_app_service_plan" {
   count               = var.exchange_set_config.LargeExchangeSetInstance
-  name                = "${local.large_exchange_set_name}-${sum([1,count.index])}-asp"
+  name                = "${local.large_exchange_set_name}-${sum([1,count.index])}-asp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
 
@@ -181,7 +181,7 @@ resource "azurerm_app_service_plan" "large_exchange_set_app_service_plan" {
 
 resource "azurerm_app_service" "large_exchange_set_webapp" {
   count               = var.exchange_set_config.LargeExchangeSetInstance
-  name                = "${local.large_exchange_set_name}-${sum([1,count.index])}-webapp"
+  name                = "${local.large_exchange_set_name}-${sum([1,count.index])}-webapp${var.suffix}"
   location            = var.location
   resource_group_name = var.resource_group_name
   app_service_plan_id = azurerm_app_service_plan.large_exchange_set_app_service_plan[count.index].id

Deployment/src/Modules/FulfilmentWebapps/variables.tf

@@ -48,4 +48,8 @@ locals {
 	small_exchange_set_name = "${var.service_name}-${var.env_name}-sxs"
 	medium_exchange_set_name = "${var.service_name}-${var.env_name}-mxs"
 	large_exchange_set_name = "${var.service_name}-${var.env_name}-lxs"
+}
+
+variable "suffix" {
+  default     = ""
 }

Deployment/src/Modules/UserIdentity/main.tf

@@ -1,6 +1,6 @@
 resource "azurerm_user_assigned_identity" "ess_service_identity" {
   resource_group_name = var.resource_group_name
   location            = var.location
-  name				  = "ess-${var.env_name}-service-identity"
+  name				  = "ess-${var.env_name}-service-identity${var.suffix}"
   tags				  = var.tags
 }

Deployment/src/Modules/UserIdentity/variables.tf

@@ -12,4 +12,8 @@ variable "env_name" {
 
 variable "tags" {
 
+}
+
+variable "suffix" {
+  default     = ""
 }

Deployment/src/azure.tf

@@ -9,7 +9,6 @@ terraform {
   required_version = "=1.7.2"
   backend "azurerm" {
     container_name = "tfstate"
-    key            = "terraform.deployment.tfplan"
   }
 }