From e3e75304998ab9eafc9af8d658c3530575a6d7e8 Mon Sep 17 00:00:00 2001
From: Ash Davies <3853061+DrizzlyOwl@users.noreply.github.com>
Date: Wed, 1 May 2024 11:30:13 +0100
Subject: [PATCH] Override default Container Registry hostname (#466)

---
 terraform/README.md                 | 1 +
 terraform/container-apps-hosting.tf | 1 +
 terraform/locals.tf                 | 1 +
 terraform/variables.tf              | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/terraform/README.md b/terraform/README.md
index 312d16e21..9be9857f0 100644
--- a/terraform/README.md
+++ b/terraform/README.md
@@ -194,6 +194,7 @@ No resources.
 | <a name="input_project_name"></a> [project\_name](#input\_project\_name) | Project name. Will be used along with `environment` as a prefix for all resources. | `string` | n/a | yes |
 | <a name="input_registry_admin_enabled"></a> [registry\_admin\_enabled](#input\_registry\_admin\_enabled) | Do you want to enable access key based authentication for your Container Registry? | `bool` | `false` | no |
 | <a name="input_registry_managed_identity_assign_role"></a> [registry\_managed\_identity\_assign\_role](#input\_registry\_managed\_identity\_assign\_role) | Assign the 'AcrPull' Role to the Container App User-Assigned Managed Identity. Note: If you do not have 'Microsoft.Authorization/roleAssignments/write' permission, you will need to manually assign the 'AcrPull' Role to the identity | `bool` | `false` | no |
+| <a name="input_registry_server"></a> [registry\_server](#input\_registry\_server) | Container registry server (required if `enable_container_registry` is false) | `string` | `""` | no |
 | <a name="input_registry_use_managed_identity"></a> [registry\_use\_managed\_identity](#input\_registry\_use\_managed\_identity) | Create a User-Assigned Managed Identity for the Container App. Note: If you do not have 'Microsoft.Authorization/roleAssignments/write' permission, you will need to manually assign the 'AcrPull' Role to the identity | `bool` | `true` | no |
 | <a name="input_statuscake_api_token"></a> [statuscake\_api\_token](#input\_statuscake\_api\_token) | API token for StatusCake | `string` | `"00000000000000000000000000000"` | no |
 | <a name="input_statuscake_contact_group_email_addresses"></a> [statuscake\_contact\_group\_email\_addresses](#input\_statuscake\_contact\_group\_email\_addresses) | List of email address that should receive notifications from StatusCake | `list(string)` | `[]` | no |
diff --git a/terraform/container-apps-hosting.tf b/terraform/container-apps-hosting.tf
index c1a0b1ca4..9f6c4bd69 100644
--- a/terraform/container-apps-hosting.tf
+++ b/terraform/container-apps-hosting.tf
@@ -12,6 +12,7 @@ module "azure_container_apps_hosting" {
   registry_admin_enabled                = local.registry_admin_enabled
   registry_use_managed_identity         = local.registry_use_managed_identity
   registry_managed_identity_assign_role = local.registry_managed_identity_assign_role
+  registry_server                       = local.registry_server
 
   image_name                             = local.image_name
   container_command                      = local.container_command
diff --git a/terraform/locals.tf b/terraform/locals.tf
index 16f9c7214..7be358a60 100644
--- a/terraform/locals.tf
+++ b/terraform/locals.tf
@@ -8,6 +8,7 @@ locals {
   registry_admin_enabled                          = var.registry_admin_enabled
   registry_use_managed_identity                   = var.registry_use_managed_identity
   registry_managed_identity_assign_role           = var.registry_managed_identity_assign_role
+  registry_server                                 = var.registry_server
   image_name                                      = var.image_name
   container_command                               = var.container_command
   container_secret_environment_variables          = var.container_secret_environment_variables
diff --git a/terraform/variables.tf b/terraform/variables.tf
index ba50051cc..56452c141 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -38,6 +38,12 @@ variable "enable_container_registry" {
   type        = bool
 }
 
+variable "registry_server" {
+  description = "Container registry server (required if `enable_container_registry` is false)"
+  type        = string
+  default     = ""
+}
+
 variable "registry_admin_enabled" {
   description = "Do you want to enable access key based authentication for your Container Registry?"
   type        = bool