Registry block for Custom Container Apps is optional (#342)

* Made 'registry' property optional for Custom Container Apps

* Updated 'registry' block to be set only if var is not null

Author: DrizzlyOwl

README.md

@@ -729,7 +729,7 @@ module "azure_container_apps_hosting" {
 | <a name="input_container_scale_out_rule_end"></a> [container\_scale\_out\_rule\_end](#input\_container\_scale\_out\_rule\_end) | Specify a time using Linux cron format that represents the end of the scale-out window. Defaults to 18:00 | `string` | `"0 18 * * *"` | no |
 | <a name="input_container_scale_out_rule_start"></a> [container\_scale\_out\_rule\_start](#input\_container\_scale\_out\_rule\_start) | Specify a time using Linux cron format that represents the start of the scale-out window. Defaults to 08:00 | `string` | `"0 8 * * *"` | no |
 | <a name="input_container_secret_environment_variables"></a> [container\_secret\_environment\_variables](#input\_container\_secret\_environment\_variables) | Container environment variables, which are defined as `secrets` within the container app configuration. This is to help reduce the risk of accidentally exposing secrets. | `map(string)` | `{}` | no |
-| <a name="input_custom_container_apps"></a> [custom\_container\_apps](#input\_custom\_container\_apps) | Custom container apps, by default deployed within the container app environment managed by this module. | <pre>map(object({<br>    container_app_environment_id = optional(string, "")<br>    resource_group_name          = optional(string, "")<br>    revision_mode                = optional(string, "Single")<br>    container_port               = optional(number, 0)<br>    ingress = optional(object({<br>      external_enabled = optional(bool, true)<br>      target_port      = optional(number, null)<br>      traffic_weight = object({<br>        percentage = optional(number, 100)<br>      })<br>      cdn_frontdoor_custom_domain                = optional(string, "")<br>      cdn_frontdoor_origin_fqdn_override         = optional(string, "")<br>      cdn_frontdoor_origin_host_header_override  = optional(string, "")<br>      enable_cdn_frontdoor_health_probe          = optional(bool, false)<br>      cdn_frontdoor_health_probe_protocol        = optional(string, "")<br>      cdn_frontdoor_health_probe_interval        = optional(number, 120)<br>      cdn_frontdoor_health_probe_request_type    = optional(string, "")<br>      cdn_frontdoor_health_probe_path            = optional(string, "")<br>      cdn_frontdoor_forwarding_protocol_override = optional(string, "")<br>    }), null)<br>    identity = optional(list(object({<br>      type         = string<br>      identity_ids = list(string)<br>    })), [])<br>    secrets = optional(list(object({<br>      name  = string<br>      value = string<br>    })), [])<br>    registry = object({<br>      server               = optional(string, "")<br>      username             = optional(string, "")<br>      password_secret_name = optional(string, "")<br>      identity             = optional(string, "")<br>    }),<br>    image   = string<br>    cpu     = number<br>    memory  = number<br>    command = list(string)<br>    liveness_probes = optional(list(object({<br>      interval_seconds = number<br>      transport        = string<br>      port             = number<br>      path             = optional(string, null)<br>    })), [])<br>    env = optional(list(object({<br>      name      = string<br>      value     = optional(string, null)<br>      secretRef = optional(string, null)<br>    })), [])<br>    min_replicas = number<br>    max_replicas = number<br>  }))</pre> | `{}` | no |
+| <a name="input_custom_container_apps"></a> [custom\_container\_apps](#input\_custom\_container\_apps) | Custom container apps, by default deployed within the container app environment managed by this module. | <pre>map(object({<br>    container_app_environment_id = optional(string, "")<br>    resource_group_name          = optional(string, "")<br>    revision_mode                = optional(string, "Single")<br>    container_port               = optional(number, 0)<br>    ingress = optional(object({<br>      external_enabled = optional(bool, true)<br>      target_port      = optional(number, null)<br>      traffic_weight = object({<br>        percentage = optional(number, 100)<br>      })<br>      cdn_frontdoor_custom_domain                = optional(string, "")<br>      cdn_frontdoor_origin_fqdn_override         = optional(string, "")<br>      cdn_frontdoor_origin_host_header_override  = optional(string, "")<br>      enable_cdn_frontdoor_health_probe          = optional(bool, false)<br>      cdn_frontdoor_health_probe_protocol        = optional(string, "")<br>      cdn_frontdoor_health_probe_interval        = optional(number, 120)<br>      cdn_frontdoor_health_probe_request_type    = optional(string, "")<br>      cdn_frontdoor_health_probe_path            = optional(string, "")<br>      cdn_frontdoor_forwarding_protocol_override = optional(string, "")<br>    }), null)<br>    identity = optional(list(object({<br>      type         = string<br>      identity_ids = list(string)<br>    })), [])<br>    secrets = optional(list(object({<br>      name  = string<br>      value = string<br>    })), [])<br>    registry = optional(object({<br>      server               = optional(string, "")<br>      username             = optional(string, "")<br>      password_secret_name = optional(string, "")<br>      identity             = optional(string, "")<br>    }), null),<br>    image   = string<br>    cpu     = number<br>    memory  = number<br>    command = list(string)<br>    liveness_probes = optional(list(object({<br>      interval_seconds = number<br>      transport        = string<br>      port             = number<br>      path             = optional(string, null)<br>    })), [])<br>    env = optional(list(object({<br>      name      = string<br>      value     = optional(string, null)<br>      secretRef = optional(string, null)<br>    })), [])<br>    min_replicas = number<br>    max_replicas = number<br>  }))</pre> | `{}` | no |
 | <a name="input_dns_a_records"></a> [dns\_a\_records](#input\_dns\_a\_records) | DNS A records to add to the DNS Zone | <pre>map(<br>    object({<br>      ttl : optional(number, 300),<br>      records : list(string)<br>    })<br>  )</pre> | `{}` | no |
 | <a name="input_dns_aaaa_records"></a> [dns\_aaaa\_records](#input\_dns\_aaaa\_records) | DNS AAAA records to add to the DNS Zone | <pre>map(<br>    object({<br>      ttl : optional(number, 300),<br>      records : list(string)<br>    })<br>  )</pre> | `{}` | no |
 | <a name="input_dns_alias_records"></a> [dns\_alias\_records](#input\_dns\_alias\_records) | DNS ALIAS records to add to the DNS Zone | <pre>map(<br>    object({<br>      ttl : optional(number, 300),<br>      target_resource_id : string<br>    })<br>  )</pre> | `{}` | no |

custom-container-apps.tf

@@ -49,11 +49,15 @@ resource "azurerm_container_app" "custom_container_apps" {
     }
   }
 
-  registry {
-    server               = each.value.registry.server != "" ? each.value.registry.server : local.registry_server
-    username             = each.value.registry.identity == "" ? each.value.registry.username != "" ? each.value.registry.username : local.registry_username : null
-    password_secret_name = each.value.registry.identity == "" ? each.value.registry.password_secret_name != "" ? each.value.registry.password_secret_name : "acr-password" : null
-    identity             = each.value.registry.identity != "" ? each.value.registry.identity : null
+  dynamic "registry" {
+    for_each = each.value.registry != null ? [1] : []
+
+    content {
+      server               = each.value.registry.server != "" ? each.value.registry.server : local.registry_server
+      username             = each.value.registry.identity == "" ? each.value.registry.username != "" ? each.value.registry.username : local.registry_username : null
+      password_secret_name = each.value.registry.identity == "" ? each.value.registry.password_secret_name != "" ? each.value.registry.password_secret_name : "acr-password" : null
+      identity             = each.value.registry.identity != "" ? each.value.registry.identity : null
+    }
   }
 
   template {

variables.tf

@@ -1052,12 +1052,12 @@ variable "custom_container_apps" {
       name  = string
       value = string
     })), [])
-    registry = object({
+    registry = optional(object({
       server               = optional(string, "")
       username             = optional(string, "")
       password_secret_name = optional(string, "")
       identity             = optional(string, "")
-    }),
+    }), null),
     image   = string
     cpu     = number
     memory  = number