Skip to content

Commit eba70b0

Browse files
author
SDKAuto
committed
CodeGen from PR 3426 in test-repo-billy/azure-rest-api-specs
Merge 8bccee0a3743b150c13ceed41768417041adc96e into 0bc7c1e79795562287755b516934c77fbc1e5759
1 parent 98d8f69 commit eba70b0

File tree

42 files changed

+1805
-398
lines changed

Some content is hidden

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

42 files changed

+1805
-398
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "43f10d3b8bacd5fc6b01254b5050c613f26c3573",
3-
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
2+
"commit": "bc35ae3b67f3c1ed5ca85817337647bfd89f92c8",
3+
"repository_url": "https://github.com/test-repo-billy/azure-rest-api-specs",
44
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.13.19",
6+
"@autorest/python@6.17.0",
77
"@autorest/[email protected]"
88
],
9-
"autorest_command": "autorest specification/appcomplianceautomation/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.13.19 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/appcomplianceautomation/resource-manager/readme.md --generate-sample=True --generate-test=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.17.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/appcomplianceautomation/resource-manager/readme.md"
1111
}

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/_app_compliance_automation_mgmt_client.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
11+
from typing_extensions import Self
1112

1213
from azure.core.pipeline import policies
1314
from azure.core.rest import HttpRequest, HttpResponse
@@ -127,7 +128,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
127128
def close(self) -> None:
128129
self._client.close()
129130

130-
def __enter__(self) -> "AppComplianceAutomationMgmtClient":
131+
def __enter__(self) -> Self:
131132
self._client.__enter__()
132133
return self
133134

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/_serialization.py

+2
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ def _json_attemp(data):
144144
# context otherwise.
145145
_LOGGER.critical("Wasn't XML not JSON, failing")
146146
raise DeserializationError("XML is invalid") from err
147+
elif content_type.startswith("text/"):
148+
return data_as_str
147149
raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
148150

149151
@classmethod

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/_vendor.py

-16
This file was deleted.

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/_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.0.0"
9+
VERSION = "1.0.0b1"

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/aio/_app_compliance_automation_mgmt_client.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from copy import deepcopy
1010
from typing import Any, Awaitable, TYPE_CHECKING
11+
from typing_extensions import Self
1112

1213
from azure.core.pipeline import policies
1314
from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -129,7 +130,7 @@ def _send_request(
129130
async def close(self) -> None:
130131
await self._client.close()
131132

132-
async def __aenter__(self) -> "AppComplianceAutomationMgmtClient":
133+
async def __aenter__(self) -> Self:
133134
await self._client.__aenter__()
134135
return self
135136

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/aio/operations/_evidence_operations.py

+4-16
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
map_error,
2222
)
2323
from azure.core.pipeline import PipelineResponse
24-
from azure.core.pipeline.transport import AsyncHttpResponse
25-
from azure.core.rest import HttpRequest
24+
from azure.core.rest import AsyncHttpResponse, HttpRequest
2625
from azure.core.tracing.decorator import distributed_trace
2726
from azure.core.tracing.decorator_async import distributed_trace_async
2827
from azure.core.utils import case_insensitive_dict
2928
from azure.mgmt.core.exceptions import ARMErrorFormat
3029

3130
from ... import models as _models
32-
from ..._vendor import _convert_request
3331
from ...operations._evidence_operations import (
3432
build_create_or_update_request,
3533
build_delete_request,
@@ -132,7 +130,6 @@ def prepare_request(next_link=None):
132130
headers=_headers,
133131
params=_params,
134132
)
135-
_request = _convert_request(_request)
136133
_request.url = self._client.format_url(_request.url)
137134

138135
else:
@@ -148,7 +145,6 @@ def prepare_request(next_link=None):
148145
_request = HttpRequest(
149146
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
150147
)
151-
_request = _convert_request(_request)
152148
_request.url = self._client.format_url(_request.url)
153149
_request.method = "GET"
154150
return _request
@@ -211,7 +207,6 @@ async def get(self, report_name: str, evidence_name: str, **kwargs: Any) -> _mod
211207
headers=_headers,
212208
params=_params,
213209
)
214-
_request = _convert_request(_request)
215210
_request.url = self._client.format_url(_request.url)
216211

217212
_stream = False
@@ -226,7 +221,7 @@ async def get(self, report_name: str, evidence_name: str, **kwargs: Any) -> _mod
226221
error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
227222
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
228223

229-
deserialized = self._deserialize("EvidenceResource", pipeline_response)
224+
deserialized = self._deserialize("EvidenceResource", pipeline_response.http_response)
230225

231226
if cls:
232227
return cls(pipeline_response, deserialized, {}) # type: ignore
@@ -359,7 +354,6 @@ async def create_or_update(
359354
headers=_headers,
360355
params=_params,
361356
)
362-
_request = _convert_request(_request)
363357
_request.url = self._client.format_url(_request.url)
364358

365359
_stream = False
@@ -374,11 +368,7 @@ async def create_or_update(
374368
error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
375369
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
376370

377-
if response.status_code == 200:
378-
deserialized = self._deserialize("EvidenceResource", pipeline_response)
379-
380-
if response.status_code == 201:
381-
deserialized = self._deserialize("EvidenceResource", pipeline_response)
371+
deserialized = self._deserialize("EvidenceResource", pipeline_response.http_response)
382372

383373
if cls:
384374
return cls(pipeline_response, deserialized, {}) # type: ignore
@@ -420,7 +410,6 @@ async def delete( # pylint: disable=inconsistent-return-statements
420410
headers=_headers,
421411
params=_params,
422412
)
423-
_request = _convert_request(_request)
424413
_request.url = self._client.format_url(_request.url)
425414

426415
_stream = False
@@ -544,7 +533,6 @@ async def download(
544533
headers=_headers,
545534
params=_params,
546535
)
547-
_request = _convert_request(_request)
548536
_request.url = self._client.format_url(_request.url)
549537

550538
_stream = False
@@ -559,7 +547,7 @@ async def download(
559547
error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
560548
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
561549

562-
deserialized = self._deserialize("EvidenceFileDownloadResponse", pipeline_response)
550+
deserialized = self._deserialize("EvidenceFileDownloadResponse", pipeline_response.http_response)
563551

564552
if cls:
565553
return cls(pipeline_response, deserialized, {}) # type: ignore

sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/azure/mgmt/appcomplianceautomation/aio/operations/_operations.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020
map_error,
2121
)
2222
from azure.core.pipeline import PipelineResponse
23-
from azure.core.pipeline.transport import AsyncHttpResponse
24-
from azure.core.rest import HttpRequest
23+
from azure.core.rest import AsyncHttpResponse, HttpRequest
2524
from azure.core.tracing.decorator import distributed_trace
2625
from azure.core.utils import case_insensitive_dict
2726
from azure.mgmt.core.exceptions import ARMErrorFormat
2827

2928
from ... import models as _models
30-
from ..._vendor import _convert_request
3129
from ...operations._operations import build_list_request
3230

3331
if sys.version_info >= (3, 9):
@@ -88,7 +86,6 @@ def prepare_request(next_link=None):
8886
headers=_headers,
8987
params=_params,
9088
)
91-
_request = _convert_request(_request)
9289
_request.url = self._client.format_url(_request.url)
9390

9491
else:
@@ -104,7 +101,6 @@ def prepare_request(next_link=None):
104101
_request = HttpRequest(
105102
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
106103
)
107-
_request = _convert_request(_request)
108104
_request.url = self._client.format_url(_request.url)
109105
_request.method = "GET"
110106
return _request

0 commit comments

Comments
 (0)