Skip to content

Commit d013da8

Browse files
author
SDKAuto
committed
CodeGen from PR 17387 in Azure/azure-rest-api-specs
Merge c5e4df75e5f35ef4972d23512c12d665d79e37f7 into 0bca06c
1 parent 4fc8d8c commit d013da8

File tree

187 files changed

+29711
-28592
lines changed

Some content is hidden

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

187 files changed

+29711
-28592
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.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "ea69fef496210478b8a9e2c3f8804f3acfb35891",
7+
"commit": "00c3e78329893e6cc9ba06d3320683fea3dff41f",
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-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from typing import Any, Optional
2424

2525
from azure.core.credentials import TokenCredential
26-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
2726

2827
class _SDKClient(object):
2928
def __init__(self, *args, **kwargs):
@@ -71,12 +70,10 @@ def __init__(
7170
credential, # type: "TokenCredential"
7271
subscription_id, # type: str
7372
api_version=None, # type: Optional[str]
74-
base_url=None, # type: Optional[str]
73+
base_url="https://management.azure.com", # type: str
7574
profile=KnownProfiles.default, # type: KnownProfiles
7675
**kwargs # type: Any
7776
):
78-
if not base_url:
79-
base_url = 'https://management.azure.com'
8077
self._config = EventHubManagementClientConfiguration(credential, subscription_id, **kwargs)
8178
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8279
super(EventHubManagementClient, self).__init__(

‎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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
from typing import Any, Optional, TYPE_CHECKING
1313

14-
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
1514
from azure.mgmt.core import AsyncARMPipelineClient
1615
from azure.profiles import KnownProfiles, ProfileDefinition
1716
from azure.profiles.multiapiclient import MultiApiClientMixin
@@ -21,6 +20,7 @@
2120

2221
if TYPE_CHECKING:
2322
# pylint: disable=unused-import,ungrouped-imports
23+
from azure.core.credentials import TokenCredential
2424
from azure.core.credentials_async import AsyncTokenCredential
2525

2626
class _SDKClient(object):
@@ -69,12 +69,10 @@ def __init__(
6969
credential: "AsyncTokenCredential",
7070
subscription_id: str,
7171
api_version: Optional[str] = None,
72-
base_url: Optional[str] = None,
72+
base_url: str = "https://management.azure.com",
7373
profile: KnownProfiles = KnownProfiles.default,
7474
**kwargs # type: Any
7575
) -> None:
76-
if not base_url:
77-
base_url = 'https://management.azure.com'
7876
self._config = EventHubManagementClientConfiguration(credential, subscription_id, **kwargs)
7977
self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8078
super(EventHubManagementClient, self).__init__(

‎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: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
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

@@ -35,16 +33,15 @@ class EventHubManagementClientConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(EventHubManagementClientConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(EventHubManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
@@ -68,4 +65,4 @@ def _configure(
6865
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6966
self.authentication_policy = kwargs.get('authentication_policy')
7067
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
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: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,22 @@
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, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import EventHubManagementClientConfiguration
18+
from .operations import ConsumerGroupsOperations, EventHubsOperations, NamespacesOperations, Operations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
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
26-
from . import models
27-
2823

29-
class EventHubManagementClient(object):
24+
class EventHubManagementClient:
3025
"""Azure Event Hubs client.
3126
3227
:ivar operations: Operations operations
@@ -39,56 +34,60 @@ class EventHubManagementClient(object):
3934
:vartype consumer_groups: azure.mgmt.eventhub.v2015_08_01.operations.ConsumerGroupsOperations
4035
:param credential: Credential needed for the client to connect to Azure.
4136
: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.
37+
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
38+
subscription. The subscription ID forms part of the URI for every service call.
4339
: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.
40+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
41+
:type base_url: str
42+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
43+
Retry-After header is present.
4644
"""
4745

4846
def __init__(
4947
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)
48+
credential: "TokenCredential",
49+
subscription_id: str,
50+
base_url: str = "https://management.azure.com",
51+
**kwargs: Any
52+
) -> None:
53+
self._config = EventHubManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5954
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6055

6156
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6257
self._serialize = Serializer(client_models)
63-
self._serialize.client_side_validation = False
6458
self._deserialize = Deserializer(client_models)
59+
self._serialize.client_side_validation = False
60+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
61+
self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize)
62+
self.event_hubs = EventHubsOperations(self._client, self._config, self._serialize, self._deserialize)
63+
self.consumer_groups = ConsumerGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
6564

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
65+
66+
def _send_request(
67+
self,
68+
request, # type: HttpRequest
69+
**kwargs: Any
70+
) -> HttpResponse:
7771
"""Runs the network request through the client's chained policies.
7872
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.
73+
>>> from azure.core.rest import HttpRequest
74+
>>> request = HttpRequest("GET", "https://www.example.org/")
75+
<HttpRequest [GET], url: 'https://www.example.org/'>
76+
>>> response = client._send_request(request)
77+
<HttpResponse: 200 OK>
78+
79+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
80+
81+
:param request: The network request you want to make. Required.
82+
:type request: ~azure.core.rest.HttpRequest
83+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8284
:return: The response of your network call. Does not do error handling on your response.
83-
:rtype: ~azure.core.pipeline.transport.HttpResponse
85+
:rtype: ~azure.core.rest.HttpResponse
8486
"""
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
87+
88+
request_copy = deepcopy(request)
89+
request_copy.url = self._client.format_url(request_copy.url)
90+
return self._client.send_request(request_copy, **kwargs)
9291

9392
def close(self):
9493
# 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\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}}, \"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\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"EventHubManagementClientConfiguration\"]}}, \"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)