[AutoPR securityinsights/resource-manager] Adding kinds for AlertRules endpoints, updating AlertRuleTemplates endpoints

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/__init__.py

@@ -22,12 +22,12 @@
     from .alert_rule_py3 import AlertRule
     from .alert_rule_kind1_py3 import AlertRuleKind1
     from .alert_rule_template_py3 import AlertRuleTemplate
+    from .data_connector_status_py3 import DataConnectorStatus
+    from .alert_rule_template_properties_base_py3 import AlertRuleTemplatePropertiesBase
     from .aws_cloud_trail_data_connector_data_types_logs_py3 import AwsCloudTrailDataConnectorDataTypesLogs
     from .aws_cloud_trail_data_connector_data_types_py3 import AwsCloudTrailDataConnectorDataTypes
     from .aws_cloud_trail_data_connector_py3 import AwsCloudTrailDataConnector
     from .azure_resource_entity_py3 import AzureResourceEntity
-    from .data_connector_status_py3 import DataConnectorStatus
-    from .base_alert_rule_template_properties_py3 import BaseAlertRuleTemplateProperties
     from .user_info_py3 import UserInfo
     from .bookmark_py3 import Bookmark
     from .case_py3 import Case
@@ -53,10 +53,8 @@
     from .entity_query_py3 import EntityQuery
     from .file_entity_py3 import FileEntity
     from .file_hash_entity_py3 import FileHashEntity
-    from .filter_alert_rule_template_py3 import FilterAlertRuleTemplate
-    from .filter_alert_rule_template_properties_model_py3 import FilterAlertRuleTemplatePropertiesModel
+    from .fusion_alert_rule_py3 import FusionAlertRule
     from .fusion_alert_rule_template_py3 import FusionAlertRuleTemplate
-    from .fusion_alert_rule_template_properties_model_py3 import FusionAlertRuleTemplatePropertiesModel
     from .geo_location_py3 import GeoLocation
     from .host_entity_py3 import HostEntity
     from .threat_intelligence_py3 import ThreatIntelligence
@@ -66,6 +64,9 @@
     from .mcas_data_connector_py3 import MCASDataConnector
     from .mdatp_data_connector_py3 import MDATPDataConnector
     from .malware_entity_py3 import MalwareEntity
+    from .microsoft_security_incident_creation_alert_rule_py3 import MicrosoftSecurityIncidentCreationAlertRule
+    from .microsoft_security_incident_creation_alert_rule_common_properties_py3 import MicrosoftSecurityIncidentCreationAlertRuleCommonProperties
+    from .microsoft_security_incident_creation_alert_rule_template_py3 import MicrosoftSecurityIncidentCreationAlertRuleTemplate
     from .office_consent_py3 import OfficeConsent
     from .office_data_connector_data_types_exchange_py3 import OfficeDataConnectorDataTypesExchange
     from .office_data_connector_data_types_share_point_py3 import OfficeDataConnectorDataTypesSharePoint
@@ -77,9 +78,10 @@
     from .registry_key_entity_py3 import RegistryKeyEntity
     from .registry_value_entity_py3 import RegistryValueEntity
     from .resource_py3 import Resource
+    from .resource_with_etag_py3 import ResourceWithEtag
     from .scheduled_alert_rule_py3 import ScheduledAlertRule
+    from .scheduled_alert_rule_common_properties_py3 import ScheduledAlertRuleCommonProperties
     from .scheduled_alert_rule_template_py3 import ScheduledAlertRuleTemplate
-    from .scheduled_alert_rule_template_properties_model_py3 import ScheduledAlertRuleTemplatePropertiesModel
     from .security_alert_properties_confidence_reasons_item_py3 import SecurityAlertPropertiesConfidenceReasonsItem
     from .security_alert_py3 import SecurityAlert
     from .security_group_entity_py3 import SecurityGroupEntity
@@ -104,12 +106,12 @@
     from .alert_rule import AlertRule
     from .alert_rule_kind1 import AlertRuleKind1
     from .alert_rule_template import AlertRuleTemplate
+    from .data_connector_status import DataConnectorStatus
+    from .alert_rule_template_properties_base import AlertRuleTemplatePropertiesBase
     from .aws_cloud_trail_data_connector_data_types_logs import AwsCloudTrailDataConnectorDataTypesLogs
     from .aws_cloud_trail_data_connector_data_types import AwsCloudTrailDataConnectorDataTypes
     from .aws_cloud_trail_data_connector import AwsCloudTrailDataConnector
     from .azure_resource_entity import AzureResourceEntity
-    from .data_connector_status import DataConnectorStatus
-    from .base_alert_rule_template_properties import BaseAlertRuleTemplateProperties
     from .user_info import UserInfo
     from .bookmark import Bookmark
     from .case import Case
@@ -135,10 +137,8 @@
     from .entity_query import EntityQuery
     from .file_entity import FileEntity
     from .file_hash_entity import FileHashEntity
-    from .filter_alert_rule_template import FilterAlertRuleTemplate
-    from .filter_alert_rule_template_properties_model import FilterAlertRuleTemplatePropertiesModel
+    from .fusion_alert_rule import FusionAlertRule
     from .fusion_alert_rule_template import FusionAlertRuleTemplate
-    from .fusion_alert_rule_template_properties_model import FusionAlertRuleTemplatePropertiesModel
     from .geo_location import GeoLocation
     from .host_entity import HostEntity
     from .threat_intelligence import ThreatIntelligence
@@ -148,6 +148,9 @@
     from .mcas_data_connector import MCASDataConnector
     from .mdatp_data_connector import MDATPDataConnector
     from .malware_entity import MalwareEntity
+    from .microsoft_security_incident_creation_alert_rule import MicrosoftSecurityIncidentCreationAlertRule
+    from .microsoft_security_incident_creation_alert_rule_common_properties import MicrosoftSecurityIncidentCreationAlertRuleCommonProperties
+    from .microsoft_security_incident_creation_alert_rule_template import MicrosoftSecurityIncidentCreationAlertRuleTemplate
     from .office_consent import OfficeConsent
     from .office_data_connector_data_types_exchange import OfficeDataConnectorDataTypesExchange
     from .office_data_connector_data_types_share_point import OfficeDataConnectorDataTypesSharePoint
@@ -159,9 +162,10 @@
     from .registry_key_entity import RegistryKeyEntity
     from .registry_value_entity import RegistryValueEntity
     from .resource import Resource
+    from .resource_with_etag import ResourceWithEtag
     from .scheduled_alert_rule import ScheduledAlertRule
+    from .scheduled_alert_rule_common_properties import ScheduledAlertRuleCommonProperties
     from .scheduled_alert_rule_template import ScheduledAlertRuleTemplate
-    from .scheduled_alert_rule_template_properties_model import ScheduledAlertRuleTemplatePropertiesModel
     from .security_alert_properties_confidence_reasons_item import SecurityAlertPropertiesConfidenceReasonsItem
     from .security_alert import SecurityAlert
     from .security_group_entity import SecurityGroupEntity
@@ -187,11 +191,11 @@
 from .security_insights_enums import (
     AggregationsKind,
     AlertRuleKind,
-    TriggerOperator,
-    AlertSeverity,
-    AttackTactic,
     DataTypeStatus,
     TemplateStatus,
+    AttackTactic,
+    TriggerOperator,
+    AlertSeverity,
     CloseReason,
     CaseSeverity,
     CaseStatus,
@@ -201,6 +205,7 @@
     EntityType,
     FileHashAlgorithm,
     OSFamily,
+    MicrosoftSecurityProductName,
     ElevationToken,
     RegistryHive,
     RegistryValueKind,
@@ -226,12 +231,12 @@
     'AlertRule',
     'AlertRuleKind1',
     'AlertRuleTemplate',
+    'DataConnectorStatus',
+    'AlertRuleTemplatePropertiesBase',
     'AwsCloudTrailDataConnectorDataTypesLogs',
     'AwsCloudTrailDataConnectorDataTypes',
     'AwsCloudTrailDataConnector',
     'AzureResourceEntity',
-    'DataConnectorStatus',
-    'BaseAlertRuleTemplateProperties',
     'UserInfo',
     'Bookmark',
     'Case',
@@ -257,10 +262,8 @@
     'EntityQuery',
     'FileEntity',
     'FileHashEntity',
-    'FilterAlertRuleTemplate',
-    'FilterAlertRuleTemplatePropertiesModel',
+    'FusionAlertRule',
     'FusionAlertRuleTemplate',
-    'FusionAlertRuleTemplatePropertiesModel',
     'GeoLocation',
     'HostEntity',
     'ThreatIntelligence',
@@ -270,6 +273,9 @@
     'MCASDataConnector',
     'MDATPDataConnector',
     'MalwareEntity',
+    'MicrosoftSecurityIncidentCreationAlertRule',
+    'MicrosoftSecurityIncidentCreationAlertRuleCommonProperties',
+    'MicrosoftSecurityIncidentCreationAlertRuleTemplate',
     'OfficeConsent',
     'OfficeDataConnectorDataTypesExchange',
     'OfficeDataConnectorDataTypesSharePoint',
@@ -281,9 +287,10 @@
     'RegistryKeyEntity',
     'RegistryValueEntity',
     'Resource',
+    'ResourceWithEtag',
     'ScheduledAlertRule',
+    'ScheduledAlertRuleCommonProperties',
     'ScheduledAlertRuleTemplate',
-    'ScheduledAlertRuleTemplatePropertiesModel',
     'SecurityAlertPropertiesConfidenceReasonsItem',
     'SecurityAlert',
     'SecurityGroupEntity',
@@ -308,11 +315,11 @@
     'EntityQueryPaged',
     'AggregationsKind',
     'AlertRuleKind',
-    'TriggerOperator',
-    'AlertSeverity',
-    'AttackTactic',
     'DataTypeStatus',
     'TemplateStatus',
+    'AttackTactic',
+    'TriggerOperator',
+    'AlertSeverity',
     'CloseReason',
     'CaseSeverity',
     'CaseStatus',
@@ -322,6 +329,7 @@
     'EntityType',
     'FileHashAlgorithm',
     'OSFamily',
+    'MicrosoftSecurityProductName',
     'ElevationToken',
     'RegistryHive',
     'RegistryValueKind',

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aad_data_connector.py

@@ -15,18 +15,9 @@
 class AADDataConnector(DataConnector):
     """Represents AAD (Azure Active Directory) data connector.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Azure resource Id
-    :vartype id: str
-    :ivar name: Azure resource name
-    :vartype name: str
-    :ivar type: Azure resource type
-    :vartype type: str
-    :param etag: Etag of the data connector.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
     :type kind: str
@@ -38,16 +29,10 @@ class AADDataConnector(DataConnector):
     """
 
     _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aad_data_connector_py3.py

@@ -15,18 +15,9 @@
 class AADDataConnector(DataConnector):
     """Represents AAD (Azure Active Directory) data connector.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Azure resource Id
-    :vartype id: str
-    :ivar name: Azure resource name
-    :vartype name: str
-    :ivar type: Azure resource type
-    :vartype type: str
-    :param etag: Etag of the data connector.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
     :type kind: str
@@ -38,16 +29,10 @@ class AADDataConnector(DataConnector):
     """
 
     _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aatp_data_connector.py

@@ -15,18 +15,9 @@
 class AATPDataConnector(DataConnector):
     """Represents AATP (Azure Advanced Threat Protection) data connector.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Azure resource Id
-    :vartype id: str
-    :ivar name: Azure resource name
-    :vartype name: str
-    :ivar type: Azure resource type
-    :vartype type: str
-    :param etag: Etag of the data connector.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
     :type kind: str
@@ -38,16 +29,10 @@ class AATPDataConnector(DataConnector):
     """
 
     _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aatp_data_connector_py3.py

@@ -15,18 +15,9 @@
 class AATPDataConnector(DataConnector):
     """Represents AATP (Azure Advanced Threat Protection) data connector.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Azure resource Id
-    :vartype id: str
-    :ivar name: Azure resource name
-    :vartype name: str
-    :ivar type: Azure resource type
-    :vartype type: str
-    :param etag: Etag of the data connector.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
     :type kind: str
@@ -38,16 +29,10 @@ class AATPDataConnector(DataConnector):
     """
 
     _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action.py

@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_with_etag import ResourceWithEtag
 
 
-class Action(Resource):
+class Action(ResourceWithEtag):
     """Action for alert rule.
 
     Variables are only populated by the server, and will be ignored when
@@ -24,7 +24,7 @@ class Action(Resource):
     :vartype name: str
     :ivar type: Azure resource type
     :vartype type: str
-    :param etag: Etag of the action.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param trigger_uri: The uri for the action to trigger.
     :type trigger_uri: str
@@ -46,5 +46,4 @@ class Action(Resource):
 
     def __init__(self, **kwargs):
         super(Action, self).__init__(**kwargs)
-        self.etag = kwargs.get('etag', None)
         self.trigger_uri = kwargs.get('trigger_uri', None)

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_py3.py

@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_py3 import Resource
+from .resource_with_etag_py3 import ResourceWithEtag
 
 
-class Action(Resource):
+class Action(ResourceWithEtag):
     """Action for alert rule.
 
     Variables are only populated by the server, and will be ignored when
@@ -24,7 +24,7 @@ class Action(Resource):
     :vartype name: str
     :ivar type: Azure resource type
     :vartype type: str
-    :param etag: Etag of the action.
+    :param etag: Etag of the azure resource
     :type etag: str
     :param trigger_uri: The uri for the action to trigger.
     :type trigger_uri: str
@@ -45,6 +45,5 @@ class Action(Resource):
     }
 
     def __init__(self, *, etag: str=None, trigger_uri: str=None, **kwargs) -> None:
-        super(Action, self).__init__(**kwargs)
-        self.etag = etag
+        super(Action, self).__init__(etag=etag, **kwargs)
         self.trigger_uri = trigger_uri