[AutoPR security/resource-manager] Add subscription scope to assessment metadata API

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

@@ -10,10 +10,11 @@
 # --------------------------------------------------------------------------
 
 try:
-    from .pricing_py3 import Pricing
-    from .pricing_list_py3 import PricingList
+    from .compliance_result_py3 import ComplianceResult
     from .asc_location_py3 import AscLocation
     from .resource_py3 import Resource
+    from .pricing_py3 import Pricing
+    from .pricing_list_py3 import PricingList
     from .alert_entity_py3 import AlertEntity
     from .alert_confidence_reason_py3 import AlertConfidenceReason
     from .alert_py3 import Alert
@@ -64,11 +65,18 @@
     from .information_protection_policy_py3 import InformationProtectionPolicy
     from .security_contact_py3 import SecurityContact
     from .workspace_setting_py3 import WorkspaceSetting
+    from .regulatory_compliance_standard_py3 import RegulatoryComplianceStandard
+    from .regulatory_compliance_control_py3 import RegulatoryComplianceControl
+    from .regulatory_compliance_assessment_py3 import RegulatoryComplianceAssessment
+    from .security_assessment_metadata_py3 import SecurityAssessmentMetadata
+    from .server_vulnerability_assessment_py3 import ServerVulnerabilityAssessment
+    from .server_vulnerability_assessments_list_py3 import ServerVulnerabilityAssessmentsList
 except (SyntaxError, ImportError):
-    from .pricing import Pricing
-    from .pricing_list import PricingList
+    from .compliance_result import ComplianceResult
     from .asc_location import AscLocation
     from .resource import Resource
+    from .pricing import Pricing
+    from .pricing_list import PricingList
     from .alert_entity import AlertEntity
     from .alert_confidence_reason import AlertConfidenceReason
     from .alert import Alert
@@ -119,6 +127,13 @@
     from .information_protection_policy import InformationProtectionPolicy
     from .security_contact import SecurityContact
     from .workspace_setting import WorkspaceSetting
+    from .regulatory_compliance_standard import RegulatoryComplianceStandard
+    from .regulatory_compliance_control import RegulatoryComplianceControl
+    from .regulatory_compliance_assessment import RegulatoryComplianceAssessment
+    from .security_assessment_metadata import SecurityAssessmentMetadata
+    from .server_vulnerability_assessment import ServerVulnerabilityAssessment
+    from .server_vulnerability_assessments_list import ServerVulnerabilityAssessmentsList
+from .compliance_result_paged import ComplianceResultPaged
 from .alert_paged import AlertPaged
 from .setting_paged import SettingPaged
 from .allowed_connections_resource_paged import AllowedConnectionsResourcePaged
@@ -134,7 +149,12 @@
 from .information_protection_policy_paged import InformationProtectionPolicyPaged
 from .security_contact_paged import SecurityContactPaged
 from .workspace_setting_paged import WorkspaceSettingPaged
+from .regulatory_compliance_standard_paged import RegulatoryComplianceStandardPaged
+from .regulatory_compliance_control_paged import RegulatoryComplianceControlPaged
+from .regulatory_compliance_assessment_paged import RegulatoryComplianceAssessmentPaged
+from .security_assessment_metadata_paged import SecurityAssessmentMetadataPaged
 from .security_center_enums import (
+    ResourceStatus,
     PricingTier,
     ReportedSeverity,
     SettingKind,
@@ -147,14 +167,19 @@
     AutoProvision,
     AlertNotifications,
     AlertsToAdmins,
+    State,
+    Category,
+    RequiredPricingBundle,
+    AssessmentType,
     ConnectionType,
 )
 
 __all__ = [
-    'Pricing',
-    'PricingList',
+    'ComplianceResult',
     'AscLocation',
     'Resource',
+    'Pricing',
+    'PricingList',
     'AlertEntity',
     'AlertConfidenceReason',
     'Alert',
@@ -205,6 +230,13 @@
     'InformationProtectionPolicy',
     'SecurityContact',
     'WorkspaceSetting',
+    'RegulatoryComplianceStandard',
+    'RegulatoryComplianceControl',
+    'RegulatoryComplianceAssessment',
+    'SecurityAssessmentMetadata',
+    'ServerVulnerabilityAssessment',
+    'ServerVulnerabilityAssessmentsList',
+    'ComplianceResultPaged',
     'AlertPaged',
     'SettingPaged',
     'AllowedConnectionsResourcePaged',
@@ -220,6 +252,11 @@
     'InformationProtectionPolicyPaged',
     'SecurityContactPaged',
     'WorkspaceSettingPaged',
+    'RegulatoryComplianceStandardPaged',
+    'RegulatoryComplianceControlPaged',
+    'RegulatoryComplianceAssessmentPaged',
+    'SecurityAssessmentMetadataPaged',
+    'ResourceStatus',
     'PricingTier',
     'ReportedSeverity',
     'SettingKind',
@@ -232,5 +269,9 @@
     'AutoProvision',
     'AlertNotifications',
     'AlertsToAdmins',
+    'State',
+    'Category',
+    'RequiredPricingBundle',
+    'AssessmentType',
     'ConnectionType',
 ]

sdk/security/azure-mgmt-security/azure/mgmt/security/models/compliance_result.py

@@ -0,0 +1,50 @@
+# 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 .resource import Resource
+
+
+class ComplianceResult(Resource):
+    """a compliance result.
+
+    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 resource_status: The status of the resource regarding a single
+     assessment. Possible values include: 'Healthy', 'NotApplicable',
+     'OffByPolicy', 'NotHealthy'
+    :vartype resource_status: str or
+     ~azure.mgmt.security.models.ResourceStatus
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'resource_status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'resource_status': {'key': 'properties.resourceStatus', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ComplianceResult, self).__init__(**kwargs)
+        self.resource_status = None

sdk/security/azure-mgmt-security/azure/mgmt/security/models/compliance_result_paged.py

@@ -0,0 +1,27 @@
+# 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.paging import Paged
+
+
+class ComplianceResultPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ComplianceResult <azure.mgmt.security.models.ComplianceResult>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ComplianceResult]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ComplianceResultPaged, self).__init__(*args, **kwargs)

sdk/security/azure-mgmt-security/azure/mgmt/security/models/compliance_result_py3.py

@@ -0,0 +1,50 @@
+# 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 .resource_py3 import Resource
+
+
+class ComplianceResult(Resource):
+    """a compliance result.
+
+    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 resource_status: The status of the resource regarding a single
+     assessment. Possible values include: 'Healthy', 'NotApplicable',
+     'OffByPolicy', 'NotHealthy'
+    :vartype resource_status: str or
+     ~azure.mgmt.security.models.ResourceStatus
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'resource_status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'resource_status': {'key': 'properties.resourceStatus', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ComplianceResult, self).__init__(**kwargs)
+        self.resource_status = None

sdk/security/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine.py

@@ -22,6 +22,9 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     :type id: str
     :param ports: Required. Port configurations for the virtual machine
     :type ports: list[~azure.mgmt.security.models.JitNetworkAccessPortRule]
+    :param public_ip_address: Public IP address of the Azure Firewall that is
+     linked to this policy, if applicable
+    :type public_ip_address: str
     """
 
     _validation = {
@@ -32,9 +35,11 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'ports': {'key': 'ports', 'type': '[JitNetworkAccessPortRule]'},
+        'public_ip_address': {'key': 'publicIpAddress', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(JitNetworkAccessPolicyVirtualMachine, self).__init__(**kwargs)
         self.id = kwargs.get('id', None)
         self.ports = kwargs.get('ports', None)
+        self.public_ip_address = kwargs.get('public_ip_address', None)

sdk/security/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine_py3.py

@@ -22,6 +22,9 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     :type id: str
     :param ports: Required. Port configurations for the virtual machine
     :type ports: list[~azure.mgmt.security.models.JitNetworkAccessPortRule]
+    :param public_ip_address: Public IP address of the Azure Firewall that is
+     linked to this policy, if applicable
+    :type public_ip_address: str
     """
 
     _validation = {
@@ -32,9 +35,11 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'ports': {'key': 'ports', 'type': '[JitNetworkAccessPortRule]'},
+        'public_ip_address': {'key': 'publicIpAddress', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str, ports, **kwargs) -> None:
+    def __init__(self, *, id: str, ports, public_ip_address: str=None, **kwargs) -> None:
         super(JitNetworkAccessPolicyVirtualMachine, self).__init__(**kwargs)
         self.id = id
         self.ports = ports
+        self.public_ip_address = public_ip_address

sdk/security/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port.py

@@ -36,6 +36,9 @@ class JitNetworkAccessRequestPort(Model):
      value. Possible values include: 'Expired', 'UserRequested',
      'NewerRequestInitiated'
     :type status_reason: str or ~azure.mgmt.security.models.StatusReason
+    :param mapped_port: The port which is mapped to this port's `number` in
+     the Azure Firewall, if applicable
+    :type mapped_port: int
     """
 
     _validation = {
@@ -52,6 +55,7 @@ class JitNetworkAccessRequestPort(Model):
         'end_time_utc': {'key': 'endTimeUtc', 'type': 'iso-8601'},
         'status': {'key': 'status', 'type': 'str'},
         'status_reason': {'key': 'statusReason', 'type': 'str'},
+        'mapped_port': {'key': 'mappedPort', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
@@ -62,3 +66,4 @@ def __init__(self, **kwargs):
         self.end_time_utc = kwargs.get('end_time_utc', None)
         self.status = kwargs.get('status', None)
         self.status_reason = kwargs.get('status_reason', None)
+        self.mapped_port = kwargs.get('mapped_port', None)

sdk/security/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port_py3.py

@@ -36,6 +36,9 @@ class JitNetworkAccessRequestPort(Model):
      value. Possible values include: 'Expired', 'UserRequested',
      'NewerRequestInitiated'
     :type status_reason: str or ~azure.mgmt.security.models.StatusReason
+    :param mapped_port: The port which is mapped to this port's `number` in
+     the Azure Firewall, if applicable
+    :type mapped_port: int
     """
 
     _validation = {
@@ -52,13 +55,15 @@ class JitNetworkAccessRequestPort(Model):
         'end_time_utc': {'key': 'endTimeUtc', 'type': 'iso-8601'},
         'status': {'key': 'status', 'type': 'str'},
         'status_reason': {'key': 'statusReason', 'type': 'str'},
+        'mapped_port': {'key': 'mappedPort', 'type': 'int'},
     }
 
-    def __init__(self, *, number: int, end_time_utc, status, status_reason, allowed_source_address_prefix: str=None, allowed_source_address_prefixes=None, **kwargs) -> None:
+    def __init__(self, *, number: int, end_time_utc, status, status_reason, allowed_source_address_prefix: str=None, allowed_source_address_prefixes=None, mapped_port: int=None, **kwargs) -> None:
         super(JitNetworkAccessRequestPort, self).__init__(**kwargs)
         self.number = number
         self.allowed_source_address_prefix = allowed_source_address_prefix
         self.allowed_source_address_prefixes = allowed_source_address_prefixes
         self.end_time_utc = end_time_utc
         self.status = status
         self.status_reason = status_reason
+        self.mapped_port = mapped_port