Skip to content

Commit e3e900d

Browse files
author
SDKAuto
committed
CodeGen from PR 19118 in Azure/azure-rest-api-specs
Merge f59138f78d76fc64b0bd59f5712dfa9bc9a083f7 into 2f2b633d940230cbbd5bcf1339a2e1c48674e4a2
1 parent 33efbeb commit e3e900d

File tree

230 files changed

+54348
-30549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+54348
-30549
lines changed

‎sdk/eventhub/azure-mgmt-eventhub/_meta.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.5",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.4",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.13.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "ea69fef496210478b8a9e2c3f8804f3acfb35891",
7+
"commit": "e9c78cf4113cef2a21bc8253f4c65bcbc0448709",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/eventhub/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/[email protected].2 --version=3.4.5",
9+
"autorest_command": "autorest specification/eventhub/resource-manager/readme.md --multiapi --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/eventhub/resource-manager/readme.md"
1111
}

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
15-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
15+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1616

1717
from ._version import VERSION
1818

@@ -68,4 +68,4 @@ def _configure(
6868
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6969
self.authentication_policy = kwargs.get('authentication_policy')
7070
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
71+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/_event_hub_management_client.py

Lines changed: 76 additions & 5 deletions
Large diffs are not rendered by default.

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/aio/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
15-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
15+
from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
1616

1717
from .._version import VERSION
1818

@@ -64,4 +64,4 @@ def _configure(
6464
self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs)
6565
self.authentication_policy = kwargs.get('authentication_policy')
6666
if self.credential and not self.authentication_policy:
67-
self.authentication_policy = policies.AsyncBearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
67+
self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/aio/_event_hub_management_client.py

Lines changed: 77 additions & 5 deletions
Large diffs are not rendered by default.

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/v2015_08_01/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['EventHubManagementClient']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/v2015_08_01/_configuration.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,52 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

24-
class EventHubManagementClientConfiguration(Configuration):
22+
class EventHubManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for EventHubManagementClient.
2624
2725
Note that all parameters used to create this instance are saved as instance
2826
attributes.
2927
3028
:param credential: Credential needed for the client to connect to Azure.
3129
:type credential: ~azure.core.credentials.TokenCredential
32-
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
30+
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
31+
subscription. The subscription ID forms part of the URI for every service call.
3332
:type subscription_id: str
33+
:keyword api_version: Api Version. Default value is "2015-08-01". Note that overriding this
34+
default value may result in unsupported behavior.
35+
:paramtype api_version: str
3436
"""
3537

3638
def __init__(
3739
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
40+
credential: "TokenCredential",
41+
subscription_id: str,
42+
**kwargs: Any
43+
) -> None:
44+
super(EventHubManagementClientConfiguration, self).__init__(**kwargs)
45+
api_version = kwargs.pop('api_version', "2015-08-01") # type: str
46+
4347
if credential is None:
4448
raise ValueError("Parameter 'credential' must not be None.")
4549
if subscription_id is None:
4650
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(EventHubManagementClientConfiguration, self).__init__(**kwargs)
4851

4952
self.credential = credential
5053
self.subscription_id = subscription_id
51-
self.api_version = "2015-08-01"
54+
self.api_version = api_version
5255
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5356
kwargs.setdefault('sdk_moniker', 'mgmt-eventhub/{}'.format(VERSION))
5457
self._configure(**kwargs)
@@ -68,4 +71,4 @@ def _configure(
6871
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6972
self.authentication_policy = kwargs.get('authentication_policy')
7073
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
74+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/v2015_08_01/_event_hub_management_client.py

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,23 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, TYPE_CHECKING
1011

11-
from azure.mgmt.core import ARMPipelineClient
1212
from msrest import Deserializer, Serializer
1313

14-
if TYPE_CHECKING:
15-
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
18-
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
14+
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.mgmt.core import ARMPipelineClient
2016

21-
from ._configuration import EventHubManagementClientConfiguration
22-
from .operations import Operations
23-
from .operations import NamespacesOperations
24-
from .operations import EventHubsOperations
25-
from .operations import ConsumerGroupsOperations
2617
from . import models
18+
from ._configuration import EventHubManagementClientConfiguration
19+
from .operations import ConsumerGroupsOperations, EventHubsOperations, NamespacesOperations, Operations
2720

21+
if TYPE_CHECKING:
22+
# pylint: disable=unused-import,ungrouped-imports
23+
from azure.core.credentials import TokenCredential
2824

29-
class EventHubManagementClient(object):
25+
class EventHubManagementClient:
3026
"""Azure Event Hubs client.
3127
3228
:ivar operations: Operations operations
@@ -39,56 +35,63 @@ class EventHubManagementClient(object):
3935
:vartype consumer_groups: azure.mgmt.eventhub.v2015_08_01.operations.ConsumerGroupsOperations
4036
:param credential: Credential needed for the client to connect to Azure.
4137
:type credential: ~azure.core.credentials.TokenCredential
42-
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
38+
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
39+
subscription. The subscription ID forms part of the URI for every service call.
4340
:type subscription_id: str
44-
:param str base_url: Service URL
45-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
41+
:param base_url: Service URL. Default value is "https://management.azure.com".
42+
:type base_url: str
43+
:keyword api_version: Api Version. Default value is "2015-08-01". Note that overriding this
44+
default value may result in unsupported behavior.
45+
:paramtype api_version: str
46+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
47+
Retry-After header is present.
4648
"""
4749

4850
def __init__(
4951
self,
50-
credential, # type: "TokenCredential"
51-
subscription_id, # type: str
52-
base_url=None, # type: Optional[str]
53-
**kwargs # type: Any
54-
):
55-
# type: (...) -> None
56-
if not base_url:
57-
base_url = 'https://management.azure.com'
58-
self._config = EventHubManagementClientConfiguration(credential, subscription_id, **kwargs)
52+
credential: "TokenCredential",
53+
subscription_id: str,
54+
base_url: str = "https://management.azure.com",
55+
**kwargs: Any
56+
) -> None:
57+
self._config = EventHubManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5958
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6059

6160
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6261
self._serialize = Serializer(client_models)
63-
self._serialize.client_side_validation = False
6462
self._deserialize = Deserializer(client_models)
63+
self._serialize.client_side_validation = False
64+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
65+
self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize)
66+
self.event_hubs = EventHubsOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.consumer_groups = ConsumerGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
68+
6569

66-
self.operations = Operations(
67-
self._client, self._config, self._serialize, self._deserialize)
68-
self.namespaces = NamespacesOperations(
69-
self._client, self._config, self._serialize, self._deserialize)
70-
self.event_hubs = EventHubsOperations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.consumer_groups = ConsumerGroupsOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
75-
def _send_request(self, http_request, **kwargs):
76-
# type: (HttpRequest, Any) -> HttpResponse
70+
def _send_request(
71+
self,
72+
request: HttpRequest,
73+
**kwargs: Any
74+
) -> HttpResponse:
7775
"""Runs the network request through the client's chained policies.
7876
79-
:param http_request: The network request you want to make. Required.
80-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
81-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
77+
>>> from azure.core.rest import HttpRequest
78+
>>> request = HttpRequest("GET", "https://www.example.org/")
79+
<HttpRequest [GET], url: 'https://www.example.org/'>
80+
>>> response = client._send_request(request)
81+
<HttpResponse: 200 OK>
82+
83+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
84+
85+
:param request: The network request you want to make. Required.
86+
:type request: ~azure.core.rest.HttpRequest
87+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8288
:return: The response of your network call. Does not do error handling on your response.
83-
:rtype: ~azure.core.pipeline.transport.HttpResponse
89+
:rtype: ~azure.core.rest.HttpResponse
8490
"""
85-
path_format_arguments = {
86-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
87-
}
88-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
89-
stream = kwargs.pop("stream", True)
90-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
91-
return pipeline_response.http_response
91+
92+
request_copy = deepcopy(request)
93+
request_copy.url = self._client.format_url(request_copy.url)
94+
return self._client.send_request(request_copy, **kwargs)
9295

9396
def close(self):
9497
# type: () -> None

‎sdk/eventhub/azure-mgmt-eventhub/azure/mgmt/eventhub/v2015_08_01/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "EventHubManagementClient",
66
"filename": "_event_hub_management_client",
77
"description": "Azure Event Hubs client.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -54,7 +54,7 @@
5454
"required": false
5555
},
5656
"base_url": {
57-
"signature": "base_url=None, # type: Optional[str]",
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
5858
"description": "Service URL",
5959
"docstring_type": "str",
6060
"required": false
@@ -74,7 +74,7 @@
7474
"required": false
7575
},
7676
"base_url": {
77-
"signature": "base_url: Optional[str] = None,",
77+
"signature": "base_url: str = \"https://management.azure.com\",",
7878
"description": "Service URL",
7979
"docstring_type": "str",
8080
"required": false
@@ -91,11 +91,10 @@
9191
"config": {
9292
"credential": true,
9393
"credential_scopes": ["https://management.azure.com/.default"],
94-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
95-
"credential_default_policy_type_has_async_version": true,
96-
"credential_key_header_name": null,
97-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
98-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
9998
},
10099
"operation_groups": {
101100
"operations": "Operations",

0 commit comments

Comments
 (0)