Skip to content

Commit 9f1085e

Browse files
azure-sdkWzb123456789
azure-sdk
and
Wzb123456789
authored
[AutoRelease] t2-nginx-2022-10-13-60502(Do not merge) (Azure#26796)
* code and test * Update CHANGELOG.md Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: zhenbiao wei <424401670@qq.com>
1 parent 1c8862a commit 9f1085e

File tree

11 files changed

+166
-84
lines changed

11 files changed

+166
-84
lines changed

‎sdk/nginx/azure-mgmt-nginx/CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Release History
22

3+
## 2.0.0 (2022-10-18)
4+
5+
### Features Added
6+
7+
- Added operation CertificatesOperations.begin_create_or_update
8+
- Added operation DeploymentsOperations.begin_create_or_update
9+
10+
### Breaking Changes
11+
12+
- Removed operation CertificatesOperations.begin_create
13+
- Removed operation DeploymentsOperations.begin_create
14+
315
## 1.1.0 (2022-09-20)
416

517
### Features Added

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.8.4",
2+
"autorest": "3.9.2",
33
"use": [
4-
"@autorest/python@6.1.6",
5-
"@autorest/modelerfour@4.23.5"
4+
"@autorest/python@6.1.11",
5+
"@autorest/modelerfour@4.24.3"
66
],
7-
"commit": "5dd50f3a923888cae5b77a4d4a48cb57430ba9de",
7+
"commit": "c71a66dab813061f1d09982c2748a09317fe0860",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/nginx/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.1.6 --use=@autorest/modelerfour@4.23.5 --version=3.8.4 --version-tolerant=False",
9+
"autorest_command": "autorest specification/nginx/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.1.11 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/nginx/resource-manager/readme.md"
1111
}

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

Lines changed: 1 addition & 1 deletion
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.1.0"
9+
VERSION = "2.0.0"

‎sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_certificates_operations.py‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
99
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
10-
from urllib.parse import parse_qs, urljoin, urlparse
10+
import urllib.parse
1111

1212
from azure.core.async_paging import AsyncItemPaged, AsyncList
1313
from azure.core.exceptions import (
@@ -31,7 +31,7 @@
3131
from ... import models as _models
3232
from ..._vendor import _convert_request
3333
from ...operations._certificates_operations import (
34-
build_create_request,
34+
build_create_or_update_request,
3535
build_delete_request,
3636
build_get_request,
3737
build_list_request,
@@ -129,7 +129,7 @@ async def get(
129129

130130
get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"} # type: ignore
131131

132-
async def _create_initial(
132+
async def _create_or_update_initial(
133133
self,
134134
resource_group_name: str,
135135
deployment_name: str,
@@ -163,7 +163,7 @@ async def _create_initial(
163163
else:
164164
_json = None
165165

166-
request = build_create_request(
166+
request = build_create_or_update_request(
167167
resource_group_name=resource_group_name,
168168
deployment_name=deployment_name,
169169
certificate_name=certificate_name,
@@ -172,7 +172,7 @@ async def _create_initial(
172172
content_type=content_type,
173173
json=_json,
174174
content=_content,
175-
template_url=self._create_initial.metadata["url"],
175+
template_url=self._create_or_update_initial.metadata["url"],
176176
headers=_headers,
177177
params=_params,
178178
)
@@ -203,10 +203,10 @@ async def _create_initial(
203203

204204
return deserialized
205205

206-
_create_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"} # type: ignore
206+
_create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"} # type: ignore
207207

208208
@overload
209-
async def begin_create(
209+
async def begin_create_or_update(
210210
self,
211211
resource_group_name: str,
212212
deployment_name: str,
@@ -247,7 +247,7 @@ async def begin_create(
247247
"""
248248

249249
@overload
250-
async def begin_create(
250+
async def begin_create_or_update(
251251
self,
252252
resource_group_name: str,
253253
deployment_name: str,
@@ -288,7 +288,7 @@ async def begin_create(
288288
"""
289289

290290
@distributed_trace_async
291-
async def begin_create(
291+
async def begin_create_or_update(
292292
self,
293293
resource_group_name: str,
294294
deployment_name: str,
@@ -335,7 +335,7 @@ async def begin_create(
335335
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
336336
cont_token = kwargs.pop("continuation_token", None) # type: Optional[str]
337337
if cont_token is None:
338-
raw_result = await self._create_initial( # type: ignore
338+
raw_result = await self._create_or_update_initial( # type: ignore
339339
resource_group_name=resource_group_name,
340340
deployment_name=deployment_name,
341341
certificate_name=certificate_name,
@@ -373,7 +373,7 @@ def get_long_running_output(pipeline_response):
373373
)
374374
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
375375

376-
begin_create.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"} # type: ignore
376+
begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"} # type: ignore
377377

378378
async def _delete_initial( # pylint: disable=inconsistent-return-statements
379379
self, resource_group_name: str, deployment_name: str, certificate_name: str, **kwargs: Any
@@ -541,10 +541,17 @@ def prepare_request(next_link=None):
541541

542542
else:
543543
# make call to next link with the client's api-version
544-
_parsed_next_link = urlparse(next_link)
545-
_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))
544+
_parsed_next_link = urllib.parse.urlparse(next_link)
545+
_next_request_params = case_insensitive_dict(
546+
{
547+
key: [urllib.parse.quote(v) for v in value]
548+
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
549+
}
550+
)
546551
_next_request_params["api-version"] = self._config.api_version
547-
request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params)
552+
request = HttpRequest(
553+
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
554+
)
548555
request = _convert_request(request)
549556
request.url = self._client.format_url(request.url) # type: ignore
550557
request.method = "GET"

‎sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_configurations_operations.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
99
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
10-
from urllib.parse import parse_qs, urljoin, urlparse
10+
import urllib.parse
1111

1212
from azure.core.async_paging import AsyncItemPaged, AsyncList
1313
from azure.core.exceptions import (
@@ -109,10 +109,17 @@ def prepare_request(next_link=None):
109109

110110
else:
111111
# make call to next link with the client's api-version
112-
_parsed_next_link = urlparse(next_link)
113-
_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))
112+
_parsed_next_link = urllib.parse.urlparse(next_link)
113+
_next_request_params = case_insensitive_dict(
114+
{
115+
key: [urllib.parse.quote(v) for v in value]
116+
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
117+
}
118+
)
114119
_next_request_params["api-version"] = self._config.api_version
115-
request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params)
120+
request = HttpRequest(
121+
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
122+
)
116123
request = _convert_request(request)
117124
request.url = self._client.format_url(request.url) # type: ignore
118125
request.method = "GET"

‎sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_deployments_operations.py‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
99
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
10-
from urllib.parse import parse_qs, urljoin, urlparse
10+
import urllib.parse
1111

1212
from azure.core.async_paging import AsyncItemPaged, AsyncList
1313
from azure.core.exceptions import (
@@ -31,7 +31,7 @@
3131
from ... import models as _models
3232
from ..._vendor import _convert_request
3333
from ...operations._deployments_operations import (
34-
build_create_request,
34+
build_create_or_update_request,
3535
build_delete_request,
3636
build_get_request,
3737
build_list_by_resource_group_request,
@@ -126,7 +126,7 @@ async def get(self, resource_group_name: str, deployment_name: str, **kwargs: An
126126

127127
get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"} # type: ignore
128128

129-
async def _create_initial(
129+
async def _create_or_update_initial(
130130
self,
131131
resource_group_name: str,
132132
deployment_name: str,
@@ -159,15 +159,15 @@ async def _create_initial(
159159
else:
160160
_json = None
161161

162-
request = build_create_request(
162+
request = build_create_or_update_request(
163163
resource_group_name=resource_group_name,
164164
deployment_name=deployment_name,
165165
subscription_id=self._config.subscription_id,
166166
api_version=api_version,
167167
content_type=content_type,
168168
json=_json,
169169
content=_content,
170-
template_url=self._create_initial.metadata["url"],
170+
template_url=self._create_or_update_initial.metadata["url"],
171171
headers=_headers,
172172
params=_params,
173173
)
@@ -198,10 +198,10 @@ async def _create_initial(
198198

199199
return deserialized
200200

201-
_create_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"} # type: ignore
201+
_create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"} # type: ignore
202202

203203
@overload
204-
async def begin_create(
204+
async def begin_create_or_update(
205205
self,
206206
resource_group_name: str,
207207
deployment_name: str,
@@ -239,7 +239,7 @@ async def begin_create(
239239
"""
240240

241241
@overload
242-
async def begin_create(
242+
async def begin_create_or_update(
243243
self,
244244
resource_group_name: str,
245245
deployment_name: str,
@@ -277,7 +277,7 @@ async def begin_create(
277277
"""
278278

279279
@distributed_trace_async
280-
async def begin_create(
280+
async def begin_create_or_update(
281281
self,
282282
resource_group_name: str,
283283
deployment_name: str,
@@ -321,7 +321,7 @@ async def begin_create(
321321
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
322322
cont_token = kwargs.pop("continuation_token", None) # type: Optional[str]
323323
if cont_token is None:
324-
raw_result = await self._create_initial( # type: ignore
324+
raw_result = await self._create_or_update_initial( # type: ignore
325325
resource_group_name=resource_group_name,
326326
deployment_name=deployment_name,
327327
body=body,
@@ -358,7 +358,7 @@ def get_long_running_output(pipeline_response):
358358
)
359359
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
360360

361-
begin_create.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"} # type: ignore
361+
begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"} # type: ignore
362362

363363
async def _update_initial(
364364
self,
@@ -742,10 +742,17 @@ def prepare_request(next_link=None):
742742

743743
else:
744744
# make call to next link with the client's api-version
745-
_parsed_next_link = urlparse(next_link)
746-
_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))
745+
_parsed_next_link = urllib.parse.urlparse(next_link)
746+
_next_request_params = case_insensitive_dict(
747+
{
748+
key: [urllib.parse.quote(v) for v in value]
749+
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
750+
}
751+
)
747752
_next_request_params["api-version"] = self._config.api_version
748-
request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params)
753+
request = HttpRequest(
754+
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
755+
)
749756
request = _convert_request(request)
750757
request.url = self._client.format_url(request.url) # type: ignore
751758
request.method = "GET"
@@ -825,10 +832,17 @@ def prepare_request(next_link=None):
825832

826833
else:
827834
# make call to next link with the client's api-version
828-
_parsed_next_link = urlparse(next_link)
829-
_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))
835+
_parsed_next_link = urllib.parse.urlparse(next_link)
836+
_next_request_params = case_insensitive_dict(
837+
{
838+
key: [urllib.parse.quote(v) for v in value]
839+
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
840+
}
841+
)
830842
_next_request_params["api-version"] = self._config.api_version
831-
request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params)
843+
request = HttpRequest(
844+
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
845+
)
832846
request = _convert_request(request)
833847
request.url = self._client.format_url(request.url) # type: ignore
834848
request.method = "GET"

‎sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_operations.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
99
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
10-
from urllib.parse import parse_qs, urljoin, urlparse
10+
import urllib.parse
1111

1212
from azure.core.async_paging import AsyncItemPaged, AsyncList
1313
from azure.core.exceptions import (
@@ -91,10 +91,17 @@ def prepare_request(next_link=None):
9191

9292
else:
9393
# make call to next link with the client's api-version
94-
_parsed_next_link = urlparse(next_link)
95-
_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))
94+
_parsed_next_link = urllib.parse.urlparse(next_link)
95+
_next_request_params = case_insensitive_dict(
96+
{
97+
key: [urllib.parse.quote(v) for v in value]
98+
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
99+
}
100+
)
96101
_next_request_params["api-version"] = self._config.api_version
97-
request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params)
102+
request = HttpRequest(
103+
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
104+
)
98105
request = _convert_request(request)
99106
request.url = self._client.format_url(request.url) # type: ignore
100107
request.method = "GET"

0 commit comments

Comments
 (0)