Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR] security/resource-manager #3782

Merged
merged 20 commits into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
899e951
Generated from 84624804865be53090660f859760f153de313691 (#3781)
AutorestCI Nov 12, 2018
906f411
[AutoPR security/resource-manager] Remove security contact phone fiel…
AutorestCI Nov 12, 2018
b742759
Generated from e691835335c3acf12428c89776c765a1fa2bdad5 (#3989)
AutorestCI Dec 5, 2018
9e45510
Generated from 1a24198dd982a4fcb510456404994241f55dc883 (#4113)
AutorestCI Jan 2, 2019
16c67ab
Generated from 5d46282b1371de397d3d60083b6485ff73332f93 (#4216)
AutorestCI Jan 22, 2019
5d9275e
[AutoPR security/resource-manager] Adding new api-version to Microsof…
AutorestCI Feb 1, 2019
1dadbdd
[AutoPR security/resource-manager] Azure Security Center - break-to-c…
AutorestCI Feb 25, 2019
6984828
[AutoPR security/resource-manager] Security - Updating API versions o…
AutorestCI Feb 28, 2019
b57be14
Merge branch 'master' into restapi_auto_security/resource-manager
iscai-msft Mar 4, 2019
9268ca4
Packaging update of azure-mgmt-security
azuresdkci Mar 4, 2019
3583676
updated versioning and change log
iscai-msft Mar 4, 2019
94fc059
Merge branch 'restapi_auto_security/resource-manager' of github.com:A…
iscai-msft Mar 4, 2019
b12eab0
Generated from 16b35cff6f2a72e062a8098e0cb95ccc209e25af (#4459)
AutorestCI Mar 4, 2019
418e8ac
[AutoPR security/resource-manager] Correlation Key property added (#4…
AutorestCI Mar 15, 2019
7619ab8
[AutoPR security/resource-manager] New security Regulatory compliance…
AutorestCI Mar 25, 2019
b19e1bc
[AutoPR security/resource-manager] Security: 2017-08-01-preview - In…
AutorestCI Mar 25, 2019
c61fef8
Generated from 35998a721ea3c6fbae6d5b40f051a3d0a8144ea9 (#4756)
AutorestCI Apr 6, 2019
fb07c1e
Packaging update of azure-mgmt-security
azuresdkci Apr 6, 2019
dd42e47
Merge branch 'master' into restapi_auto_security/resource-manager
lmazuel Apr 16, 2019
5ebe6ca
Update HISTORY.rst
lmazuel Apr 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions azure-mgmt-security/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
++++++++++++++++++

Expand Down
1 change: 1 addition & 0 deletions azure-mgmt-security/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
19 changes: 0 additions & 19 deletions azure-mgmt-security/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=====

Expand Down
278 changes: 147 additions & 131 deletions azure-mgmt-security/azure/mgmt/security/models/__init__.py

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions azure-mgmt-security/azure/mgmt/security/models/alert.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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):
Expand All @@ -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
18 changes: 16 additions & 2 deletions azure-mgmt-security/azure/mgmt/security/models/alert_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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:
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
@@ -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
Loading