[AutoPR] security/resource-manager (#3782)

* Generated from 84624804865be53090660f859760f153de313691 (#3781)

merged from master

* [AutoPR security/resource-manager] Remove security contact phone field mandatory fields (#3753)

* Generated from 3f99e72342d5d4f194ff74c8c553657530955783

Remove security contact phone field mandatory fields

* Generated from e94d9f5b16a429a3f1d2270a981be7218f06fd36

Update security contact examples - refactored - second iteration

* Generated from e691835335c3acf12428c89776c765a1fa2bdad5 (#3989)

typo: security/resource-manager/Microsoft.Security

- Double word "alert"
- addess -> address
- whos -> whose

* Generated from 1a24198dd982a4fcb510456404994241f55dc883 (#4113)

Settings API

* Generated from 5d46282b1371de397d3d60083b6485ff73332f93 (#4216)

add comma

* [AutoPR security/resource-manager] Adding new api-version to Microsoft.Security Alerts resource (#4283)

* Generated from f862d11a6a08b6c7243a79c2996690518313ac9a

Rollback readme change

* Packaging update of azure-mgmt-security

* [AutoPR security/resource-manager] Azure Security Center - break-to-composite v1 (#4354)

* Generated from 2a8aacac69e7675f0417a2dee3770256656042c8

first break-to-composite attempt

* Generated from 6cbbbe2e2e840c19e3f97332dbc44d0eb4049ce5

Azure Security Center - add missing 2017-08-01-preview api-version + bugfixes

* [AutoPR security/resource-manager] Security - Updating API versions of alerts and pricing types (#4423)

* Generated from 6b10f3754b112658124483817ff82792d4de2fcc

Security - Updating api versions of alerts and pricing types

* Generated from 67e18cba585922ac70f701db683e2cf8a4b6d19f

Security - Updating api versions of alerts and pricing types

* Packaging update of azure-mgmt-security

* updated versioning and change log

* Generated from 16b35cff6f2a72e062a8098e0cb95ccc209e25af (#4459)

reverted security python readme to pre multi api

* [AutoPR security/resource-manager] Correlation Key property added (#4524)

* Generated from 566b64da8e05aef201e8e3537edcd0c47530e360

typo fix

* Packaging update of azure-mgmt-security

* Generated from e620762eee468dab30a0eac68387dbaaed34cdc3

tabs switched to spaces + description changed to be more informative

* [AutoPR security/resource-manager] New security Regulatory compliance API (#4502)

* Generated from 60b311c10c1de2583d21065332a28f65b6025e8b

Regulatory compliance API

* Packaging update of azure-mgmt-security

* Generated from f2f06c6cb708b078507ff93bb5bd338416b27de7

Merge branch 'master' of https://github.com/himarkov/azure-rest-api-specs

* Generated from 57997a34834cb3e70253fc7573647886666edb4f

Update regulatoryCompliance.json

* [AutoPR security/resource-manager]  Security: 2017-08-01-preview - Introduce IoT security groups resource (#4112)

* Generated from c55343d67df9f202ebbfdc2670f167350fe265ea

Some fixes after validation

* Generated from d6824620292538df997c2da42c9deda14ee9a90f

Change resource name, add x-ms-pagable

* Generated from 0cfbd83907e23a9364669f804e9442d771ad088b

Sync with master (split files by resource type), add value type

* Packaging update of azure-mgmt-security

* Generated from 45af2dd2143cc9b695ea876a68496401cb37acb9

Fix readme file

* Generated from 67d905e193967e7a8c35511c87239b4f052314a1

delete unreferenced example file

* Generated from 35998a721ea3c6fbae6d5b40f051a3d0a8144ea9 (#4756)

Changing new version Settings file

* Packaging update of azure-mgmt-security

* Update HISTORY.rst

Author: AutorestCI

azure-mgmt-security/HISTORY.rst

@@ -3,6 +3,26 @@
 Release History
 ===============
 
+0.2.0 (2019-04-16)
+++++++++++++++++++
+
+**Features**
+
+- Model Pricing has a new parameter free_trial_remaining_time
+- Model Alert has a new parameter is_incident
+- Added operation PricingsOperations.get
+- Added operation PricingsOperations.update
+- Added operation group AllowedConnectionsOperations
+
+**Breaking changes**
+
+- Operation SettingsOperations.update has a new signature
+- Removed operation PricingsOperations.update_subscription_pricing
+- Removed operation PricingsOperations.list_by_resource_group
+- Removed operation PricingsOperations.create_or_update_resource_group_pricing
+- Removed operation PricingsOperations.get_resource_group_pricing
+- Removed operation PricingsOperations.get_subscription_pricing
+
 0.1.0 (2018-10-29)
 ++++++++++++++++++
 

azure-mgmt-security/MANIFEST.in

@@ -1,3 +1,4 @@
+recursive-include tests *.py *.yaml
 include *.rst
 include azure/__init__.py
 include azure/mgmt/__init__.py

azure-mgmt-security/README.rst

@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 

azure-mgmt-security/azure/mgmt/security/models/__init__.py

@@ -44,8 +44,10 @@ class Alert(Resource):
     :ivar action_taken: The action that was taken as a response to the alert
      (Active, Blocked etc.)
     :vartype action_taken: str
-    :ivar reported_severity: Estimated severity of this alert
-    :vartype reported_severity: str
+    :ivar reported_severity: Estimated severity of this alert. Possible values
+     include: 'Informational', 'Low', 'Medium', 'High'
+    :vartype reported_severity: str or
+     ~azure.mgmt.security.models.ReportedSeverity
     :ivar compromised_entity: The entity that the incident happened on
     :vartype compromised_entity: str
     :ivar associated_resource: Azure resource ID of the associated resource
@@ -57,6 +59,9 @@ class Alert(Resource):
     :ivar can_be_investigated: Whether this alert can be investigated with
      Azure Security Center
     :vartype can_be_investigated: bool
+    :ivar is_incident: Whether this alert is for incident type or not
+     (otherwise - single alert)
+    :vartype is_incident: bool
     :param entities: objects that are related to this alerts
     :type entities: list[~azure.mgmt.security.models.AlertEntity]
     :ivar confidence_score: level of confidence we have on the alert
@@ -73,6 +78,9 @@ class Alert(Resource):
     :ivar workspace_arm_id: Azure resource ID of the workspace that the alert
      was reported to.
     :vartype workspace_arm_id: str
+    :ivar correlation_key: Alerts with the same CorrelationKey will be grouped
+     together in Ibiza.
+    :vartype correlation_key: str
     """
 
     _validation = {
@@ -93,10 +101,12 @@ class Alert(Resource):
         'associated_resource': {'readonly': True},
         'system_source': {'readonly': True},
         'can_be_investigated': {'readonly': True},
+        'is_incident': {'readonly': True},
         'confidence_score': {'readonly': True, 'maximum': 1, 'minimum': 0},
         'subscription_id': {'readonly': True},
         'instance_id': {'readonly': True},
         'workspace_arm_id': {'readonly': True},
+        'correlation_key': {'readonly': True},
     }
 
     _attribute_map = {
@@ -118,12 +128,14 @@ class Alert(Resource):
         'extended_properties': {'key': 'properties.extendedProperties', 'type': '{object}'},
         'system_source': {'key': 'properties.systemSource', 'type': 'str'},
         'can_be_investigated': {'key': 'properties.canBeInvestigated', 'type': 'bool'},
+        'is_incident': {'key': 'properties.isIncident', 'type': 'bool'},
         'entities': {'key': 'properties.entities', 'type': '[AlertEntity]'},
         'confidence_score': {'key': 'properties.confidenceScore', 'type': 'float'},
         'confidence_reasons': {'key': 'properties.confidenceReasons', 'type': '[AlertConfidenceReason]'},
         'subscription_id': {'key': 'properties.subscriptionId', 'type': 'str'},
         'instance_id': {'key': 'properties.instanceId', 'type': 'str'},
         'workspace_arm_id': {'key': 'properties.workspaceArmId', 'type': 'str'},
+        'correlation_key': {'key': 'properties.correlationKey', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -143,9 +155,11 @@ def __init__(self, **kwargs):
         self.extended_properties = kwargs.get('extended_properties', None)
         self.system_source = None
         self.can_be_investigated = None
+        self.is_incident = None
         self.entities = kwargs.get('entities', None)
         self.confidence_score = None
         self.confidence_reasons = kwargs.get('confidence_reasons', None)
         self.subscription_id = None
         self.instance_id = None
         self.workspace_arm_id = None
+        self.correlation_key = None

azure-mgmt-security/azure/mgmt/security/models/alert.py

@@ -44,8 +44,10 @@ class Alert(Resource):
     :ivar action_taken: The action that was taken as a response to the alert
      (Active, Blocked etc.)
     :vartype action_taken: str
-    :ivar reported_severity: Estimated severity of this alert
-    :vartype reported_severity: str
+    :ivar reported_severity: Estimated severity of this alert. Possible values
+     include: 'Informational', 'Low', 'Medium', 'High'
+    :vartype reported_severity: str or
+     ~azure.mgmt.security.models.ReportedSeverity
     :ivar compromised_entity: The entity that the incident happened on
     :vartype compromised_entity: str
     :ivar associated_resource: Azure resource ID of the associated resource
@@ -57,6 +59,9 @@ class Alert(Resource):
     :ivar can_be_investigated: Whether this alert can be investigated with
      Azure Security Center
     :vartype can_be_investigated: bool
+    :ivar is_incident: Whether this alert is for incident type or not
+     (otherwise - single alert)
+    :vartype is_incident: bool
     :param entities: objects that are related to this alerts
     :type entities: list[~azure.mgmt.security.models.AlertEntity]
     :ivar confidence_score: level of confidence we have on the alert
@@ -73,6 +78,9 @@ class Alert(Resource):
     :ivar workspace_arm_id: Azure resource ID of the workspace that the alert
      was reported to.
     :vartype workspace_arm_id: str
+    :ivar correlation_key: Alerts with the same CorrelationKey will be grouped
+     together in Ibiza.
+    :vartype correlation_key: str
     """
 
     _validation = {
@@ -93,10 +101,12 @@ class Alert(Resource):
         'associated_resource': {'readonly': True},
         'system_source': {'readonly': True},
         'can_be_investigated': {'readonly': True},
+        'is_incident': {'readonly': True},
         'confidence_score': {'readonly': True, 'maximum': 1, 'minimum': 0},
         'subscription_id': {'readonly': True},
         'instance_id': {'readonly': True},
         'workspace_arm_id': {'readonly': True},
+        'correlation_key': {'readonly': True},
     }
 
     _attribute_map = {
@@ -118,12 +128,14 @@ class Alert(Resource):
         'extended_properties': {'key': 'properties.extendedProperties', 'type': '{object}'},
         'system_source': {'key': 'properties.systemSource', 'type': 'str'},
         'can_be_investigated': {'key': 'properties.canBeInvestigated', 'type': 'bool'},
+        'is_incident': {'key': 'properties.isIncident', 'type': 'bool'},
         'entities': {'key': 'properties.entities', 'type': '[AlertEntity]'},
         'confidence_score': {'key': 'properties.confidenceScore', 'type': 'float'},
         'confidence_reasons': {'key': 'properties.confidenceReasons', 'type': '[AlertConfidenceReason]'},
         'subscription_id': {'key': 'properties.subscriptionId', 'type': 'str'},
         'instance_id': {'key': 'properties.instanceId', 'type': 'str'},
         'workspace_arm_id': {'key': 'properties.workspaceArmId', 'type': 'str'},
+        'correlation_key': {'key': 'properties.correlationKey', 'type': 'str'},
     }
 
     def __init__(self, *, extended_properties=None, entities=None, confidence_reasons=None, **kwargs) -> None:
@@ -143,9 +155,11 @@ def __init__(self, *, extended_properties=None, entities=None, confidence_reason
         self.extended_properties = extended_properties
         self.system_source = None
         self.can_be_investigated = None
+        self.is_incident = None
         self.entities = entities
         self.confidence_score = None
         self.confidence_reasons = confidence_reasons
         self.subscription_id = None
         self.instance_id = None
         self.workspace_arm_id = None
+        self.correlation_key = None

azure-mgmt-security/azure/mgmt/security/models/alert_py3.py

@@ -0,0 +1,63 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AllowedConnectionsResource(Model):
+    """The resource whose properties describes the allowed traffic between Azure
+    resources.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Location where the resource is stored
+    :vartype location: str
+    :ivar calculated_date_time: The UTC time on which the allowed connections
+     resource was calculated
+    :vartype calculated_date_time: datetime
+    :ivar connectable_resources: List of connectable resources
+    :vartype connectable_resources:
+     list[~azure.mgmt.security.models.ConnectableResource]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+        'calculated_date_time': {'readonly': True},
+        'connectable_resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'calculated_date_time': {'key': 'properties.calculatedDateTime', 'type': 'iso-8601'},
+        'connectable_resources': {'key': 'properties.connectableResources', 'type': '[ConnectableResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AllowedConnectionsResource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.location = None
+        self.calculated_date_time = None
+        self.connectable_resources = None

azure-mgmt-security/azure/mgmt/security/models/allowed_connections_resource.py

@@ -12,16 +12,16 @@
 from msrest.paging import Paged
 
 
-class PricingPaged(Paged):
+class AllowedConnectionsResourcePaged(Paged):
     """
-    A paging container for iterating over a list of :class:`Pricing <azure.mgmt.security.models.Pricing>` object
+    A paging container for iterating over a list of :class:`AllowedConnectionsResource <azure.mgmt.security.models.AllowedConnectionsResource>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Pricing]'}
+        'current_page': {'key': 'value', 'type': '[AllowedConnectionsResource]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(PricingPaged, self).__init__(*args, **kwargs)
+        super(AllowedConnectionsResourcePaged, self).__init__(*args, **kwargs)

azure-mgmt-security/azure/mgmt/security/models/pricing_paged.py renamed to azure-mgmt-security/azure/mgmt/security/models/allowed_connections_resource_paged.py

@@ -0,0 +1,63 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AllowedConnectionsResource(Model):
+    """The resource whose properties describes the allowed traffic between Azure
+    resources.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Location where the resource is stored
+    :vartype location: str
+    :ivar calculated_date_time: The UTC time on which the allowed connections
+     resource was calculated
+    :vartype calculated_date_time: datetime
+    :ivar connectable_resources: List of connectable resources
+    :vartype connectable_resources:
+     list[~azure.mgmt.security.models.ConnectableResource]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+        'calculated_date_time': {'readonly': True},
+        'connectable_resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'calculated_date_time': {'key': 'properties.calculatedDateTime', 'type': 'iso-8601'},
+        'connectable_resources': {'key': 'properties.connectableResources', 'type': '[ConnectableResource]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(AllowedConnectionsResource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.location = None
+        self.calculated_date_time = None
+        self.connectable_resources = None