Skip to content

Commit b8e8774

Browse files
author
SDKAuto
committed
CodeGen from PR 17814 in Azure/azure-rest-api-specs
Merge ae3720d384259f83aa4aa156207a2c7acd114812 into 25a8355
1 parent 66147cc commit b8e8774

File tree

744 files changed

+149367
-124660
lines changed

Some content is hidden

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

744 files changed

+149367
-124660
lines changed

‎sdk/containerservice/azure-mgmt-containerservice/_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": "b6b834584cb58a3c2cbe887570fa0942b397dfc7",
7+
"commit": "b89cc0e749d14e65721204904287bdd1afea6aac",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/containerservice/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/containerservice/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/containerservice/resource-manager/readme.md"
1111
}

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_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/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py‎

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

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/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/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/aio/_container_service_client.py‎

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

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# --------------------------------------------------------------------------
77
from .v2017_07_01.models import *
88
from .v2019_04_30.models import *
9-
from .v2021_10_01.models import *
9+
from .v2022_01_01.models import *

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01/__init__.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
from ._container_service_client import ContainerServiceClient
1010
__all__ = ['ContainerServiceClient']
1111

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

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01/_configuration.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
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
if TYPE_CHECKING:
1616
# pylint: disable=unused-import,ungrouped-imports
17-
from typing import Any
18-
1917
from azure.core.credentials import TokenCredential
2018

2119
VERSION = "unknown"
@@ -34,16 +32,15 @@ class ContainerServiceClientConfiguration(Configuration):
3432

3533
def __init__(
3634
self,
37-
credential, # type: "TokenCredential"
38-
subscription_id, # type: str
39-
**kwargs # type: Any
40-
):
41-
# type: (...) -> None
35+
credential: "TokenCredential",
36+
subscription_id: str,
37+
**kwargs: Any
38+
) -> None:
39+
super(ContainerServiceClientConfiguration, self).__init__(**kwargs)
4240
if credential is None:
4341
raise ValueError("Parameter 'credential' must not be None.")
4442
if subscription_id is None:
4543
raise ValueError("Parameter 'subscription_id' must not be None.")
46-
super(ContainerServiceClientConfiguration, self).__init__(**kwargs)
4744

4845
self.credential = credential
4946
self.subscription_id = subscription_id
@@ -66,4 +63,4 @@ def _configure(
6663
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6764
self.authentication_policy = kwargs.get('authentication_policy')
6865
if self.credential and not self.authentication_policy:
69-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
66+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01/_container_service_client.py‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,74 +6,80 @@
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

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
20-
16+
from . import models
2117
from ._configuration import ContainerServiceClientConfiguration
2218
from .operations import ContainerServicesOperations
23-
from . import models
2419

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

26-
class ContainerServiceClient(object):
24+
class ContainerServiceClient:
2725
"""The Container Service Client.
2826
2927
:ivar container_services: ContainerServicesOperations operations
30-
:vartype container_services: azure.mgmt.containerservice.v2017_07_01.operations.ContainerServicesOperations
28+
:vartype container_services:
29+
azure.mgmt.containerservice.v2017_07_01.operations.ContainerServicesOperations
3130
:param credential: Credential needed for the client to connect to Azure.
3231
:type credential: ~azure.core.credentials.TokenCredential
33-
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
32+
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure
33+
subscription. The subscription ID forms part of the URI for every service call.
3434
:type subscription_id: str
35-
:param str base_url: Service URL
36-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
35+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
36+
:type base_url: str
37+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
38+
Retry-After header is present.
3739
"""
3840

3941
def __init__(
4042
self,
41-
credential, # type: "TokenCredential"
42-
subscription_id, # type: str
43-
base_url=None, # type: Optional[str]
44-
**kwargs # type: Any
45-
):
46-
# type: (...) -> None
47-
if not base_url:
48-
base_url = 'https://management.azure.com'
49-
self._config = ContainerServiceClientConfiguration(credential, subscription_id, **kwargs)
43+
credential: "TokenCredential",
44+
subscription_id: str,
45+
base_url: str = "https://management.azure.com",
46+
**kwargs: Any
47+
) -> None:
48+
self._config = ContainerServiceClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5049
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5150

5251
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
5352
self._serialize = Serializer(client_models)
54-
self._serialize.client_side_validation = False
5553
self._deserialize = Deserializer(client_models)
54+
self._serialize.client_side_validation = False
55+
self.container_services = ContainerServicesOperations(self._client, self._config, self._serialize, self._deserialize)
5656

57-
self.container_services = ContainerServicesOperations(
58-
self._client, self._config, self._serialize, self._deserialize)
5957

60-
def _send_request(self, http_request, **kwargs):
61-
# type: (HttpRequest, Any) -> HttpResponse
58+
def _send_request(
59+
self,
60+
request, # type: HttpRequest
61+
**kwargs: Any
62+
) -> HttpResponse:
6263
"""Runs the network request through the client's chained policies.
6364
64-
:param http_request: The network request you want to make. Required.
65-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
66-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
65+
>>> from azure.core.rest import HttpRequest
66+
>>> request = HttpRequest("GET", "https://www.example.org/")
67+
<HttpRequest [GET], url: 'https://www.example.org/'>
68+
>>> response = client._send_request(request)
69+
<HttpResponse: 200 OK>
70+
71+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
72+
73+
:param request: The network request you want to make. Required.
74+
:type request: ~azure.core.rest.HttpRequest
75+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
6776
:return: The response of your network call. Does not do error handling on your response.
68-
:rtype: ~azure.core.pipeline.transport.HttpResponse
77+
:rtype: ~azure.core.rest.HttpResponse
6978
"""
70-
path_format_arguments = {
71-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
72-
}
73-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
74-
stream = kwargs.pop("stream", True)
75-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
76-
return pipeline_response.http_response
79+
80+
request_copy = deepcopy(request)
81+
request_copy.url = self._client.format_url(request_copy.url)
82+
return self._client.send_request(request_copy, **kwargs)
7783

7884
def close(self):
7985
# type: () -> None

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01/_metadata.json‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "ContainerServiceClient",
66
"filename": "_container_service_client",
77
"description": "The Container Service 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\": [\"ContainerServiceClientConfiguration\"]}}, \"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\": [\"ContainerServiceClientConfiguration\"]}}, \"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\": [\"ContainerServiceClientConfiguration\"]}}, \"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\": [\"ContainerServiceClientConfiguration\"]}}, \"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
"container_services": "ContainerServicesOperations"

0 commit comments

Comments
 (0)