Skip to content

Replace not extend scopes #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iscai-msft merged 5 commits into from
Aug 7, 2020
Merged

Replace not extend scopes #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f9daee
replace instead of extend credential_scopes
iscai-msft Aug 7, 2020
2c0a39a
regenerate
iscai-msft Aug 7, 2020
22534dc
add tests for credential scopes
iscai-msft Aug 7, 2020
7ed94ce
update changelog
iscai-msft Aug 7, 2020
c12060b
Merge branch 'autorestv3' of https://github.com/Azure/autorest.python…
iscai-msft Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions autorest/codegen/templates/config.py.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions autorest/multiapi/templates/multiapi_config.py.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions test/azure/AcceptanceTests/asynctests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 8 additions & 0 deletions test/azure/AcceptanceTests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions .../Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Head/head/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions .../azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...zure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...ected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...ptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 12 additions & 0 deletions test/multiapi/AcceptanceTests/asynctests/test_multiapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions test/multiapi/AcceptanceTests/test_multiapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...pi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...d/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...cceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions ...Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading