Generated from 006f63585ada13a78ac3ab4912789ca2df7186f2 (#5813)

Fixes after merge

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

@@ -29,6 +29,9 @@
     from .ti_data_connector_data_types_indicators_py3 import TIDataConnectorDataTypesIndicators
     from .ti_data_connector_data_types_py3 import TIDataConnectorDataTypes
     from .ti_data_connector_py3 import TIDataConnector
+    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 .alerts_data_type_of_data_connector_alerts_py3 import AlertsDataTypeOfDataConnectorAlerts
     from .alerts_data_type_of_data_connector_py3 import AlertsDataTypeOfDataConnector
     from .aad_data_connector_py3 import AADDataConnector
@@ -73,6 +76,9 @@
     from .ti_data_connector_data_types_indicators import TIDataConnectorDataTypesIndicators
     from .ti_data_connector_data_types import TIDataConnectorDataTypes
     from .ti_data_connector import TIDataConnector
+    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 .alerts_data_type_of_data_connector_alerts import AlertsDataTypeOfDataConnectorAlerts
     from .alerts_data_type_of_data_connector import AlertsDataTypeOfDataConnector
     from .aad_data_connector import AADDataConnector
@@ -143,6 +149,9 @@
     'TIDataConnectorDataTypesIndicators',
     'TIDataConnectorDataTypes',
     'TIDataConnector',
+    'AwsCloudTrailDataConnectorDataTypesLogs',
+    'AwsCloudTrailDataConnectorDataTypes',
+    'AwsCloudTrailDataConnector',
     'AlertsDataTypeOfDataConnectorAlerts',
     'AlertsDataTypeOfDataConnector',
     'AADDataConnector',

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

@@ -0,0 +1,62 @@
+# 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 .data_connector import DataConnector
+
+
+class AwsCloudTrailDataConnector(DataConnector):
+    """Represents Amazon Web Services CloudTrail 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 type: Azure resource type
+    :vartype type: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :param etag: Etag of the data connector.
+    :type etag: str
+    :param kind: Required. Constant filled by server.
+    :type kind: str
+    :param aws_role_arn: The Aws Role Arn (with CloudTrailReadOnly policy)
+     that is used to access the Aws account.
+    :type aws_role_arn: str
+    :param data_types: The available data types for the connector.
+    :type data_types:
+     ~azure.mgmt.securityinsight.models.AwsCloudTrailDataConnectorDataTypes
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+        'kind': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+        'kind': {'key': 'kind', 'type': 'str'},
+        'aws_role_arn': {'key': 'properties.awsRoleArn', 'type': 'str'},
+        'data_types': {'key': 'properties.dataTypes', 'type': 'AwsCloudTrailDataConnectorDataTypes'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AwsCloudTrailDataConnector, self).__init__(**kwargs)
+        self.aws_role_arn = kwargs.get('aws_role_arn', None)
+        self.data_types = kwargs.get('data_types', None)
+        self.kind = 'AmazonWebServicesCloudTrail'

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

@@ -0,0 +1,29 @@
+# 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 AwsCloudTrailDataConnectorDataTypes(Model):
+    """The available data types for Amazon Web Services CloudTrail data connector.
+
+    :param logs: Logs data type.
+    :type logs:
+     ~azure.mgmt.securityinsight.models.AwsCloudTrailDataConnectorDataTypesLogs
+    """
+
+    _attribute_map = {
+        'logs': {'key': 'logs', 'type': 'AwsCloudTrailDataConnectorDataTypesLogs'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AwsCloudTrailDataConnectorDataTypes, self).__init__(**kwargs)
+        self.logs = kwargs.get('logs', None)

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

@@ -0,0 +1,28 @@
+# 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 .data_connector_data_type_common import DataConnectorDataTypeCommon
+
+
+class AwsCloudTrailDataConnectorDataTypesLogs(DataConnectorDataTypeCommon):
+    """Logs data type.
+
+    :param state: Describe whether this data type connection is enabled or
+     not. Possible values include: 'Enabled', 'Disabled'
+    :type state: str or ~azure.mgmt.securityinsight.models.DataTypeState
+    """
+
+    _attribute_map = {
+        'state': {'key': 'state', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AwsCloudTrailDataConnectorDataTypesLogs, self).__init__(**kwargs)

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

@@ -0,0 +1,28 @@
+# 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 .data_connector_data_type_common_py3 import DataConnectorDataTypeCommon
+
+
+class AwsCloudTrailDataConnectorDataTypesLogs(DataConnectorDataTypeCommon):
+    """Logs data type.
+
+    :param state: Describe whether this data type connection is enabled or
+     not. Possible values include: 'Enabled', 'Disabled'
+    :type state: str or ~azure.mgmt.securityinsight.models.DataTypeState
+    """
+
+    _attribute_map = {
+        'state': {'key': 'state', 'type': 'str'},
+    }
+
+    def __init__(self, *, state=None, **kwargs) -> None:
+        super(AwsCloudTrailDataConnectorDataTypesLogs, self).__init__(state=state, **kwargs)

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

@@ -0,0 +1,29 @@
+# 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 AwsCloudTrailDataConnectorDataTypes(Model):
+    """The available data types for Amazon Web Services CloudTrail data connector.
+
+    :param logs: Logs data type.
+    :type logs:
+     ~azure.mgmt.securityinsight.models.AwsCloudTrailDataConnectorDataTypesLogs
+    """
+
+    _attribute_map = {
+        'logs': {'key': 'logs', 'type': 'AwsCloudTrailDataConnectorDataTypesLogs'},
+    }
+
+    def __init__(self, *, logs=None, **kwargs) -> None:
+        super(AwsCloudTrailDataConnectorDataTypes, self).__init__(**kwargs)
+        self.logs = logs

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

@@ -0,0 +1,62 @@
+# 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 .data_connector_py3 import DataConnector
+
+
+class AwsCloudTrailDataConnector(DataConnector):
+    """Represents Amazon Web Services CloudTrail 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 type: Azure resource type
+    :vartype type: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :param etag: Etag of the data connector.
+    :type etag: str
+    :param kind: Required. Constant filled by server.
+    :type kind: str
+    :param aws_role_arn: The Aws Role Arn (with CloudTrailReadOnly policy)
+     that is used to access the Aws account.
+    :type aws_role_arn: str
+    :param data_types: The available data types for the connector.
+    :type data_types:
+     ~azure.mgmt.securityinsight.models.AwsCloudTrailDataConnectorDataTypes
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+        'kind': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+        'kind': {'key': 'kind', 'type': 'str'},
+        'aws_role_arn': {'key': 'properties.awsRoleArn', 'type': 'str'},
+        'data_types': {'key': 'properties.dataTypes', 'type': 'AwsCloudTrailDataConnectorDataTypes'},
+    }
+
+    def __init__(self, *, etag: str=None, aws_role_arn: str=None, data_types=None, **kwargs) -> None:
+        super(AwsCloudTrailDataConnector, self).__init__(etag=etag, **kwargs)
+        self.aws_role_arn = aws_role_arn
+        self.data_types = data_types
+        self.kind = 'AmazonWebServicesCloudTrail'

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

@@ -16,8 +16,9 @@ class DataConnector(Model):
     """Data connector.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: OfficeDataConnector, TIDataConnector, AADDataConnector,
-    ASCDataConnector, MCASDataConnector
+    sub-classes are: OfficeDataConnector, TIDataConnector,
+    AwsCloudTrailDataConnector, AADDataConnector, ASCDataConnector,
+    MCASDataConnector
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -52,7 +53,7 @@ class DataConnector(Model):
     }
 
     _subtype_map = {
-        'kind': {'Office365': 'OfficeDataConnector', 'ThreatIntelligence': 'TIDataConnector', 'AzureActiveDirectory': 'AADDataConnector', 'AzureSecurityCenter': 'ASCDataConnector', 'MicrosoftCloudAppSecurity': 'MCASDataConnector'}
+        'kind': {'Office365': 'OfficeDataConnector', 'ThreatIntelligence': 'TIDataConnector', 'AmazonWebServicesCloudTrail': 'AwsCloudTrailDataConnector', 'AzureActiveDirectory': 'AADDataConnector', 'AzureSecurityCenter': 'ASCDataConnector', 'MicrosoftCloudAppSecurity': 'MCASDataConnector'}
     }
 
     def __init__(self, **kwargs):

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

@@ -17,7 +17,8 @@ class DataConnectorKind1(Model):
 
     :param kind: The kind of the data connector. Possible values include:
      'AzureActiveDirectory', 'AzureSecurityCenter',
-     'MicrosoftCloudAppSecurity', 'ThreatIntelligence', 'Office365'
+     'MicrosoftCloudAppSecurity', 'ThreatIntelligence', 'Office365',
+     'AmazonWebServicesCloudTrail'
     :type kind: str or ~azure.mgmt.securityinsight.models.DataConnectorKind
     """
 

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

@@ -17,7 +17,8 @@ class DataConnectorKind1(Model):
 
     :param kind: The kind of the data connector. Possible values include:
      'AzureActiveDirectory', 'AzureSecurityCenter',
-     'MicrosoftCloudAppSecurity', 'ThreatIntelligence', 'Office365'
+     'MicrosoftCloudAppSecurity', 'ThreatIntelligence', 'Office365',
+     'AmazonWebServicesCloudTrail'
     :type kind: str or ~azure.mgmt.securityinsight.models.DataConnectorKind
     """
 

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

@@ -16,8 +16,9 @@ class DataConnector(Model):
     """Data connector.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: OfficeDataConnector, TIDataConnector, AADDataConnector,
-    ASCDataConnector, MCASDataConnector
+    sub-classes are: OfficeDataConnector, TIDataConnector,
+    AwsCloudTrailDataConnector, AADDataConnector, ASCDataConnector,
+    MCASDataConnector
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -52,7 +53,7 @@ class DataConnector(Model):
     }
 
     _subtype_map = {
-        'kind': {'Office365': 'OfficeDataConnector', 'ThreatIntelligence': 'TIDataConnector', 'AzureActiveDirectory': 'AADDataConnector', 'AzureSecurityCenter': 'ASCDataConnector', 'MicrosoftCloudAppSecurity': 'MCASDataConnector'}
+        'kind': {'Office365': 'OfficeDataConnector', 'ThreatIntelligence': 'TIDataConnector', 'AmazonWebServicesCloudTrail': 'AwsCloudTrailDataConnector', 'AzureActiveDirectory': 'AADDataConnector', 'AzureSecurityCenter': 'ASCDataConnector', 'MicrosoftCloudAppSecurity': 'MCASDataConnector'}
     }
 
     def __init__(self, *, etag: str=None, **kwargs) -> None:

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

@@ -64,6 +64,7 @@ class DataConnectorKind(str, Enum):
     microsoft_cloud_app_security = "MicrosoftCloudAppSecurity"
     threat_intelligence = "ThreatIntelligence"
     office365 = "Office365"
+    amazon_web_services_cloud_trail = "AmazonWebServicesCloudTrail"
 
 
 class DataTypeState(str, Enum):