Skip to content

Commit 9b7e495

Browse files
author
SDKAuto
committed
CodeGen from PR 17078 in Azure/azure-rest-api-specs
Merge 24b7c2149b634a7cbaad5fced02e31120869dec1 into b8fa437
1 parent b818787 commit 9b7e495

File tree

191 files changed

+50649
-15795
lines changed

Some content is hidden

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

191 files changed

+50649
-15795
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.2",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.1",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "c803720c6bcfcb0fcf4c97f3463ec33a18f9e55c",
7+
"commit": "e2d60f7ed5c8d08e9008a08b589b89304c9ce42d",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/appplatform/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.1 --use=@autorest/[email protected].2 --version=3.4.2",
9+
"autorest_command": "autorest specification/appplatform/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.12.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/appplatform/resource-manager/readme.md"
1111
}

sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/_app_platform_management_client.py

Lines changed: 51 additions & 4 deletions
Large diffs are not rendered by default.

sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/_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/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/aio/_app_platform_management_client.py

Lines changed: 52 additions & 4 deletions
Large diffs are not rendered by default.

sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/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/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/__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__ = ['AppPlatformManagementClient']
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/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/_app_platform_management_client.py

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

9+
from copy import deepcopy
910
from typing import TYPE_CHECKING
1011

1112
from azure.mgmt.core import ARMPipelineClient
1213
from msrest import Deserializer, Serializer
1314

15+
from . import models
16+
from ._configuration import AppPlatformManagementClientConfiguration
17+
from .operations import AppsOperations, BindingsOperations, CertificatesOperations, CustomDomainsOperations, DeploymentsOperations, Operations, RuntimeVersionsOperations, ServicesOperations, SkuOperations
18+
1419
if TYPE_CHECKING:
1520
# pylint: disable=unused-import,ungrouped-imports
1621
from typing import Any, Optional
1722

1823
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import AppPlatformManagementClientConfiguration
22-
from .operations import ServicesOperations
23-
from .operations import AppsOperations
24-
from .operations import BindingsOperations
25-
from .operations import CertificatesOperations
26-
from .operations import CustomDomainsOperations
27-
from .operations import DeploymentsOperations
28-
from .operations import Operations
29-
from .operations import RuntimeVersionsOperations
30-
from .operations import SkuOperations
31-
from . import models
32-
24+
from azure.core.rest import HttpRequest, HttpResponse
3325

3426
class AppPlatformManagementClient(object):
3527
"""REST API for Azure Spring Cloud.
@@ -41,79 +33,84 @@ class AppPlatformManagementClient(object):
4133
:ivar bindings: BindingsOperations operations
4234
:vartype bindings: azure.mgmt.appplatform.v2019_05_01_preview.operations.BindingsOperations
4335
:ivar certificates: CertificatesOperations operations
44-
:vartype certificates: azure.mgmt.appplatform.v2019_05_01_preview.operations.CertificatesOperations
36+
:vartype certificates:
37+
azure.mgmt.appplatform.v2019_05_01_preview.operations.CertificatesOperations
4538
:ivar custom_domains: CustomDomainsOperations operations
46-
:vartype custom_domains: azure.mgmt.appplatform.v2019_05_01_preview.operations.CustomDomainsOperations
39+
:vartype custom_domains:
40+
azure.mgmt.appplatform.v2019_05_01_preview.operations.CustomDomainsOperations
4741
:ivar deployments: DeploymentsOperations operations
48-
:vartype deployments: azure.mgmt.appplatform.v2019_05_01_preview.operations.DeploymentsOperations
42+
:vartype deployments:
43+
azure.mgmt.appplatform.v2019_05_01_preview.operations.DeploymentsOperations
4944
:ivar operations: Operations operations
5045
:vartype operations: azure.mgmt.appplatform.v2019_05_01_preview.operations.Operations
5146
:ivar runtime_versions: RuntimeVersionsOperations operations
52-
:vartype runtime_versions: azure.mgmt.appplatform.v2019_05_01_preview.operations.RuntimeVersionsOperations
47+
:vartype runtime_versions:
48+
azure.mgmt.appplatform.v2019_05_01_preview.operations.RuntimeVersionsOperations
5349
:ivar sku: SkuOperations operations
5450
:vartype sku: azure.mgmt.appplatform.v2019_05_01_preview.operations.SkuOperations
5551
:param credential: Credential needed for the client to connect to Azure.
5652
:type credential: ~azure.core.credentials.TokenCredential
57-
:param subscription_id: Gets subscription ID which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
53+
:param subscription_id: Gets subscription ID which uniquely identify the Microsoft Azure
54+
subscription. The subscription ID forms part of the URI for every service call.
5855
:type subscription_id: str
59-
:param str base_url: Service URL
60-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
56+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
57+
:type base_url: str
58+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
59+
Retry-After header is present.
6160
"""
6261

6362
def __init__(
6463
self,
6564
credential, # type: "TokenCredential"
6665
subscription_id, # type: str
67-
base_url=None, # type: Optional[str]
66+
base_url="https://management.azure.com", # type: str
6867
**kwargs # type: Any
6968
):
7069
# type: (...) -> None
71-
if not base_url:
72-
base_url = 'https://management.azure.com'
73-
self._config = AppPlatformManagementClientConfiguration(credential, subscription_id, **kwargs)
70+
self._config = AppPlatformManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
7471
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7572

7673
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
7774
self._serialize = Serializer(client_models)
78-
self._serialize.client_side_validation = False
7975
self._deserialize = Deserializer(client_models)
80-
81-
self.services = ServicesOperations(
82-
self._client, self._config, self._serialize, self._deserialize)
83-
self.apps = AppsOperations(
84-
self._client, self._config, self._serialize, self._deserialize)
85-
self.bindings = BindingsOperations(
86-
self._client, self._config, self._serialize, self._deserialize)
87-
self.certificates = CertificatesOperations(
88-
self._client, self._config, self._serialize, self._deserialize)
89-
self.custom_domains = CustomDomainsOperations(
90-
self._client, self._config, self._serialize, self._deserialize)
91-
self.deployments = DeploymentsOperations(
92-
self._client, self._config, self._serialize, self._deserialize)
93-
self.operations = Operations(
94-
self._client, self._config, self._serialize, self._deserialize)
95-
self.runtime_versions = RuntimeVersionsOperations(
96-
self._client, self._config, self._serialize, self._deserialize)
97-
self.sku = SkuOperations(
98-
self._client, self._config, self._serialize, self._deserialize)
99-
100-
def _send_request(self, http_request, **kwargs):
101-
# type: (HttpRequest, Any) -> HttpResponse
76+
self._serialize.client_side_validation = False
77+
self.services = ServicesOperations(self._client, self._config, self._serialize, self._deserialize)
78+
self.apps = AppsOperations(self._client, self._config, self._serialize, self._deserialize)
79+
self.bindings = BindingsOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.custom_domains = CustomDomainsOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
83+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
84+
self.runtime_versions = RuntimeVersionsOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.sku = SkuOperations(self._client, self._config, self._serialize, self._deserialize)
86+
87+
88+
def _send_request(
89+
self,
90+
request, # type: HttpRequest
91+
**kwargs # type: Any
92+
):
93+
# type: (...) -> HttpResponse
10294
"""Runs the network request through the client's chained policies.
10395
104-
:param http_request: The network request you want to make. Required.
105-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
106-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
96+
>>> from azure.core.rest import HttpRequest
97+
>>> request = HttpRequest("GET", "https://www.example.org/")
98+
<HttpRequest [GET], url: 'https://www.example.org/'>
99+
>>> response = client._send_request(request)
100+
<HttpResponse: 200 OK>
101+
102+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
103+
104+
:param request: The network request you want to make. Required.
105+
:type request: ~azure.core.rest.HttpRequest
106+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
107107
:return: The response of your network call. Does not do error handling on your response.
108-
:rtype: ~azure.core.pipeline.transport.HttpResponse
108+
:rtype: ~azure.core.rest.HttpResponse
109109
"""
110-
path_format_arguments = {
111-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
112-
}
113-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
114-
stream = kwargs.pop("stream", True)
115-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
116-
return pipeline_response.http_response
110+
111+
request_copy = deepcopy(request)
112+
request_copy.url = self._client.format_url(request_copy.url)
113+
return self._client.send_request(request_copy, **kwargs)
117114

118115
def close(self):
119116
# type: () -> None

sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/_configuration.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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

@@ -40,11 +40,11 @@ def __init__(
4040
**kwargs # type: Any
4141
):
4242
# type: (...) -> None
43+
super(AppPlatformManagementClientConfiguration, self).__init__(**kwargs)
4344
if credential is None:
4445
raise ValueError("Parameter 'credential' must not be None.")
4546
if subscription_id is None:
4647
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(AppPlatformManagementClientConfiguration, self).__init__(**kwargs)
4848

4949
self.credential = credential
5050
self.subscription_id = subscription_id
@@ -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/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "AppPlatformManagementClient",
66
"filename": "_app_platform_management_client",
77
"description": "REST API for Azure Spring Cloud.",
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\": [\"AppPlatformManagementClientConfiguration\"]}}, \"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\": [\"AppPlatformManagementClientConfiguration\"]}}, \"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\": [\"AppPlatformManagementClientConfiguration\"]}}, \"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\": [\"AppPlatformManagementClientConfiguration\"]}}, \"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
"services": "ServicesOperations",

0 commit comments

Comments
 (0)