DTOSS-12822: use relay namespace ID output for RBAC scope instead of data source

Author: josielsouzanordcloud

infrastructure/modules/container-apps/data.tf

@@ -27,8 +27,3 @@ data "azurerm_private_dns_zone" "storage-account-queue" {
   resource_group_name = "rg-hub-${var.hub}-uks-private-dns-zones"
 }
 
-data "azurerm_relay_namespace" "relay" {
-  count               = var.relay_namespace_name != null ? 1 : 0
-  name                = var.relay_namespace_name
-  resource_group_name = var.resource_group_name_infra
-}

infrastructure/modules/container-apps/relay.tf

@@ -27,6 +27,6 @@ module "relay_send_role_assignment" {
   source               = "../dtos-devops-templates/infrastructure/modules/rbac-assignment"
   principal_id         = module.relay_send_identity[0].principal_id
   role_definition_name = "Azure Relay Sender"
-  scope                = data.azurerm_relay_namespace.relay[0].id
+  scope                = var.relay_namespace_id
   depends_on           = [module.relay_send_identity]
 }

infrastructure/modules/container-apps/variables.tf

@@ -206,6 +206,12 @@ variable "relay_namespace_name" {
   default     = null
 }
 
+variable "relay_namespace_id" {
+  description = "The ID of the Azure Relay namespace. Used for RBAC scope."
+  type        = string
+  default     = null
+}
+
 locals {
   resource_group_name = "rg-${var.app_short_name}-${var.environment}-container-app-uks"
 

infrastructure/modules/infra/output.tf

@@ -42,6 +42,10 @@ output "relay_namespace_name" {
   value = var.enable_relay ? module.relay_namespace[0].name : null
 }
 
+output "relay_namespace_id" {
+  value = var.enable_relay ? module.relay_namespace[0].id : null
+}
+
 output "servicebus_namespace_name" {
   value = var.enable_service_bus ? module.servicebus_namespace[0].namespace_name : null
 }

infrastructure/terraform/main.tf

@@ -82,4 +82,5 @@ module "container-apps" {
   container_memory                      = var.container_memory
   min_replicas                          = var.min_replicas
   relay_namespace_name                  = var.deploy_infra ? module.infra[0].relay_namespace_name : null
+  relay_namespace_id                    = var.deploy_infra ? module.infra[0].relay_namespace_id : null
 }