From 380cd7e89e152a0a06e20511abed8e12b02244a1 Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 12 Aug 2024 13:45:48 +0100 Subject: [PATCH 1/4] PAY-7013: Removing old servicebus. --- servicebus.tf | 58 --------------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 servicebus.tf diff --git a/servicebus.tf b/servicebus.tf deleted file mode 100644 index 82dbddb..0000000 --- a/servicebus.tf +++ /dev/null @@ -1,58 +0,0 @@ -locals { - subscription_name = "defaultServiceCallbackSubscription" - retry_queue = "serviceCallbackRetryQueue" -} - -module "servicebus-namespace" { - providers = { - azurerm.private_endpoint = azurerm.private_endpoint - } - - source = "git@github.com:hmcts/terraform-module-servicebus-namespace?ref=master" - name = "${var.product}-servicebus-${var.env}" - location = var.location - env = var.env - common_tags = local.tags - sku = "Standard" - zone_redundant = "false" - resource_group_name = azurerm_resource_group.rg.name -} - -module "topic" { - source = "git@github.com:hmcts/terraform-module-servicebus-topic?ref=master" - name = "serviceCallbackTopic" - namespace_name = module.servicebus-namespace.name - resource_group_name = azurerm_resource_group.rg.name - - depends_on = [module.servicebus-namespace] -} - -module "queue" { - source = "git@github.com:hmcts/terraform-module-servicebus-queue?ref=master" - name = local.retry_queue - namespace_name = module.servicebus-namespace.name - resource_group_name = azurerm_resource_group.rg.name - - depends_on = [module.servicebus-namespace] -} - -module "subscription" { - source = "git@github.com:hmcts/terraform-module-servicebus-subscription?ref=master" - name = local.subscription_name - namespace_name = module.servicebus-namespace.name - topic_name = module.topic.name - resource_group_name = azurerm_resource_group.rg.name - max_delivery_count = "1" - forward_dead_lettered_messages_to = module.queue.name - - depends_on = [module.topic] -} - -resource "azurerm_key_vault_secret" "servicebus_primary_connection_string" { - name = "sb-primary-connection-string" - value = module.servicebus-namespace.primary_send_and_listen_connection_string - key_vault_id = data.azurerm_key_vault.ccpay_key_vault.id - - depends_on = [module.servicebus-namespace] -} - From 30511af07ed7a1fdb36bee739839021fbf2a2db3 Mon Sep 17 00:00:00 2001 From: 58046 <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:48:53 +0000 Subject: [PATCH 2/4] Updating Terraform Formatting --- key-vault.tf | 10 +++++----- output.tf | 4 ++-- prod.tfvars | 4 ++-- servicebus-premium.tf | 34 +++++++++++++++++----------------- variables.tf | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/key-vault.tf b/key-vault.tf index c2bc75e..393cc26 100644 --- a/key-vault.tf +++ b/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}"] } diff --git a/output.tf b/output.tf index 811444d..6b1a318 100644 --- a/output.tf +++ b/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 } \ No newline at end of file diff --git a/prod.tfvars b/prod.tfvars index fe5e555..f028839 100644 --- a/prod.tfvars +++ b/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" diff --git a/servicebus-premium.tf b/servicebus-premium.tf index f3814ab..1c0ed31 100644 --- a/servicebus-premium.tf +++ b/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] diff --git a/variables.tf b/variables.tf index cbac000..643a041 100644 --- a/variables.tf +++ b/variables.tf @@ -63,7 +63,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 } From ae77f70cdd90a8000c54e9c6480d53ed48412afb Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 12 Aug 2024 13:58:07 +0100 Subject: [PATCH 3/4] PAY-7013: Correct dependency. --- emailAlert.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emailAlert.tf b/emailAlert.tf index 69784f8..4a25483 100644 --- a/emailAlert.tf +++ b/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] } From 28361edbbc77bcf617bad79d0fbfa94d9bd616ae Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 12 Aug 2024 16:57:11 +0100 Subject: [PATCH 4/4] PAY-7013: Fix issues with action_group_name. --- .terraform-version | 2 +- emailAlert.tf | 4 ++-- state.tf | 2 +- variables.tf | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.terraform-version b/.terraform-version index 6a126f4..bfa363e 100644 --- a/.terraform-version +++ b/.terraform-version @@ -1 +1 @@ -1.7.5 +1.8.4 diff --git a/emailAlert.tf b/emailAlert.tf index 4a25483..b3967f6 100644 --- a/emailAlert.tf +++ b/emailAlert.tf @@ -29,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 } diff --git a/state.tf b/state.tf index 26d1a1e..75abdd6 100644 --- a/state.tf +++ b/state.tf @@ -4,7 +4,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.93.0" + version = "~> 3.105.0" } } } diff --git a/variables.tf b/variables.tf index 643a041..386e6a6 100644 --- a/variables.tf +++ b/variables.tf @@ -37,6 +37,7 @@ variable "team_name" { variable "team_contact" { default = "#fee-pay-nightly-pipeline" } + variable "application_type" { type = string default = "web"