Skip to content

Commit 887a5bb

Browse files
author
SDKAuto
committed
CodeGen from PR 23397 in Azure/azure-rest-api-specs
Merge b3b9c96b5e74c8da5d0ef4b8ef2e12ead40f57b6 into 351c8598465737e5a64dd4b65b57738dc8cf9bf7
1 parent 11ef2b1 commit 887a5bb

File tree

335 files changed

+13741
-2700
lines changed

Some content is hidden

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

335 files changed

+13741
-2700
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "ee96574a6d4ed37a06883b8e3f8fd3adf4803b83",
2+
"commit": "7e3bb94648e1d108698ceb4d3188758a41645a72",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.2",
55
"use": [
6-
"@autorest/[email protected].3",
6+
"@autorest/[email protected].8",
77
"@autorest/[email protected]"
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/[email protected].3 --use=@autorest/[email protected] --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/[email protected].8 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/security/resource-manager/readme.md"
1111
}
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from ._serialization import Serializer, Deserializer
12+
from typing import Any, IO, Optional, Union
13+
14+
from . import models as _models
15+
16+
17+
class SecurityCenterOperationsMixin(object):
18+
19+
def get_sensitivity_settings(
20+
self,
21+
**kwargs: Any
22+
) -> _models.GetSensitivitySettingsResponse:
23+
"""Gets data sensitivity settings for sensitive data discovery.
24+
25+
:keyword callable cls: A custom type or function that will be passed the direct response
26+
:return: GetSensitivitySettingsResponse or the result of cls(response)
27+
:rtype: ~azure.mgmt.security.v2023_02_01_preview.models.GetSensitivitySettingsResponse
28+
:raises ~azure.core.exceptions.HttpResponseError:
29+
"""
30+
api_version = self._get_api_version('get_sensitivity_settings')
31+
if api_version == '2023-02-01-preview':
32+
from .v2023_02_01_preview.operations import SecurityCenterOperationsMixin as OperationClass
33+
else:
34+
raise ValueError("API version {} does not have operation 'get_sensitivity_settings'".format(api_version))
35+
mixin_instance = OperationClass()
36+
mixin_instance._client = self._client
37+
mixin_instance._config = self._config
38+
mixin_instance._config.api_version = api_version
39+
mixin_instance._serialize = Serializer(self._models_dict(api_version))
40+
mixin_instance._serialize.client_side_validation = False
41+
mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
42+
return mixin_instance.get_sensitivity_settings(**kwargs)
43+
44+
def update_sensitivity_settings(
45+
self,
46+
sensitivity_settings: Union[_models.UpdateSensitivitySettingsRequest, IO],
47+
**kwargs: Any
48+
) -> _models.GetSensitivitySettingsResponse:
49+
"""Updates data sensitivity settings for sensitive data discovery.
50+
51+
:param sensitivity_settings: The data sensitivity settings to update. Is either a
52+
UpdateSensitivitySettingsRequest type or a IO type. Required.
53+
:type sensitivity_settings:
54+
~azure.mgmt.security.v2023_02_01_preview.models.UpdateSensitivitySettingsRequest or IO
55+
:keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
56+
Default value is None.
57+
:paramtype content_type: str
58+
:keyword callable cls: A custom type or function that will be passed the direct response
59+
:return: GetSensitivitySettingsResponse or the result of cls(response)
60+
:rtype: ~azure.mgmt.security.v2023_02_01_preview.models.GetSensitivitySettingsResponse
61+
:raises ~azure.core.exceptions.HttpResponseError:
62+
"""
63+
api_version = self._get_api_version('update_sensitivity_settings')
64+
if api_version == '2023-02-01-preview':
65+
from .v2023_02_01_preview.operations import SecurityCenterOperationsMixin as OperationClass
66+
else:
67+
raise ValueError("API version {} does not have operation 'update_sensitivity_settings'".format(api_version))
68+
mixin_instance = OperationClass()
69+
mixin_instance._client = self._client
70+
mixin_instance._config = self._config
71+
mixin_instance._config.api_version = api_version
72+
mixin_instance._serialize = Serializer(self._models_dict(api_version))
73+
mixin_instance._serialize.client_side_validation = False
74+
mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
75+
return mixin_instance.update_sensitivity_settings(sensitivity_settings, **kwargs)

sdk/security/azure-mgmt-security/azure/mgmt/security/_security_center.py

Lines changed: 102 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(self, *args, **kwargs):
2929
"""
3030
pass
3131

32-
class SecurityCenter(MultiApiClientMixin, _SDKClient):
32+
class SecurityCenter(SecurityCenterOperationsMixin, MultiApiClientMixin, _SDKClient):
3333
"""API spec for Microsoft.Security (Azure Security Center) resource provider.
3434
3535
This ready contains multiple API versions, to help you deal with all of the Azure clouds
@@ -53,7 +53,7 @@ class SecurityCenter(MultiApiClientMixin, _SDKClient):
5353
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
5454
"""
5555

56-
DEFAULT_API_VERSION = '2022-05-01'
56+
DEFAULT_API_VERSION = '2023-01-01'
5757
_PROFILE_TAG = "azure.mgmt.security.SecurityCenter"
5858
LATEST_PROFILE = ProfileDefinition({
5959
_PROFILE_TAG: {
@@ -64,6 +64,11 @@ class SecurityCenter(MultiApiClientMixin, _SDKClient):
6464
'alerts': '2022-01-01',
6565
'alerts_suppression_rules': '2019-01-01-preview',
6666
'allowed_connections': '2020-01-01',
67+
'api_collection': '2022-11-20-preview',
68+
'api_collection_offboarding': '2022-11-20-preview',
69+
'api_collection_onboarding': '2022-11-20-preview',
70+
'application': '2022-07-01-preview',
71+
'applications': '2022-07-01-preview',
6772
'assessments': '2021-06-01',
6873
'assessments_metadata': '2021-06-01',
6974
'auto_provisioning_settings': '2017-08-01-preview',
@@ -88,17 +93,19 @@ class SecurityCenter(MultiApiClientMixin, _SDKClient):
8893
'locations': '2015-06-01-preview',
8994
'mde_onboardings': '2021-10-01-preview',
9095
'operations': '2015-06-01-preview',
91-
'pricings': '2022-03-01',
9296
'regulatory_compliance_assessments': '2019-01-01-preview',
9397
'regulatory_compliance_controls': '2019-01-01-preview',
9498
'regulatory_compliance_standards': '2019-01-01-preview',
9599
'secure_score_control_definitions': '2020-01-01',
96100
'secure_score_controls': '2020-01-01',
97101
'secure_scores': '2020-01-01',
102+
'security_connector_application': '2022-07-01-preview',
103+
'security_connector_applications': '2022-07-01-preview',
98104
'security_contacts': '2017-08-01-preview',
99105
'security_solutions': '2020-01-01',
100106
'security_solutions_reference_data': '2020-01-01',
101107
'server_vulnerability_assessment': '2020-01-01',
108+
'settings': '2022-05-01',
102109
'software_inventories': '2021-05-01-preview',
103110
'sub_assessments': '2019-01-01-preview',
104111
'tasks': '2015-06-01-preview',
@@ -156,7 +163,11 @@ def models(cls, api_version=DEFAULT_API_VERSION):
156163
* 2022-05-01-preview: :mod:`v2022_05_01_preview.models<azure.mgmt.security.v2022_05_01_preview.models>`
157164
* 2022-07-01-preview: :mod:`v2022_07_01_preview.models<azure.mgmt.security.v2022_07_01_preview.models>`
158165
* 2022-08-01-preview: :mod:`v2022_08_01_preview.models<azure.mgmt.security.v2022_08_01_preview.models>`
166+
* 2022-11-20-preview: :mod:`v2022_11_20_preview.models<azure.mgmt.security.v2022_11_20_preview.models>`
167+
* 2023-01-01: :mod:`v2023_01_01.models<azure.mgmt.security.v2023_01_01.models>`
168+
* 2023-01-01-preview: :mod:`v2023_01_01_preview.models<azure.mgmt.security.v2023_01_01_preview.models>`
159169
* 2023-02-01-preview: :mod:`v2023_02_01_preview.models<azure.mgmt.security.v2023_02_01_preview.models>`
170+
* 2023-03-01-preview: :mod:`v2023_03_01_preview.models<azure.mgmt.security.v2023_03_01_preview.models>`
160171
"""
161172
if api_version == '2015-06-01-preview':
162173
from .v2015_06_01_preview import models
@@ -230,9 +241,21 @@ def models(cls, api_version=DEFAULT_API_VERSION):
230241
elif api_version == '2022-08-01-preview':
231242
from .v2022_08_01_preview import models
232243
return models
244+
elif api_version == '2022-11-20-preview':
245+
from .v2022_11_20_preview import models
246+
return models
247+
elif api_version == '2023-01-01':
248+
from .v2023_01_01 import models
249+
return models
250+
elif api_version == '2023-01-01-preview':
251+
from .v2023_01_01_preview import models
252+
return models
233253
elif api_version == '2023-02-01-preview':
234254
from .v2023_02_01_preview import models
235255
return models
256+
elif api_version == '2023-03-01-preview':
257+
from .v2023_03_01_preview import models
258+
return models
236259
raise ValueError("API version {} is not available".format(api_version))
237260

238261
@property
@@ -322,6 +345,48 @@ def allowed_connections(self):
322345
self._config.api_version = api_version
323346
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
324347

348+
@property
349+
def api_collection(self):
350+
"""Instance depends on the API version:
351+
352+
* 2022-11-20-preview: :class:`APICollectionOperations<azure.mgmt.security.v2022_11_20_preview.operations.APICollectionOperations>`
353+
"""
354+
api_version = self._get_api_version('api_collection')
355+
if api_version == '2022-11-20-preview':
356+
from .v2022_11_20_preview.operations import APICollectionOperations as OperationClass
357+
else:
358+
raise ValueError("API version {} does not have operation group 'api_collection'".format(api_version))
359+
self._config.api_version = api_version
360+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
361+
362+
@property
363+
def api_collection_offboarding(self):
364+
"""Instance depends on the API version:
365+
366+
* 2022-11-20-preview: :class:`APICollectionOffboardingOperations<azure.mgmt.security.v2022_11_20_preview.operations.APICollectionOffboardingOperations>`
367+
"""
368+
api_version = self._get_api_version('api_collection_offboarding')
369+
if api_version == '2022-11-20-preview':
370+
from .v2022_11_20_preview.operations import APICollectionOffboardingOperations as OperationClass
371+
else:
372+
raise ValueError("API version {} does not have operation group 'api_collection_offboarding'".format(api_version))
373+
self._config.api_version = api_version
374+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
375+
376+
@property
377+
def api_collection_onboarding(self):
378+
"""Instance depends on the API version:
379+
380+
* 2022-11-20-preview: :class:`APICollectionOnboardingOperations<azure.mgmt.security.v2022_11_20_preview.operations.APICollectionOnboardingOperations>`
381+
"""
382+
api_version = self._get_api_version('api_collection_onboarding')
383+
if api_version == '2022-11-20-preview':
384+
from .v2022_11_20_preview.operations import APICollectionOnboardingOperations as OperationClass
385+
else:
386+
raise ValueError("API version {} does not have operation group 'api_collection_onboarding'".format(api_version))
387+
self._config.api_version = api_version
388+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
389+
325390
@property
326391
def application(self):
327392
"""Instance depends on the API version:
@@ -726,12 +791,15 @@ def pricings(self):
726791
727792
* 2018-06-01: :class:`PricingsOperations<azure.mgmt.security.v2018_06_01.operations.PricingsOperations>`
728793
* 2022-03-01: :class:`PricingsOperations<azure.mgmt.security.v2022_03_01.operations.PricingsOperations>`
794+
* 2023-01-01: :class:`PricingsOperations<azure.mgmt.security.v2023_01_01.operations.PricingsOperations>`
729795
"""
730796
api_version = self._get_api_version('pricings')
731797
if api_version == '2018-06-01':
732798
from .v2018_06_01.operations import PricingsOperations as OperationClass
733799
elif api_version == '2022-03-01':
734800
from .v2022_03_01.operations import PricingsOperations as OperationClass
801+
elif api_version == '2023-01-01':
802+
from .v2023_01_01.operations import PricingsOperations as OperationClass
735803
else:
736804
raise ValueError("API version {} does not have operation group 'pricings'".format(api_version))
737805
self._config.api_version = api_version
@@ -856,6 +924,7 @@ def security_connectors(self):
856924
* 2021-07-01-preview: :class:`SecurityConnectorsOperations<azure.mgmt.security.v2021_07_01_preview.operations.SecurityConnectorsOperations>`
857925
* 2022-05-01-preview: :class:`SecurityConnectorsOperations<azure.mgmt.security.v2022_05_01_preview.operations.SecurityConnectorsOperations>`
858926
* 2022-08-01-preview: :class:`SecurityConnectorsOperations<azure.mgmt.security.v2022_08_01_preview.operations.SecurityConnectorsOperations>`
927+
* 2023-03-01-preview: :class:`SecurityConnectorsOperations<azure.mgmt.security.v2023_03_01_preview.operations.SecurityConnectorsOperations>`
859928
"""
860929
api_version = self._get_api_version('security_connectors')
861930
if api_version == '2021-07-01-preview':
@@ -864,6 +933,8 @@ def security_connectors(self):
864933
from .v2022_05_01_preview.operations import SecurityConnectorsOperations as OperationClass
865934
elif api_version == '2022-08-01-preview':
866935
from .v2022_08_01_preview.operations import SecurityConnectorsOperations as OperationClass
936+
elif api_version == '2023-03-01-preview':
937+
from .v2023_03_01_preview.operations import SecurityConnectorsOperations as OperationClass
867938
else:
868939
raise ValueError("API version {} does not have operation group 'security_connectors'".format(api_version))
869940
self._config.api_version = api_version
@@ -883,6 +954,20 @@ def security_contacts(self):
883954
self._config.api_version = api_version
884955
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
885956

957+
@property
958+
def security_operators(self):
959+
"""Instance depends on the API version:
960+
961+
* 2023-01-01-preview: :class:`SecurityOperatorsOperations<azure.mgmt.security.v2023_01_01_preview.operations.SecurityOperatorsOperations>`
962+
"""
963+
api_version = self._get_api_version('security_operators')
964+
if api_version == '2023-01-01-preview':
965+
from .v2023_01_01_preview.operations import SecurityOperatorsOperations as OperationClass
966+
else:
967+
raise ValueError("API version {} does not have operation group 'security_operators'".format(api_version))
968+
self._config.api_version = api_version
969+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
970+
886971
@property
887972
def security_solutions(self):
888973
"""Instance depends on the API version:
@@ -911,6 +996,20 @@ def security_solutions_reference_data(self):
911996
self._config.api_version = api_version
912997
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
913998

999+
@property
1000+
def sensitivity_settings(self):
1001+
"""Instance depends on the API version:
1002+
1003+
* 2023-02-01-preview: :class:`SensitivitySettingsOperations<azure.mgmt.security.v2023_02_01_preview.operations.SensitivitySettingsOperations>`
1004+
"""
1005+
api_version = self._get_api_version('sensitivity_settings')
1006+
if api_version == '2023-02-01-preview':
1007+
from .v2023_02_01_preview.operations import SensitivitySettingsOperations as OperationClass
1008+
else:
1009+
raise ValueError("API version {} does not have operation group 'sensitivity_settings'".format(api_version))
1010+
self._config.api_version = api_version
1011+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
1012+
9141013
@property
9151014
def server_vulnerability_assessment(self):
9161015
"""Instance depends on the API version:

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"

0 commit comments

Comments
 (0)