Skip to content

Commit 0144957

Browse files
author
SDKAuto
committed
CodeGen from PR 3334 in test-repo-billy/azure-rest-api-specs
Merge 88c9f7e094512ca2819a853897d27600273c1c28 into 81c88e4fbc4fde08d14f7f3825933706bd6205d6
1 parent ae0a12d commit 0144957

Some content is hidden

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

47 files changed

+786
-1534
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "84849e5293de3a8e01cbdde13b2d7086d3fb34d6",
3-
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
2+
"commit": "b5f1988becc51e03ce6cb0c7e393fcd7a8dc810d",
3+
"repository_url": "https://github.com/test-repo-billy/azure-rest-api-specs",
44
"autorest": "3.9.7",
55
"use": [
6-
"@autorest/python@6.7.1",
7-
"@autorest/modelerfour@4.26.2"
6+
"@autorest/python@6.13.7",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/servicelinker/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
9+
"autorest_command": "autorest specification/servicelinker/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.13.7 --use=@autorest/modelerfour@4.27.0 --version=3.9.7 --version-tolerant=False",
1010
"readme": "specification/servicelinker/resource-manager/readme.md"
1111
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from typing import Any, TYPE_CHECKING
1010

11-
from azure.core.configuration import Configuration
1211
from azure.core.pipeline import policies
1312
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1413

@@ -19,7 +18,7 @@
1918
from azure.core.credentials import TokenCredential
2019

2120

22-
class ServiceLinkerManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class ServiceLinkerManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for ServiceLinkerManagementClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -33,7 +32,6 @@ class ServiceLinkerManagementClientConfiguration(Configuration): # pylint: disa
3332
"""
3433

3534
def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
36-
super(ServiceLinkerManagementClientConfiguration, self).__init__(**kwargs)
3735
api_version: str = kwargs.pop("api_version", "2023-04-01-preview")
3836

3937
if credential is None:
@@ -43,6 +41,7 @@ def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None:
4341
self.api_version = api_version
4442
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
4543
kwargs.setdefault("sdk_moniker", "mgmt-servicelinker/{}".format(VERSION))
44+
self.polling_interval = kwargs.get("polling_interval", 30)
4645
self._configure(**kwargs)
4746

4847
def _configure(self, **kwargs: Any) -> None:
@@ -51,9 +50,9 @@ def _configure(self, **kwargs: Any) -> None:
5150
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5251
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5352
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
54-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
5553
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
5654
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
55+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
5756
self.authentication_policy = kwargs.get("authentication_policy")
5857
if self.credential and not self.authentication_policy:
5958
self.authentication_policy = ARMChallengeAuthenticationPolicy(

‎sdk/servicelinker/azure-mgmt-servicelinker/azure/mgmt/servicelinker/_serialization.py

+41-49
Large diffs are not rendered by default.

‎sdk/servicelinker/azure-mgmt-servicelinker/azure/mgmt/servicelinker/_service_linker_management_client.py

+23-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
1111

12+
from azure.core.pipeline import policies
1213
from azure.core.rest import HttpRequest, HttpResponse
1314
from azure.mgmt.core import ARMPipelineClient
15+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
1416

1517
from . import models as _models
1618
from ._configuration import ServiceLinkerManagementClientConfiguration
@@ -56,7 +58,25 @@ def __init__(
5658
self, credential: "TokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any
5759
) -> None:
5860
self._config = ServiceLinkerManagementClientConfiguration(credential=credential, **kwargs)
59-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
61+
_policies = kwargs.pop("policies", None)
62+
if _policies is None:
63+
_policies = [
64+
policies.RequestIdPolicy(**kwargs),
65+
self._config.headers_policy,
66+
self._config.user_agent_policy,
67+
self._config.proxy_policy,
68+
policies.ContentDecodePolicy(**kwargs),
69+
ARMAutoResourceProviderRegistrationPolicy(),
70+
self._config.redirect_policy,
71+
self._config.retry_policy,
72+
self._config.authentication_policy,
73+
self._config.custom_hook_policy,
74+
self._config.logging_policy,
75+
policies.DistributedTracingPolicy(**kwargs),
76+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
77+
self._config.http_logging_policy,
78+
]
79+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
6080

6181
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
6282
self._serialize = Serializer(client_models)
@@ -70,7 +90,7 @@ def __init__(
7090
self._client, self._config, self._serialize, self._deserialize
7191
)
7292

73-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
93+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
7494
"""Runs the network request through the client's chained policies.
7595
7696
>>> from azure.core.rest import HttpRequest
@@ -90,7 +110,7 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
90110

91111
request_copy = deepcopy(request)
92112
request_copy.url = self._client.format_url(request_copy.url)
93-
return self._client.send_request(request_copy, **kwargs)
113+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
94114

95115
def close(self) -> None:
96116
self._client.close()

‎sdk/servicelinker/azure-mgmt-servicelinker/azure/mgmt/servicelinker/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "1.2.0b2"
9+
VERSION = "1.0.0b1"

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from typing import Any, TYPE_CHECKING
1010

11-
from azure.core.configuration import Configuration
1211
from azure.core.pipeline import policies
1312
from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
1413

@@ -19,7 +18,7 @@
1918
from azure.core.credentials_async import AsyncTokenCredential
2019

2120

22-
class ServiceLinkerManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class ServiceLinkerManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for ServiceLinkerManagementClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -33,7 +32,6 @@ class ServiceLinkerManagementClientConfiguration(Configuration): # pylint: disa
3332
"""
3433

3534
def __init__(self, credential: "AsyncTokenCredential", **kwargs: Any) -> None:
36-
super(ServiceLinkerManagementClientConfiguration, self).__init__(**kwargs)
3735
api_version: str = kwargs.pop("api_version", "2023-04-01-preview")
3836

3937
if credential is None:
@@ -43,6 +41,7 @@ def __init__(self, credential: "AsyncTokenCredential", **kwargs: Any) -> None:
4341
self.api_version = api_version
4442
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
4543
kwargs.setdefault("sdk_moniker", "mgmt-servicelinker/{}".format(VERSION))
44+
self.polling_interval = kwargs.get("polling_interval", 30)
4645
self._configure(**kwargs)
4746

4847
def _configure(self, **kwargs: Any) -> None:
@@ -51,9 +50,9 @@ def _configure(self, **kwargs: Any) -> None:
5150
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5251
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5352
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
54-
self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
5553
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
5654
self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs)
55+
self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
5756
self.authentication_policy = kwargs.get("authentication_policy")
5857
if self.credential and not self.authentication_policy:
5958
self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(

‎sdk/servicelinker/azure-mgmt-servicelinker/azure/mgmt/servicelinker/aio/_service_linker_management_client.py

+25-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
from copy import deepcopy
1010
from typing import Any, Awaitable, TYPE_CHECKING
1111

12+
from azure.core.pipeline import policies
1213
from azure.core.rest import AsyncHttpResponse, HttpRequest
1314
from azure.mgmt.core import AsyncARMPipelineClient
15+
from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
1416

1517
from .. import models as _models
1618
from .._serialization import Deserializer, Serializer
@@ -57,7 +59,25 @@ def __init__(
5759
self, credential: "AsyncTokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any
5860
) -> None:
5961
self._config = ServiceLinkerManagementClientConfiguration(credential=credential, **kwargs)
60-
self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
62+
_policies = kwargs.pop("policies", None)
63+
if _policies is None:
64+
_policies = [
65+
policies.RequestIdPolicy(**kwargs),
66+
self._config.headers_policy,
67+
self._config.user_agent_policy,
68+
self._config.proxy_policy,
69+
policies.ContentDecodePolicy(**kwargs),
70+
AsyncARMAutoResourceProviderRegistrationPolicy(),
71+
self._config.redirect_policy,
72+
self._config.retry_policy,
73+
self._config.authentication_policy,
74+
self._config.custom_hook_policy,
75+
self._config.logging_policy,
76+
policies.DistributedTracingPolicy(**kwargs),
77+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
78+
self._config.http_logging_policy,
79+
]
80+
self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
6181

6282
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
6383
self._serialize = Serializer(client_models)
@@ -71,7 +91,9 @@ def __init__(
7191
self._client, self._config, self._serialize, self._deserialize
7292
)
7393

74-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]:
94+
def _send_request(
95+
self, request: HttpRequest, *, stream: bool = False, **kwargs: Any
96+
) -> Awaitable[AsyncHttpResponse]:
7597
"""Runs the network request through the client's chained policies.
7698
7799
>>> from azure.core.rest import HttpRequest
@@ -91,7 +113,7 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncH
91113

92114
request_copy = deepcopy(request)
93115
request_copy.url = self._client.format_url(request_copy.url)
94-
return self._client.send_request(request_copy, **kwargs)
116+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
95117

96118
async def close(self) -> None:
97119
await self._client.close()

‎sdk/servicelinker/azure-mgmt-servicelinker/azure/mgmt/servicelinker/aio/operations/_configuration_names_operations.py

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pylint: disable=too-many-lines
1+
# pylint: disable=too-many-lines,too-many-statements
22
# coding=utf-8
33
# --------------------------------------------------------------------------
44
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -63,7 +63,6 @@ def list(
6363
:type filter: str
6464
:param skip_token: OData skipToken option for pagination. Default value is None.
6565
:type skip_token: str
66-
:keyword callable cls: A custom type or function that will be passed the direct response
6766
:return: An iterator like instance of either ConfigurationNameItem or the result of
6867
cls(response)
6968
:rtype:
@@ -87,16 +86,15 @@ def list(
8786
def prepare_request(next_link=None):
8887
if not next_link:
8988

90-
request = build_list_request(
89+
_request = build_list_request(
9190
filter=filter,
9291
skip_token=skip_token,
9392
api_version=api_version,
94-
template_url=self.list.metadata["url"],
9593
headers=_headers,
9694
params=_params,
9795
)
98-
request = _convert_request(request)
99-
request.url = self._client.format_url(request.url)
96+
_request = _convert_request(_request)
97+
_request.url = self._client.format_url(_request.url)
10098

10199
else:
102100
# make call to next link with the client's api-version
@@ -108,13 +106,13 @@ def prepare_request(next_link=None):
108106
}
109107
)
110108
_next_request_params["api-version"] = self._config.api_version
111-
request = HttpRequest(
109+
_request = HttpRequest(
112110
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
113111
)
114-
request = _convert_request(request)
115-
request.url = self._client.format_url(request.url)
116-
request.method = "GET"
117-
return request
112+
_request = _convert_request(_request)
113+
_request.url = self._client.format_url(_request.url)
114+
_request.method = "GET"
115+
return _request
118116

119117
async def extract_data(pipeline_response):
120118
deserialized = self._deserialize("ConfigurationNameResult", pipeline_response)
@@ -124,11 +122,11 @@ async def extract_data(pipeline_response):
124122
return deserialized.next_link or None, AsyncList(list_of_elem)
125123

126124
async def get_next(next_link=None):
127-
request = prepare_request(next_link)
125+
_request = prepare_request(next_link)
128126

129127
_stream = False
130128
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
131-
request, stream=_stream, **kwargs
129+
_request, stream=_stream, **kwargs
132130
)
133131
response = pipeline_response.http_response
134132

@@ -140,5 +138,3 @@ async def get_next(next_link=None):
140138
return pipeline_response
141139

142140
return AsyncItemPaged(get_next, extract_data)
143-
144-
list.metadata = {"url": "/providers/Microsoft.ServiceLinker/configurationNames"}

0 commit comments

Comments
 (0)