From ff279e66d592a41e20d1bb4285cb22ec32c109e5 Mon Sep 17 00:00:00 2001
From: Colby Farley <farleycolby@gmail.com>
Date: Fri, 17 Apr 2026 19:28:44 -0500
Subject: [PATCH] Fix split subscription SDK import

---
 pyproject.toml                  |  1 +
 src/azurefox/clients/factory.py |  3 +-
 tests/test_clients_factory.py   | 98 +++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_clients_factory.py

diff --git a/pyproject.toml b/pyproject.toml
index 0c0057a..e41d2c8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,6 +18,7 @@ dependencies = [
   "azure-identity>=1.17,<2",
   "azure-keyvault-secrets>=4.9,<5",
   "azure-mgmt-resource>=23.1,<26",
+  "azure-mgmt-resource-subscriptions>=1.0.0b1,<2",
   "azure-mgmt-authorization>=4.0,<5",
   "azure-mgmt-keyvault>=10.3,<11",
   "azure-mgmt-storage>=21.2,<22",
diff --git a/src/azurefox/clients/factory.py b/src/azurefox/clients/factory.py
index 1064128..b6ba680 100644
--- a/src/azurefox/clients/factory.py
+++ b/src/azurefox/clients/factory.py
@@ -39,7 +39,8 @@ def build_clients(session: AuthSession, requested_subscription: str | None) -> A
         from azure.mgmt.mysqlflexibleservers import MySQLManagementClient
         from azure.mgmt.network import NetworkManagementClient
         from azure.mgmt.postgresqlflexibleservers import PostgreSQLManagementClient
-        from azure.mgmt.resource import ResourceManagementClient, SubscriptionClient
+        from azure.mgmt.resource import ResourceManagementClient
+        from azure.mgmt.resource.subscriptions import SubscriptionClient
         from azure.mgmt.sql import SqlManagementClient
         from azure.mgmt.storage import StorageManagementClient
         from azure.mgmt.web import WebSiteManagementClient
diff --git a/tests/test_clients_factory.py b/tests/test_clients_factory.py
new file mode 100644
index 0000000..423c7d7
--- /dev/null
+++ b/tests/test_clients_factory.py
@@ -0,0 +1,98 @@
+from __future__ import annotations
+
+import sys
+from types import ModuleType, SimpleNamespace
+
+from azurefox.clients.factory import build_clients
+
+
+def _install_module(monkeypatch, name: str, *, is_package: bool = False, **attrs) -> ModuleType:
+    module = ModuleType(name)
+    if is_package:
+        module.__path__ = []
+    for attr_name, attr_value in attrs.items():
+        setattr(module, attr_name, attr_value)
+    monkeypatch.setitem(sys.modules, name, module)
+    return module
+
+
+def _management_client_class(name: str):
+    class FakeManagementClient:
+        def __init__(self, credential: object, subscription_id: str) -> None:
+            self.credential = credential
+            self.subscription_id = subscription_id
+
+    FakeManagementClient.__name__ = name
+    return FakeManagementClient
+
+
+def _install_fake_management_modules(
+    monkeypatch,
+    *,
+    subscription_client_on_resource: bool,
+    subscription_client_on_split_module: bool,
+) -> None:
+    _install_module(monkeypatch, "azure", is_package=True)
+    _install_module(monkeypatch, "azure.mgmt", is_package=True)
+
+    subscriptions = [
+        SimpleNamespace(subscription_id="sub-a", display_name="Alpha", state="Enabled"),
+        SimpleNamespace(subscription_id="sub-b", display_name="Beta", state="Warned"),
+    ]
+
+    class FakeSubscriptionClient:
+        def __init__(self, credential: object) -> None:
+            self.credential = credential
+            self.subscriptions = SimpleNamespace(list=lambda: list(subscriptions))
+
+    client_modules = {
+        "azure.mgmt.apimanagement": ("ApiManagementClient",),
+        "azure.mgmt.authorization": ("AuthorizationManagementClient",),
+        "azure.mgmt.automation": ("AutomationClient",),
+        "azure.mgmt.compute": ("ComputeManagementClient",),
+        "azure.mgmt.containerregistry": ("ContainerRegistryManagementClient",),
+        "azure.mgmt.containerservice": ("ContainerServiceClient",),
+        "azure.mgmt.keyvault": ("KeyVaultManagementClient",),
+        "azure.mgmt.mysqlflexibleservers": ("MySQLManagementClient",),
+        "azure.mgmt.network": ("NetworkManagementClient",),
+        "azure.mgmt.postgresqlflexibleservers": ("PostgreSQLManagementClient",),
+        "azure.mgmt.sql": ("SqlManagementClient",),
+        "azure.mgmt.storage": ("StorageManagementClient",),
+        "azure.mgmt.web": ("WebSiteManagementClient",),
+    }
+    for module_name, class_names in client_modules.items():
+        _install_module(
+            monkeypatch,
+            module_name,
+            **{class_name: _management_client_class(class_name) for class_name in class_names},
+        )
+
+    resource_attrs = {
+        "ResourceManagementClient": _management_client_class("ResourceManagementClient"),
+    }
+    if subscription_client_on_resource:
+        resource_attrs["SubscriptionClient"] = FakeSubscriptionClient
+    _install_module(monkeypatch, "azure.mgmt.resource", is_package=True, **resource_attrs)
+
+    if subscription_client_on_split_module:
+        _install_module(
+            monkeypatch,
+            "azure.mgmt.resource.subscriptions",
+            SubscriptionClient=FakeSubscriptionClient,
+        )
+
+
+def test_build_clients_supports_split_subscription_package(monkeypatch) -> None:
+    _install_fake_management_modules(
+        monkeypatch,
+        subscription_client_on_resource=False,
+        subscription_client_on_split_module=True,
+    )
+
+    session = SimpleNamespace(credential=object())
+
+    clients = build_clients(session, "sub-b")
+
+    assert clients.subscription_id == "sub-b"
+    assert clients.subscription.display_name == "Beta"
+    assert clients.resource.subscription_id == "sub-b"