Merge pull request #97 from hmcts/PAY-7013-Remove-Old-Servicebus

PAY-7013: Removing old servicebus

.terraform-version

@@ -1 +1 @@
-1.7.5
+1.8.4

emailAlert.tf

@@ -18,6 +18,8 @@ module "feepay-fail-alert" {
   trigger_threshold          = "20"
   resourcegroup_name         = azurerm_resource_group.rg.name
   common_tags                = var.common_tags
+
+  depends_on = [module.feepay-fail-action-group]
 }
 
 
@@ -27,8 +29,8 @@ module "feepay-fail-action-group" {
   env      = var.env
 
   resourcegroup_name     = azurerm_resource_group.rg.name
-  action_group_name      = "feepay Fail  Alert - ${var.env}"
-  short_name             = "feepay_alert"
+  action_group_name      = "feepay-fail-alert-${var.env}"
+  short_name             = "feepay-alert"
   email_receiver_name    = "feepay Alerts"
   email_receiver_address = data.azurerm_key_vault_secret.email-alert-recipient.value
 }

key-vault.tf

@@ -7,9 +7,9 @@ module "ccpay-vault" {
   object_id           = var.jenkins_AAD_objectId
   resource_group_name = azurerm_resource_group.rg.name
   # group id of dcd_reform_dev_azure
-  product_group_name = "dcd_group_fees&pay_v2"
-  common_tags        = var.common_tags
-  create_managed_identity     = true
+  product_group_name      = "dcd_group_fees&pay_v2"
+  common_tags             = var.common_tags
+  create_managed_identity = true
 }
 
 module "feesregister-vault" {
@@ -21,8 +21,8 @@ module "feesregister-vault" {
   object_id           = var.jenkins_AAD_objectId
   resource_group_name = azurerm_resource_group.rg.name
   # group id of dcd_reform_dev_azure
-  product_group_name = "dcd_group_fees&pay_v2"
-  common_tags        = var.common_tags
+  product_group_name          = "dcd_group_fees&pay_v2"
+  common_tags                 = var.common_tags
   managed_identity_object_ids = ["${data.azurerm_user_assigned_identity.ccpay-shared-identity.principal_id}"]
 }
 

output.tf

@@ -1,7 +1,7 @@
 output "vaultName" {
-  value = "${module.ccpay-vault.key_vault_name}"
+  value = module.ccpay-vault.key_vault_name
 }
 
 output "vaultUri" {
-  value = "${module.ccpay-vault.key_vault_uri}"
+  value = module.ccpay-vault.key_vault_uri
 }

prod.tfvars

@@ -1,2 +1,2 @@
-aks_subscription_id                 = "8cbc6f36-7c56-4963-9d36-739db5d00b27"
-service_bus_sku                     = "Premium"
+aks_subscription_id = "8cbc6f36-7c56-4963-9d36-739db5d00b27"
+service_bus_sku     = "Premium"

servicebus-premium.tf

@@ -1,7 +1,7 @@
 locals {
-  subscription_name_premium     = "serviceCallbackPremiumSubscription"
-  service_callback_topic        = "ccpay-service-callback-topic"
-  service_callback_retry_queue  = "ccpay-service-callback-retry-queue"
+  subscription_name_premium    = "serviceCallbackPremiumSubscription"
+  service_callback_topic       = "ccpay-service-callback-topic"
+  service_callback_retry_queue = "ccpay-service-callback-retry-queue"
 }
 
 module "servicebus-namespace-premium" {
@@ -20,30 +20,30 @@ module "servicebus-namespace-premium" {
 }
 
 module "topic-premium" {
-  source                = "git@github.com:hmcts/terraform-module-servicebus-topic?ref=master"
-  name                  = local.service_callback_topic
-  namespace_name        = module.servicebus-namespace-premium.name
-  resource_group_name   = azurerm_resource_group.rg.name
+  source              = "git@github.com:hmcts/terraform-module-servicebus-topic?ref=master"
+  name                = local.service_callback_topic
+  namespace_name      = module.servicebus-namespace-premium.name
+  resource_group_name = azurerm_resource_group.rg.name
 
   depends_on = [module.servicebus-namespace-premium]
 }
 
 module "queue-premium" {
-  source                = "git@github.com:hmcts/terraform-module-servicebus-queue?ref=master"
-  name                  = local.service_callback_retry_queue
-  namespace_name        = module.servicebus-namespace-premium.name
-  resource_group_name   = azurerm_resource_group.rg.name
+  source              = "git@github.com:hmcts/terraform-module-servicebus-queue?ref=master"
+  name                = local.service_callback_retry_queue
+  namespace_name      = module.servicebus-namespace-premium.name
+  resource_group_name = azurerm_resource_group.rg.name
 
   depends_on = [module.servicebus-namespace-premium]
 }
 
 module "subscription-premium" {
-  source                = "git@github.com:hmcts/terraform-module-servicebus-subscription?ref=master"
-  name                  = local.subscription_name_premium
-  namespace_name        = module.servicebus-namespace-premium.name
-  topic_name            = module.topic-premium.name
-  resource_group_name   = azurerm_resource_group.rg.name
-  max_delivery_count    = "1"
+  source                            = "git@github.com:hmcts/terraform-module-servicebus-subscription?ref=master"
+  name                              = local.subscription_name_premium
+  namespace_name                    = module.servicebus-namespace-premium.name
+  topic_name                        = module.topic-premium.name
+  resource_group_name               = azurerm_resource_group.rg.name
+  max_delivery_count                = "1"
   forward_dead_lettered_messages_to = module.queue-premium.name
 
   depends_on = [module.topic-premium]

state.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.93.0"
+      version = "~> 3.105.0"
     }
   }
 }

variables.tf

@@ -37,6 +37,7 @@ variable "team_name" {
 variable "team_contact" {
   default = "#fee-pay-nightly-pipeline"
 }
+
 variable "application_type" {
   type        = string
   default     = "web"
@@ -63,7 +64,7 @@ variable "service_bus_sku" {
   description = "SKU type(Basic, Standard and Premium)"
 }
 
-variable service_bus_enable_private_endpoint {
+variable "service_bus_enable_private_endpoint" {
   default = false # set to true for Production
 }