diff --git a/ChangeLog.md b/ChangeLog.md index 1b576165187..d2285d00e68 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -8,6 +8,7 @@ Modelerfour version: 4.15.400 - Add `azure-mgmt-core` as a dependency in the generated setup.py file #738 - Correct typing for `credential` when default credential policy type is `AzureKeyCredentialPolicy` #744 +- Replace instead of extending `credential_scopes` if user has inputted their own #745 ### 2020-08-04 - 5.1.0-preview.6 Autorest Core version: 3.0.6287 diff --git a/autorest/codegen/templates/config.py.jinja2 b/autorest/codegen/templates/config.py.jinja2 index 426b2ebc016..57a87a87a9f 100644 --- a/autorest/codegen/templates/config.py.jinja2 +++ b/autorest/codegen/templates/config.py.jinja2 @@ -58,8 +58,7 @@ class {{ code_model.class_name }}Configuration(Configuration): {% endfor %} {% endif %} {% if code_model.options['credential_scopes'] is not none %} - self.credential_scopes = {{ code_model.options['credential_scopes'] }} - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', {{ code_model.options['credential_scopes'] }}) {% endif %} kwargs.setdefault('sdk_moniker', '{{ sdk_moniker }}/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/autorest/multiapi/templates/multiapi_config.py.jinja2 b/autorest/multiapi/templates/multiapi_config.py.jinja2 index 23f7feecd26..133a88bf8a7 100644 --- a/autorest/multiapi/templates/multiapi_config.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_config.py.jinja2 @@ -73,8 +73,7 @@ class {{ client_name }}Configuration(Configuration): {% endfor %} {% endif %} {% if config["credential_scopes"] is not none %} - self.credential_scopes = {{ config['credential_scopes'] }} - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', {{ config['credential_scopes'] }}) {% endif %} kwargs.setdefault('sdk_moniker', '{{ package_name|lower }}/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/AcceptanceTests/asynctests/test_config.py b/test/azure/AcceptanceTests/asynctests/test_config.py index 8b616e2c51b..b198a058420 100644 --- a/test/azure/AcceptanceTests/asynctests/test_config.py +++ b/test/azure/AcceptanceTests/asynctests/test_config.py @@ -45,3 +45,13 @@ async def test_arm_http_logging_policy_custom(self, credential): async with AutoRestHeadTestService(credential, base_url="http://localhost:3000", http_logging_policy=http_logging_policy) as client: assert isinstance(client._config.http_logging_policy, ARMHttpLoggingPolicy) assert client._config.http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"}) + + @pytest.mark.asyncio + async def test_credential_scopes_default(self, credential): + async with AutoRestHeadTestService(credential) as client: + assert client._config.credential_scopes == ['https://management.azure.com/.default'] + + @pytest.mark.asyncio + async def test_credential_scopes_override(self, credential): + async with AutoRestHeadTestService(credential, credential_scopes=["http://i-should-be-the-only-credential"]) as client: + assert client._config.credential_scopes == ["http://i-should-be-the-only-credential"] diff --git a/test/azure/AcceptanceTests/test_config.py b/test/azure/AcceptanceTests/test_config.py index c5a56e63956..e71cbc13803 100644 --- a/test/azure/AcceptanceTests/test_config.py +++ b/test/azure/AcceptanceTests/test_config.py @@ -43,3 +43,11 @@ def test_arm_http_logging_policy_custom(self, credential): with AutoRestHeadTestService(credential, base_url="http://localhost:3000", http_logging_policy=http_logging_policy) as client: assert isinstance(client._config.http_logging_policy, ARMHttpLoggingPolicy) assert client._config.http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"}) + + def test_credential_scopes_default(self, credential): + with AutoRestHeadTestService(credential) as client: + assert client._config.credential_scopes == ['https://management.azure.com/.default'] + + def test_credential_scopes_override(self, credential): + with AutoRestHeadTestService(credential, credential_scopes=["http://i-should-be-the-only-credential"]) as client: + assert client._config.credential_scopes == ["http://i-should-be-the-only-credential"] diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py index 6500e237375..be9e74976e5 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py @@ -49,8 +49,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2015-07-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestazurespecialparameterstestclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py index 67cab4848e2..36d0c63d67d 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py @@ -46,8 +46,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2015-07-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestazurespecialparameterstestclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py index 62106ddd0bc..b6c7ebb631f 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py @@ -48,8 +48,7 @@ def __init__( self.credential = credential self.host = host - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestparameterizedhosttestpagingclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py index 989f372591a..1ed3a229543 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py @@ -45,8 +45,7 @@ def __init__( self.credential = credential self.host = host - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestparameterizedhosttestpagingclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py index 9202340afba..9c0b10179d2 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py @@ -42,8 +42,7 @@ def __init__( super(AutoRestHeadTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestheadtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py index 71e6c891e19..0ef562e51a5 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( super(AutoRestHeadTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestheadtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py index 7aa03036225..cdab93931b1 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py @@ -42,8 +42,7 @@ def __init__( super(AutoRestHeadExceptionTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestheadexceptiontestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py index 62e3c87e852..c6aa74e8867 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( super(AutoRestHeadExceptionTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestheadexceptiontestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py index caafd71f021..2562223619f 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py @@ -42,8 +42,7 @@ def __init__( super(AutoRestLongRunningOperationTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestlongrunningoperationtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py index 8875edec2bc..9a08c2de025 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( super(AutoRestLongRunningOperationTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestlongrunningoperationtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py index bdb173d302a..56bd87ee410 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py @@ -42,8 +42,7 @@ def __init__( super(AutoRestPagingTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestpagingtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py index e54d8aa9fed..61134807822 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( super(AutoRestPagingTestServiceConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'autorestpagingtestservice/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py index 05e309c7e79..fa6023b0123 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py @@ -49,8 +49,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2015-05-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'storagemanagementclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py index 3b2840be839..67347c5c65b 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py @@ -46,8 +46,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2015-05-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'storagemanagementclient/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py index 13b92951cec..3a097c0dd70 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py @@ -49,8 +49,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2014-04-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'microsoftazuretesturl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py index 57671f5f209..3737b81a8f5 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py @@ -46,8 +46,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = "2014-04-01-preview" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'microsoftazuretesturl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/AcceptanceTests/asynctests/test_multiapi.py b/test/multiapi/AcceptanceTests/asynctests/test_multiapi.py index 4e39f346abf..1d7594f33a1 100644 --- a/test/multiapi/AcceptanceTests/asynctests/test_multiapi.py +++ b/test/multiapi/AcceptanceTests/asynctests/test_multiapi.py @@ -94,5 +94,17 @@ async def test_arm_http_logging_policy_custom(credential): assert isinstance(default_client._config.http_logging_policy, ARMHttpLoggingPolicy) assert default_client._config.http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"}) +@pytest.mark.asyncio +async def test_credential_scopes_default(credential): + from multiapi.aio import MultiapiServiceClient + async with MultiapiServiceClient(credential=credential) as client: + assert client._config.credential_scopes == ['https://management.azure.com/.default'] + +@pytest.mark.asyncio +async def test_credential_scopes_override(credential): + from multiapi.aio import MultiapiServiceClient + async with MultiapiServiceClient(credential=credential, credential_scopes=["http://i-should-be-the-only-credential"]) as client: + assert client._config.credential_scopes == ["http://i-should-be-the-only-credential"] + class TestMultiapiClient(NotTested.TestMultiapiBase): pass diff --git a/test/multiapi/AcceptanceTests/test_multiapi.py b/test/multiapi/AcceptanceTests/test_multiapi.py index e5e68b09487..d3fd96da55a 100644 --- a/test/multiapi/AcceptanceTests/test_multiapi.py +++ b/test/multiapi/AcceptanceTests/test_multiapi.py @@ -94,6 +94,16 @@ def test_arm_http_logging_policy_custom(credential): assert isinstance(default_client._config.http_logging_policy, ARMHttpLoggingPolicy) assert default_client._config.http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"}) +def test_credential_scopes_default(credential): + from multiapi import MultiapiServiceClient + with MultiapiServiceClient(credential=credential) as client: + assert client._config.credential_scopes == ['https://management.azure.com/.default'] + +def test_credential_scopes_override(credential): + from multiapi import MultiapiServiceClient + with MultiapiServiceClient(credential=credential, credential_scopes=["http://i-should-be-the-only-credential"]) as client: + assert client._config.credential_scopes == ["http://i-should-be-the-only-credential"] + class TestMultiapiClient(NotTested.TestMultiapiBase): pass diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py index 8db894b6815..c67ee0537fc 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py @@ -38,8 +38,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py index 7d3a06926c9..2f8caec68b3 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py @@ -37,8 +37,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py index cb92bb38356..1dac0b11a3e 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py index 1161abe9587..3631b720788 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py index 49f1400e520..614eea55692 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py index d11758b4bb9..e3775daf0ea 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py index 26a7770fc4e..cd9560f75f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py index 0eeb428f965..a630895f682 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapi/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_configuration.py index 675cc461134..305b5bada15 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_configuration.py @@ -43,8 +43,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py index 14328f8e995..422a9042819 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.endpoint = endpoint - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_configuration.py index 8a55eba0919..9090f821615 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_configuration.py @@ -47,8 +47,7 @@ def __init__( self.credential = credential self.endpoint = endpoint self.api_version = "1.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py index dc3b74d4864..6511fc261d1 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py @@ -44,8 +44,7 @@ def __init__( self.credential = credential self.endpoint = endpoint self.api_version = "1.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_configuration.py index f57620c77c8..3cf97ac57e8 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_configuration.py @@ -47,8 +47,7 @@ def __init__( self.credential = credential self.endpoint = endpoint self.api_version = "2.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py index 5b570f95a30..b2436231b6f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py @@ -44,8 +44,7 @@ def __init__( self.credential = credential self.endpoint = endpoint self.api_version = "2.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapicustombaseurl/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_configuration.py index db736a8563e..82aed980b71 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_configuration.py @@ -37,8 +37,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py index bd3515cecc8..55a3020eb57 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py @@ -36,8 +36,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_configuration.py index f8ccb74a270..eeba0ab8a14 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_configuration.py @@ -41,8 +41,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py index 736d475a617..7f4bbfa392a 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py @@ -38,8 +38,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_configuration.py index 56bceda5c3f..93d4fb1dd6d 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_configuration.py @@ -41,8 +41,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py index a66d426f46c..3301dd75aa1 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py @@ -38,8 +38,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_configuration.py index 543fb29f931..b2b4d1f3810 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_configuration.py @@ -41,8 +41,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py index c2ae3940340..d9baff9861e 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py @@ -38,8 +38,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = [] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', []) kwargs.setdefault('sdk_moniker', 'multiapidataplane/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py index cafcc179445..e142b8910ae 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py @@ -38,8 +38,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapinoasync/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py index 2b44292dea7..ab4282b8eb3 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapinoasync/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py index 19728e526be..bb9efb52dec 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapinoasync/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py index 16d315e8bd5..e6ad28d67f9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapinoasync/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py index dad812a5f1a..fc432f05c09 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py @@ -38,8 +38,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py index b71ff33bc55..bdd69ce18bc 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py @@ -37,8 +37,7 @@ def __init__( super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) self.credential = credential - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py index 6d04e5e432c..5c16284b152 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py index 7018dde34cb..2860557a006 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "1.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py index c8ab24d4037..0ec0658b2fc 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py index 35f8cd1b9ef..1480950025f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "2.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py index 3f1e4386bdb..fefe5b7e12d 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py @@ -42,8 +42,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py index 41b533265ef..15c66bd81dd 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py @@ -39,8 +39,7 @@ def __init__( self.credential = credential self.api_version = "3.0.0" - self.credential_scopes = ['https://management.azure.com/.default'] - self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) + self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'multiapiwithsubmodule/{}'.format(VERSION)) self._configure(**kwargs)