Update Test Case Usage (#42613)

Author: mrm9084

sdk/appconfiguration/azure-appconfiguration-provider/tests/asynctestcase.py

@@ -8,147 +8,36 @@
 from azure.appconfiguration.aio import AzureAppConfigurationClient
 from testcase import get_configs
 from azure.appconfiguration.provider.aio import load
-from azure.appconfiguration.provider import SettingSelector, AzureAppConfigurationKeyVaultOptions
+from azure.appconfiguration.provider import AzureAppConfigurationKeyVaultOptions
 from test_constants import FEATURE_MANAGEMENT_KEY, FEATURE_FLAG_KEY
 
 
 class AppConfigTestCase(AzureRecordedTestCase):
-    async def create_aad_client(
-        self,
-        appconfiguration_endpoint_string,
-        trim_prefixes=[],
-        selects={SettingSelector(key_filter="*", label_filter="\0")},
-        keyvault_secret_url=None,
-        refresh_on=None,
-        refresh_interval=30,
-        secret_resolver=None,
-        key_vault_options=None,
-        on_refresh_success=None,
-        feature_flag_enabled=False,
-        feature_flag_selectors=[SettingSelector(key_filter="*", label_filter="\0")],
-        feature_flag_refresh_enabled=False,
-    ):
-        cred = self.get_credential(AzureAppConfigurationClient, is_async=True)
+    async def create_client(self, **kwargs):
+        credential = self.get_credential(AzureAppConfigurationClient, is_async=True)
+        client = None
 
-        if not secret_resolver and keyvault_secret_url:
-            keyvault_cred = cred
+        if "connection_string" in kwargs:
+            client = AzureAppConfigurationClient.from_connection_string(kwargs["connection_string"])
         else:
-            keyvault_cred = None
+            client = AzureAppConfigurationClient(kwargs["endpoint"], credential)
 
-        client = AzureAppConfigurationClient(appconfiguration_endpoint_string, cred)
-        await setup_configs(client, keyvault_secret_url)
+        await setup_configs(client, kwargs.get("keyvault_secret_url"))
+        kwargs["user_agent"] = "SDK/Integration"
 
-        if not secret_resolver and keyvault_secret_url and not key_vault_options:
-            keyvault_cred = cred
-            return await load(
-                credential=cred,
-                endpoint=appconfiguration_endpoint_string,
-                trim_prefixes=trim_prefixes,
-                selects=selects,
-                refresh_on=refresh_on,
-                refresh_interval=refresh_interval,
-                user_agent="SDK/Integration",
-                keyvault_credential=keyvault_cred,
-                on_refresh_success=on_refresh_success,
-                feature_flag_enabled=feature_flag_enabled,
-                feature_flag_selectors=feature_flag_selectors,
-                feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-            )
-        if key_vault_options:
-            if not key_vault_options.secret_resolver:
-                key_vault_options = AzureAppConfigurationKeyVaultOptions(credential=cred)
-            return await load(
-                credential=cred,
-                endpoint=appconfiguration_endpoint_string,
-                trim_prefixes=trim_prefixes,
-                selects=selects,
-                refresh_on=refresh_on,
-                refresh_interval=refresh_interval,
-                user_agent="SDK/Integration",
-                key_vault_options=key_vault_options,
-                on_refresh_success=on_refresh_success,
-                feature_flag_enabled=feature_flag_enabled,
-                feature_flag_selectors=feature_flag_selectors,
-                feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-            )
-        return await load(
-            credential=cred,
-            endpoint=appconfiguration_endpoint_string,
-            trim_prefixes=trim_prefixes,
-            selects=selects,
-            refresh_on=refresh_on,
-            refresh_interval=refresh_interval,
-            user_agent="SDK/Integration",
-            secret_resolver=secret_resolver,
-            on_refresh_success=on_refresh_success,
-            feature_flag_enabled=feature_flag_enabled,
-            feature_flag_selectors=feature_flag_selectors,
-            feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-        )
+        if "endpoint" in kwargs:
+            kwargs["credential"] = credential
 
-    async def create_client(
-        self,
-        appconfiguration_connection_string,
-        trim_prefixes=[],
-        selects={SettingSelector(key_filter="*", label_filter="\0")},
-        keyvault_secret_url=None,
-        refresh_on=None,
-        refresh_interval=30,
-        secret_resolver=None,
-        key_vault_options=None,
-        on_refresh_success=None,
-        feature_flag_enabled=False,
-        feature_flag_selectors=[SettingSelector(key_filter="*", label_filter="\0")],
-        feature_flag_refresh_enabled=False,
-    ):
-        client = AzureAppConfigurationClient.from_connection_string(appconfiguration_connection_string)
-        await setup_configs(client, keyvault_secret_url)
+        if "secret_resolver" not in kwargs and kwargs.get("keyvault_secret_url") and "key_vault_options" not in kwargs:
+            kwargs["keyvault_credential"] = credential
 
-        if not secret_resolver and keyvault_secret_url and not key_vault_options:
-            return await load(
-                connection_string=appconfiguration_connection_string,
-                trim_prefixes=trim_prefixes,
-                selects=selects,
-                refresh_on=refresh_on,
-                refresh_interval=refresh_interval,
-                user_agent="SDK/Integration",
-                keyvault_credential=self.get_credential(AzureAppConfigurationClient, is_async=True),
-                on_refresh_success=on_refresh_success,
-                feature_flag_enabled=feature_flag_enabled,
-                feature_flag_selectors=feature_flag_selectors,
-                feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-            )
-        if key_vault_options:
+        if "key_vault_options" in kwargs:
+            key_vault_options = kwargs.pop("key_vault_options")
             if not key_vault_options.secret_resolver:
-                key_vault_options = AzureAppConfigurationKeyVaultOptions(
-                    credential=self.get_credential(AzureAppConfigurationClient, is_async=True)
-                )
-            return await load(
-                connection_string=appconfiguration_connection_string,
-                trim_prefixes=trim_prefixes,
-                selects=selects,
-                refresh_on=refresh_on,
-                refresh_interval=refresh_interval,
-                user_agent="SDK/Integration",
-                key_vault_options=key_vault_options,
-                on_refresh_success=on_refresh_success,
-                feature_flag_enabled=feature_flag_enabled,
-                feature_flag_selectors=feature_flag_selectors,
-                feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-            )
-        return await load(
-            connection_string=appconfiguration_connection_string,
-            trim_prefixes=trim_prefixes,
-            selects=selects,
-            refresh_on=refresh_on,
-            refresh_interval=refresh_interval,
-            user_agent="SDK/Integration",
-            secret_resolver=secret_resolver,
-            on_refresh_success=on_refresh_success,
-            feature_flag_enabled=feature_flag_enabled,
-            feature_flag_selectors=feature_flag_selectors,
-            feature_flag_refresh_enabled=feature_flag_refresh_enabled,
-        )
+                key_vault_options = AzureAppConfigurationKeyVaultOptions(credential=credential)
+            kwargs["key_vault_options"] = key_vault_options
+
+        return await load(**kwargs)
 
     @staticmethod
     def create_sdk_client(appconfiguration_connection_string):

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_async_provider.py

@@ -22,7 +22,7 @@ class TestAppConfigurationProvider(AppConfigTestCase):
     @recorded_by_proxy_async
     async def test_provider_creation(self, appconfiguration_connection_string, appconfiguration_keyvault_secret_url):
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             feature_flag_enabled=True,
         ) as client:
@@ -40,7 +40,7 @@ async def test_provider_trim_prefixes(
     ):
         trimmed = {"test."}
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             trim_prefixes=trimmed,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             feature_flag_enabled=True,
@@ -58,7 +58,7 @@ async def test_provider_trim_prefixes(
     async def test_provider_selectors(self, appconfiguration_connection_string, appconfiguration_keyvault_secret_url):
         selects = {SettingSelector(key_filter="message*", label_filter="dev")}
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             selects=selects,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
         ) as client:
@@ -74,7 +74,7 @@ async def test_provider_key_vault_reference(
     ):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             selects=selects,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
         ) as client:
@@ -86,7 +86,7 @@ async def test_provider_key_vault_reference(
     async def test_provider_secret_resolver(self, appconfiguration_connection_string):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         async with await self.create_client(
-            appconfiguration_connection_string, selects=selects, secret_resolver=secret_resolver
+            connection_string=appconfiguration_connection_string, selects=selects, secret_resolver=secret_resolver
         ) as client:
             assert client["secret"] == "Resolver Value"
 
@@ -99,7 +99,7 @@ async def test_provider_key_vault_reference_options(
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         key_vault_options = AzureAppConfigurationKeyVaultOptions()
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             selects=selects,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             key_vault_options=key_vault_options,
@@ -113,7 +113,7 @@ async def test_provider_secret_resolver_options(self, appconfiguration_connectio
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         key_vault_options = AzureAppConfigurationKeyVaultOptions(secret_resolver=secret_resolver)
         async with await self.create_client(
-            appconfiguration_connection_string, selects=selects, key_vault_options=key_vault_options
+            connection_string=appconfiguration_connection_string, selects=selects, key_vault_options=key_vault_options
         ) as client:
             assert client["secret"] == "Resolver Value"
 
@@ -223,7 +223,7 @@ async def test_process_key_value_content_type(self, appconfiguration_connection_
     async def test_provider_tag_filters(self, appconfiguration_connection_string, appconfiguration_keyvault_secret_url):
         selects = {SettingSelector(key_filter="*", tag_filters=["a=b"])}
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             selects=selects,
             feature_flag_enabled=True,
             feature_flag_selectors={SettingSelector(key_filter="*", tag_filters=["a=b"])},

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_async_provider_aad.py

@@ -15,8 +15,8 @@ class TestAppConfigurationProvider(AppConfigTestCase):
     @app_config_decorator_async
     @recorded_by_proxy_async
     async def test_provider_creation_aad(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string,
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             feature_flag_enabled=True,
         ) as client:
@@ -31,8 +31,8 @@ async def test_provider_creation_aad(self, appconfiguration_endpoint_string, app
     @recorded_by_proxy_async
     async def test_provider_trim_prefixes(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
         trimmed = {"test."}
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string,
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
             trim_prefixes=trimmed,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             feature_flag_enabled=True,
@@ -48,8 +48,8 @@ async def test_provider_trim_prefixes(self, appconfiguration_endpoint_string, ap
     @recorded_by_proxy_async
     async def test_provider_selectors(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
         selects = {SettingSelector(key_filter="message*", label_filter="dev")}
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string,
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
             selects=selects,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
         ) as client:
@@ -64,8 +64,10 @@ async def test_provider_key_vault_reference(
         self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url
     ):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string, selects=selects, keyvault_secret_url=appconfiguration_keyvault_secret_url
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
+            selects=selects,
+            keyvault_secret_url=appconfiguration_keyvault_secret_url,
         ) as client:
             assert client["secret"] == "Very secret value"
 
@@ -74,8 +76,8 @@ async def test_provider_key_vault_reference(
     @recorded_by_proxy_async
     async def test_provider_secret_resolver(self, appconfiguration_endpoint_string):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string, selects=selects, secret_resolver=secret_resolver
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string, selects=selects, secret_resolver=secret_resolver
         ) as client:
             assert client["secret"] == "Resolver Value"
 
@@ -87,8 +89,8 @@ async def test_provider_key_vault_reference_options(
     ):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         key_vault_options = AzureAppConfigurationKeyVaultOptions()
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string,
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
             selects=selects,
             keyvault_secret_url=appconfiguration_keyvault_secret_url,
             key_vault_options=key_vault_options,
@@ -101,17 +103,17 @@ async def test_provider_key_vault_reference_options(
     async def test_provider_secret_resolver_options(self, appconfiguration_endpoint_string):
         selects = {SettingSelector(key_filter="*", label_filter="prod")}
         key_vault_options = AzureAppConfigurationKeyVaultOptions(secret_resolver=secret_resolver)
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string, selects=selects, key_vault_options=key_vault_options
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string, selects=selects, key_vault_options=key_vault_options
         ) as client:
             assert client["secret"] == "Resolver Value"
 
     @app_config_decorator_async
     @recorded_by_proxy_async
     async def test_provider_tag_filters(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
         selects = {SettingSelector(key_filter="*", tag_filters=["a=b"])}
-        async with await self.create_aad_client(
-            appconfiguration_endpoint_string,
+        async with await self.create_client(
+            endpoint=appconfiguration_endpoint_string,
             selects=selects,
             feature_flag_enabled=True,
             feature_flag_selectors={SettingSelector(key_filter="*", tag_filters=["a=b"])},

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_async_provider_feature_management.py

@@ -18,7 +18,7 @@ class TestAppConfigurationProviderFeatureManagement(AppConfigTestCase):
     @recorded_by_proxy_async
     async def test_load_only_feature_flags(self, appconfiguration_connection_string):
         async with await self.create_client(
-            appconfiguration_connection_string,
+            connection_string=appconfiguration_connection_string,
             selects=[],
             feature_flag_enabled=True,
         ) as client:

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_async_provider_refresh.py

@@ -26,8 +26,8 @@ class TestAppConfigurationProvider(AppConfigTestCase, unittest.TestCase):
         @pytest.mark.asyncio
         async def test_refresh(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
             mock_callback = AsyncMock()
-            async with await self.create_aad_client(
-                appconfiguration_endpoint_string,
+            async with await self.create_client(
+                endpoint=appconfiguration_endpoint_string,
                 keyvault_secret_url=appconfiguration_keyvault_secret_url,
                 refresh_on=[WatchKey("refresh_message")],
                 refresh_interval=1,
@@ -95,8 +95,8 @@ async def test_refresh(self, appconfiguration_endpoint_string, appconfiguration_
         @pytest.mark.asyncio
         async def test_empty_refresh(self, appconfiguration_endpoint_string, appconfiguration_keyvault_secret_url):
             mock_callback = AsyncMock()
-            async with await self.create_aad_client(
-                appconfiguration_endpoint_string,
+            async with await self.create_client(
+                endpoint=appconfiguration_endpoint_string,
                 keyvault_secret_url=appconfiguration_keyvault_secret_url,
                 on_refresh_success=mock_callback,
                 feature_flag_enabled=True,