From b09e683e54b78d6edbf4586394d11447ff9422ab Mon Sep 17 00:00:00 2001
From: Jim Madge <jmadge@turing.ac.uk>
Date: Mon, 21 Oct 2024 16:01:14 +0100
Subject: [PATCH] Allow data providers address to be 'Internet'

---
 data_safe_haven/config/config_sections.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/data_safe_haven/config/config_sections.py b/data_safe_haven/config/config_sections.py
index 35b9570a7e..62bfec0833 100644
--- a/data_safe_haven/config/config_sections.py
+++ b/data_safe_haven/config/config_sections.py
@@ -57,7 +57,7 @@ class ConfigSectionSRE(BaseModel, validate_assignment=True):
     admin_email_address: EmailAddress
     admin_ip_addresses: list[IpAddress] = []
     databases: UniqueList[DatabaseSystem] = []
-    data_provider_ip_addresses: list[IpAddress] = []
+    data_provider_ip_addresses: list[IpAddress] | AzureServiceTag = []
     remote_desktop: ConfigSubsectionRemoteDesktopOpts
     research_user_ip_addresses: list[IpAddress] | AzureServiceTag = []
     storage_quota_gb: ConfigSubsectionStorageQuotaGB
@@ -67,8 +67,6 @@ class ConfigSectionSRE(BaseModel, validate_assignment=True):
 
     @field_validator(
         "admin_ip_addresses",
-        "data_provider_ip_addresses",
-        # "research_user_ip_addresses",
         mode="after",
     )
     @classmethod
@@ -81,6 +79,7 @@ def ensure_non_overlapping(cls, v: list[IpAddress]) -> list[IpAddress]:
         return v
 
     @field_validator(
+        "data_provider_ip_addresses",
         "research_user_ip_addresses",
         mode="after",
     )