Merge pull request #68 from Azure/e-20

Better Front Door and Private Link integration due to module outputs

README.md

@@ -197,4 +197,6 @@ No modules.
 | <a name="output_container_app_fqdn"></a> [container\_app\_fqdn](#output\_container\_app\_fqdn) | The FQDN of the Container App's ingress. |
 | <a name="output_container_app_identities"></a> [container\_app\_identities](#output\_container\_app\_identities) | The identities of the Container App, key is Container App's name. |
 | <a name="output_container_app_ips"></a> [container\_app\_ips](#output\_container\_app\_ips) | The IPs of the Latest Revision of the Container App. |
+| <a name="output_container_app_uri"></a> [container\_app\_uri](#output\_container\_app\_uri) | The URI of the Container App's ingress. |
+| <a name="output_default_domain"></a> [default\_domain](#output\_default\_domain) | The default domain of the Container App Environment. |
 <!-- END_TF_DOCS -->

examples/acr/outputs.tf

@@ -1,3 +1,9 @@
 output "app_url" {
+  value = module.container_apps.container_app_uri
+}
+output "app_fqdn" {
   value = module.container_apps.container_app_fqdn
 }
+output "default_domain" {
+  value = module.container_apps.default_domain
+}

examples/existing-env/outputs.tf

@@ -1,3 +1,3 @@
 output "dashboard_url" {
-  value = module.container_apps.container_app_fqdn["dashboard"]
+  value = module.container_apps.container_app_uri["dashboard"]
 }

examples/init-container/outputs.tf

@@ -1,3 +1,3 @@
 output "url" {
-  value = module.container_apps.container_app_fqdn["example"]
+  value = module.container_apps.container_app_uri["example"]
 }

examples/startup/outputs.tf

@@ -1,3 +1,3 @@
 output "dashboard_url" {
-  value = module.container_apps.container_app_fqdn["dashboard"]
+  value = module.container_apps.container_app_uri["dashboard"]
 }

locals.tf

@@ -1,4 +1,6 @@
 locals {
   container_app_secrets  = { for k, v in var.container_app_secrets : k => { for i in v : i.name => i } }
   dapr_component_secrets = { for k, v in var.dapr_component_secrets : k => { for i in v : i.name => i.value } }
+  fqdns                  = { for name, container in azurerm_container_app.container_app : name => try(container.ingress[0].fqdn, "") if can(container.ingress[0].fqdn) }
+  uris                   = { for name, fqdn in local.fqdns : name => "https://${fqdn}" }
 }

main.tf

@@ -1,5 +1,7 @@
 locals {
-  container_app_environment_id = try(data.azurerm_container_app_environment.container_env[0].id, azurerm_container_app_environment.container_env[0].id)
+  container_app_environment_default_domain    = try(data.azurerm_container_app_environment.container_env[0].default_domain, azurerm_container_app_environment.container_env[0].default_domain)
+  container_app_environment_id                = try(data.azurerm_container_app_environment.container_env[0].id, azurerm_container_app_environment.container_env[0].id)
+  container_app_environment_static_ip_address = try(azurerm_container_app_environment.container_env[0].static_ip_address, data.azurerm_container_app_environment.container_env[0].static_ip_address)
 }
 
 resource "azurerm_log_analytics_workspace" "laws" {

outputs.tf

@@ -5,7 +5,7 @@ output "container_app_environment_id" {
 
 output "container_app_fqdn" {
   description = "The FQDN of the Container App's ingress."
-  value       = { for name, container in azurerm_container_app.container_app : name => "https://${try(container.ingress[0].fqdn, "")}" if can(container.ingress[0].fqdn) }
+  value       = local.fqdns
 }
 
 output "container_app_identities" {
@@ -20,5 +20,15 @@ output "container_app_identities" {
 
 output "container_app_ips" {
   description = "The IPs of the Latest Revision of the Container App."
-  value       = try(azurerm_container_app_environment.container_env[0].static_ip_address, data.azurerm_container_app_environment.container_env[0].static_ip_address)
+  value       = local.container_app_environment_static_ip_address
+}
+
+output "container_app_uri" {
+  description = "The URI of the Container App's ingress."
+  value       = local.uris
+}
+
+output "default_domain" {
+  description = "The default domain of the Container App Environment."
+  value       = local.container_app_environment_default_domain
 }

versions.tf

@@ -7,4 +7,4 @@ terraform {
       version = ">= 3.98, < 4.0"
     }
   }
-}
+}