Skip to content

Commit e104847

Browse files
author
SDKAuto
committed
CodeGen from PR 23400 in Azure/azure-rest-api-specs
Merge b18026f8c89c01de1041e7f538d44f5784ba5845 into f790e624d0d080b89d962a3bd19c65bc6a6b2f5e
1 parent 4f495d9 commit e104847

File tree

220 files changed

+865
-2575
lines changed

Some content is hidden

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

220 files changed

+865
-2575
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "ee96574a6d4ed37a06883b8e3f8fd3adf4803b83",
2+
"commit": "1edfad6fb7e54ebee03d5b54665965780e70cb62",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.2",
55
"use": [
6-
"@autorest/python@6.4.3",
6+
"@autorest/python@6.4.7",
77
"@autorest/modelerfour@4.24.3"
88
],
9-
"autorest_command": "autorest specification/security/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.4.3 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/security/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.4.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/security/resource-manager/readme.md"
1111
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
631631
if xml_desc.get("attr", False):
632632
if xml_ns:
633633
ET.register_namespace(xml_prefix, xml_ns)
634-
xml_name = "{}{}".format(xml_ns, xml_name)
634+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
635635
serialized.set(xml_name, new_attr) # type: ignore
636636
continue
637637
if xml_desc.get("text", False):
@@ -1273,7 +1273,7 @@ def _extract_name_from_internal_type(internal_type):
12731273
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
12741274
xml_ns = internal_type_xml_map.get("ns", None)
12751275
if xml_ns:
1276-
xml_name = "{}{}".format(xml_ns, xml_name)
1276+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12771277
return xml_name
12781278

12791279

@@ -1297,7 +1297,7 @@ def xml_key_extractor(attr, attr_desc, data):
12971297
# Integrate namespace if necessary
12981298
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
12991299
if xml_ns:
1300-
xml_name = "{}{}".format(xml_ns, xml_name)
1300+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
13011301

13021302
# If it's an attribute, that's simple
13031303
if xml_desc.get("attr", False):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# license information.
66
# --------------------------------------------------------------------------
77

8-
VERSION = "4.0.0"
8+
VERSION = "0.1.0"

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/_configuration.py‎

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

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from ._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials import TokenCredential
@@ -42,7 +36,7 @@ class SecurityCenterConfiguration(Configuration): # pylint: disable=too-many-in
4236

4337
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
4438
super(SecurityCenterConfiguration, self).__init__(**kwargs)
45-
api_version: Literal["2015-06-01-preview"] = kwargs.pop("api_version", "2015-06-01-preview")
39+
api_version: str = kwargs.pop("api_version", "2015-06-01-preview")
4640

4741
if credential is None:
4842
raise ValueError("Parameter 'credential' must not be None.")

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/_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 = "4.0.0"
9+
VERSION = "1.0.0b1"

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/aio/_configuration.py‎

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

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from .._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials_async import AsyncTokenCredential
@@ -42,7 +36,7 @@ class SecurityCenterConfiguration(Configuration): # pylint: disable=too-many-in
4236

4337
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
4438
super(SecurityCenterConfiguration, self).__init__(**kwargs)
45-
api_version: Literal["2015-06-01-preview"] = kwargs.pop("api_version", "2015-06-01-preview")
39+
api_version: str = kwargs.pop("api_version", "2015-06-01-preview")
4640

4741
if credential is None:
4842
raise ValueError("Parameter 'credential' must not be None.")

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/aio/operations/_locations_operations.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
1110
import urllib.parse
1211

@@ -31,10 +30,6 @@
3130
from ..._vendor import _convert_request
3231
from ...operations._locations_operations import build_get_request, build_list_request
3332

34-
if sys.version_info >= (3, 8):
35-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
36-
else:
37-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
3833
T = TypeVar("T")
3934
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
4035

@@ -73,9 +68,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.AscLocation"]:
7368
_headers = kwargs.pop("headers", {}) or {}
7469
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
7570

76-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
77-
"api_version", _params.pop("api-version", "2015-06-01-preview")
78-
)
71+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
7972
cls: ClsType[_models.AscLocationList] = kwargs.pop("cls", None)
8073

8174
error_map = {
@@ -166,9 +159,7 @@ async def get(self, asc_location: str, **kwargs: Any) -> _models.AscLocation:
166159
_headers = kwargs.pop("headers", {}) or {}
167160
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
168161

169-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
170-
"api_version", _params.pop("api-version", "2015-06-01-preview")
171-
)
162+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
172163
cls: ClsType[_models.AscLocation] = kwargs.pop("cls", None)
173164

174165
request = build_get_request(

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/aio/operations/_operations.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
1110
import urllib.parse
1211

@@ -30,10 +29,6 @@
3029
from ..._vendor import _convert_request
3130
from ...operations._operations import build_list_request
3231

33-
if sys.version_info >= (3, 8):
34-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
35-
else:
36-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
3732
T = TypeVar("T")
3833
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
3934

@@ -70,9 +65,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
7065
_headers = kwargs.pop("headers", {}) or {}
7166
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
7267

73-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
74-
"api_version", _params.pop("api-version", "2015-06-01-preview")
75-
)
68+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
7669
cls: ClsType[_models.OperationList] = kwargs.pop("cls", None)
7770

7871
error_map = {

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/aio/operations/_tasks_operations.py‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union
1110
import urllib.parse
1211

@@ -39,10 +38,6 @@
3938
build_update_subscription_level_task_state_request,
4039
)
4140

42-
if sys.version_info >= (3, 8):
43-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
44-
else:
45-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
4641
T = TypeVar("T")
4742
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
4843

@@ -81,9 +76,7 @@ def list(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncIterable["_m
8176
_headers = kwargs.pop("headers", {}) or {}
8277
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
8378

84-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
85-
"api_version", _params.pop("api-version", "2015-06-01-preview")
86-
)
79+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
8780
cls: ClsType[_models.SecurityTaskList] = kwargs.pop("cls", None)
8881

8982
error_map = {
@@ -172,9 +165,7 @@ def list_by_home_region(
172165
_headers = kwargs.pop("headers", {}) or {}
173166
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
174167

175-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
176-
"api_version", _params.pop("api-version", "2015-06-01-preview")
177-
)
168+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
178169
cls: ClsType[_models.SecurityTaskList] = kwargs.pop("cls", None)
179170

180171
error_map = {
@@ -273,9 +264,7 @@ async def get_subscription_level_task(
273264
_headers = kwargs.pop("headers", {}) or {}
274265
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
275266

276-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
277-
"api_version", _params.pop("api-version", "2015-06-01-preview")
278-
)
267+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
279268
cls: ClsType[_models.SecurityTask] = kwargs.pop("cls", None)
280269

281270
request = build_get_subscription_level_task_request(
@@ -347,9 +336,7 @@ async def update_subscription_level_task_state( # pylint: disable=inconsistent-
347336
_headers = kwargs.pop("headers", {}) or {}
348337
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
349338

350-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
351-
"api_version", _params.pop("api-version", "2015-06-01-preview")
352-
)
339+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
353340
cls: ClsType[None] = kwargs.pop("cls", None)
354341

355342
request = build_update_subscription_level_task_state_request(
@@ -406,9 +393,7 @@ def list_by_resource_group(
406393
_headers = kwargs.pop("headers", {}) or {}
407394
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
408395

409-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
410-
"api_version", _params.pop("api-version", "2015-06-01-preview")
411-
)
396+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
412397
cls: ClsType[_models.SecurityTaskList] = kwargs.pop("cls", None)
413398

414399
error_map = {
@@ -511,9 +496,7 @@ async def get_resource_group_level_task(
511496
_headers = kwargs.pop("headers", {}) or {}
512497
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
513498

514-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
515-
"api_version", _params.pop("api-version", "2015-06-01-preview")
516-
)
499+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
517500
cls: ClsType[_models.SecurityTask] = kwargs.pop("cls", None)
518501

519502
request = build_get_resource_group_level_task_request(
@@ -590,9 +573,7 @@ async def update_resource_group_level_task_state( # pylint: disable=inconsisten
590573
_headers = kwargs.pop("headers", {}) or {}
591574
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
592575

593-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
594-
"api_version", _params.pop("api-version", "2015-06-01-preview")
595-
)
576+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
596577
cls: ClsType[None] = kwargs.pop("cls", None)
597578

598579
request = build_update_resource_group_level_task_state_request(

‎sdk/security/azure-mgmt-security/azure/mgmt/security/v2015_06_01_preview/operations/_locations_operations.py‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
1110
import urllib.parse
1211

@@ -30,10 +29,6 @@
3029
from ..._serialization import Serializer
3130
from .._vendor import _convert_request, _format_url_section
3231

33-
if sys.version_info >= (3, 8):
34-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
35-
else:
36-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
3732
T = TypeVar("T")
3833
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
3934

@@ -45,9 +40,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest:
4540
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
4641
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
4742

48-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
49-
"api_version", _params.pop("api-version", "2015-06-01-preview")
50-
)
43+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
5144
accept = _headers.pop("Accept", "application/json")
5245

5346
# Construct URL
@@ -73,9 +66,7 @@ def build_get_request(asc_location: str, subscription_id: str, **kwargs: Any) ->
7366
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
7467
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
7568

76-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
77-
"api_version", _params.pop("api-version", "2015-06-01-preview")
78-
)
69+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
7970
accept = _headers.pop("Accept", "application/json")
8071

8172
# Construct URL
@@ -134,9 +125,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.AscLocation"]:
134125
_headers = kwargs.pop("headers", {}) or {}
135126
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
136127

137-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
138-
"api_version", _params.pop("api-version", "2015-06-01-preview")
139-
)
128+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
140129
cls: ClsType[_models.AscLocationList] = kwargs.pop("cls", None)
141130

142131
error_map = {
@@ -227,9 +216,7 @@ def get(self, asc_location: str, **kwargs: Any) -> _models.AscLocation:
227216
_headers = kwargs.pop("headers", {}) or {}
228217
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
229218

230-
api_version: Literal["2015-06-01-preview"] = kwargs.pop(
231-
"api_version", _params.pop("api-version", "2015-06-01-preview")
232-
)
219+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2015-06-01-preview"))
233220
cls: ClsType[_models.AscLocation] = kwargs.pop("cls", None)
234221

235222
request = build_get_request(

0 commit comments

Comments
 (0)