[AutoPR sql/resource-manager] Rename resource "ShortTermRetentionPolicy"->"BackupShortTermRetentionPolicy" to align with "BackupLongTermRetentionPolicy"

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

@@ -81,6 +81,24 @@
     from .sync_member_py3 import SyncMember
     from .subscription_usage_py3 import SubscriptionUsage
     from .virtual_network_rule_py3 import VirtualNetworkRule
+    from .database_vulnerability_assessment_rule_baseline_item_py3 import DatabaseVulnerabilityAssessmentRuleBaselineItem
+    from .database_vulnerability_assessment_rule_baseline_py3 import DatabaseVulnerabilityAssessmentRuleBaseline
+    from .vulnerability_assessment_recurring_scans_properties_py3 import VulnerabilityAssessmentRecurringScansProperties
+    from .database_vulnerability_assessment_py3 import DatabaseVulnerabilityAssessment
+    from .job_agent_py3 import JobAgent
+    from .job_agent_update_py3 import JobAgentUpdate
+    from .job_credential_py3 import JobCredential
+    from .job_execution_target_py3 import JobExecutionTarget
+    from .job_execution_py3 import JobExecution
+    from .job_schedule_py3 import JobSchedule
+    from .job_py3 import Job
+    from .job_step_action_py3 import JobStepAction
+    from .job_step_output_py3 import JobStepOutput
+    from .job_step_execution_options_py3 import JobStepExecutionOptions
+    from .job_step_py3 import JobStep
+    from .job_target_py3 import JobTarget
+    from .job_target_group_py3 import JobTargetGroup
+    from .job_version_py3 import JobVersion
     from .long_term_retention_backup_py3 import LongTermRetentionBackup
     from .backup_long_term_retention_policy_py3 import BackupLongTermRetentionPolicy
     from .complete_database_restore_definition_py3 import CompleteDatabaseRestoreDefinition
@@ -117,12 +135,15 @@
     from .elastic_pool_per_database_settings_py3 import ElasticPoolPerDatabaseSettings
     from .elastic_pool_py3 import ElasticPool
     from .elastic_pool_update_py3 import ElasticPoolUpdate
+    from .vulnerability_assessment_scan_error_py3 import VulnerabilityAssessmentScanError
+    from .vulnerability_assessment_scan_record_py3 import VulnerabilityAssessmentScanRecord
+    from .database_vulnerability_assessment_scans_export_py3 import DatabaseVulnerabilityAssessmentScansExport
     from .instance_failover_group_read_write_endpoint_py3 import InstanceFailoverGroupReadWriteEndpoint
     from .instance_failover_group_read_only_endpoint_py3 import InstanceFailoverGroupReadOnlyEndpoint
     from .partner_region_info_py3 import PartnerRegionInfo
     from .managed_instance_pair_info_py3 import ManagedInstancePairInfo
     from .instance_failover_group_py3 import InstanceFailoverGroup
-    from .short_term_retention_policy_py3 import ShortTermRetentionPolicy
+    from .backup_short_term_retention_policy_py3 import BackupShortTermRetentionPolicy
 except (SyntaxError, ImportError):
     from .resource import Resource
     from .tracked_resource import TrackedResource
@@ -195,6 +216,24 @@
     from .sync_member import SyncMember
     from .subscription_usage import SubscriptionUsage
     from .virtual_network_rule import VirtualNetworkRule
+    from .database_vulnerability_assessment_rule_baseline_item import DatabaseVulnerabilityAssessmentRuleBaselineItem
+    from .database_vulnerability_assessment_rule_baseline import DatabaseVulnerabilityAssessmentRuleBaseline
+    from .vulnerability_assessment_recurring_scans_properties import VulnerabilityAssessmentRecurringScansProperties
+    from .database_vulnerability_assessment import DatabaseVulnerabilityAssessment
+    from .job_agent import JobAgent
+    from .job_agent_update import JobAgentUpdate
+    from .job_credential import JobCredential
+    from .job_execution_target import JobExecutionTarget
+    from .job_execution import JobExecution
+    from .job_schedule import JobSchedule
+    from .job import Job
+    from .job_step_action import JobStepAction
+    from .job_step_output import JobStepOutput
+    from .job_step_execution_options import JobStepExecutionOptions
+    from .job_step import JobStep
+    from .job_target import JobTarget
+    from .job_target_group import JobTargetGroup
+    from .job_version import JobVersion
     from .long_term_retention_backup import LongTermRetentionBackup
     from .backup_long_term_retention_policy import BackupLongTermRetentionPolicy
     from .complete_database_restore_definition import CompleteDatabaseRestoreDefinition
@@ -231,12 +270,15 @@
     from .elastic_pool_per_database_settings import ElasticPoolPerDatabaseSettings
     from .elastic_pool import ElasticPool
     from .elastic_pool_update import ElasticPoolUpdate
+    from .vulnerability_assessment_scan_error import VulnerabilityAssessmentScanError
+    from .vulnerability_assessment_scan_record import VulnerabilityAssessmentScanRecord
+    from .database_vulnerability_assessment_scans_export import DatabaseVulnerabilityAssessmentScansExport
     from .instance_failover_group_read_write_endpoint import InstanceFailoverGroupReadWriteEndpoint
     from .instance_failover_group_read_only_endpoint import InstanceFailoverGroupReadOnlyEndpoint
     from .partner_region_info import PartnerRegionInfo
     from .managed_instance_pair_info import ManagedInstancePairInfo
     from .instance_failover_group import InstanceFailoverGroup
-    from .short_term_retention_policy import ShortTermRetentionPolicy
+    from .backup_short_term_retention_policy import BackupShortTermRetentionPolicy
 from .recoverable_database_paged import RecoverableDatabasePaged
 from .restorable_dropped_database_paged import RestorableDroppedDatabasePaged
 from .server_paged import ServerPaged
@@ -273,12 +315,20 @@
 from .sync_member_paged import SyncMemberPaged
 from .subscription_usage_paged import SubscriptionUsagePaged
 from .virtual_network_rule_paged import VirtualNetworkRulePaged
+from .job_agent_paged import JobAgentPaged
+from .job_credential_paged import JobCredentialPaged
+from .job_execution_paged import JobExecutionPaged
+from .job_paged import JobPaged
+from .job_step_paged import JobStepPaged
+from .job_target_group_paged import JobTargetGroupPaged
+from .job_version_paged import JobVersionPaged
 from .long_term_retention_backup_paged import LongTermRetentionBackupPaged
 from .managed_database_paged import ManagedDatabasePaged
 from .server_dns_alias_paged import ServerDnsAliasPaged
 from .restore_point_paged import RestorePointPaged
 from .database_operation_paged import DatabaseOperationPaged
 from .elastic_pool_operation_paged import ElasticPoolOperationPaged
+from .vulnerability_assessment_scan_record_paged import VulnerabilityAssessmentScanRecordPaged
 from .instance_failover_group_paged import InstanceFailoverGroupPaged
 from .sql_management_client_enums import (
     CheckNameAvailabilityReason,
@@ -324,6 +374,15 @@
     SyncDirection,
     SyncMemberState,
     VirtualNetworkRuleState,
+    JobAgentState,
+    JobExecutionLifecycle,
+    ProvisioningState,
+    JobTargetType,
+    JobScheduleType,
+    JobStepActionType,
+    JobStepActionSource,
+    JobStepOutputType,
+    JobTargetGroupMembershipType,
     ManagedDatabaseStatus,
     CatalogCollationType,
     ManagedDatabaseCreateMode,
@@ -342,6 +401,8 @@
     DatabaseReadScale,
     ElasticPoolState,
     ElasticPoolLicenseType,
+    VulnerabilityAssessmentScanTriggerType,
+    VulnerabilityAssessmentScanState,
     InstanceFailoverGroupReplicationRole,
     LongTermRetentionDatabaseState,
     CapabilityGroup,
@@ -419,6 +480,24 @@
     'SyncMember',
     'SubscriptionUsage',
     'VirtualNetworkRule',
+    'DatabaseVulnerabilityAssessmentRuleBaselineItem',
+    'DatabaseVulnerabilityAssessmentRuleBaseline',
+    'VulnerabilityAssessmentRecurringScansProperties',
+    'DatabaseVulnerabilityAssessment',
+    'JobAgent',
+    'JobAgentUpdate',
+    'JobCredential',
+    'JobExecutionTarget',
+    'JobExecution',
+    'JobSchedule',
+    'Job',
+    'JobStepAction',
+    'JobStepOutput',
+    'JobStepExecutionOptions',
+    'JobStep',
+    'JobTarget',
+    'JobTargetGroup',
+    'JobVersion',
     'LongTermRetentionBackup',
     'BackupLongTermRetentionPolicy',
     'CompleteDatabaseRestoreDefinition',
@@ -455,12 +534,15 @@
     'ElasticPoolPerDatabaseSettings',
     'ElasticPool',
     'ElasticPoolUpdate',
+    'VulnerabilityAssessmentScanError',
+    'VulnerabilityAssessmentScanRecord',
+    'DatabaseVulnerabilityAssessmentScansExport',
     'InstanceFailoverGroupReadWriteEndpoint',
     'InstanceFailoverGroupReadOnlyEndpoint',
     'PartnerRegionInfo',
     'ManagedInstancePairInfo',
     'InstanceFailoverGroup',
-    'ShortTermRetentionPolicy',
+    'BackupShortTermRetentionPolicy',
     'RecoverableDatabasePaged',
     'RestorableDroppedDatabasePaged',
     'ServerPaged',
@@ -497,12 +579,20 @@
     'SyncMemberPaged',
     'SubscriptionUsagePaged',
     'VirtualNetworkRulePaged',
+    'JobAgentPaged',
+    'JobCredentialPaged',
+    'JobExecutionPaged',
+    'JobPaged',
+    'JobStepPaged',
+    'JobTargetGroupPaged',
+    'JobVersionPaged',
     'LongTermRetentionBackupPaged',
     'ManagedDatabasePaged',
     'ServerDnsAliasPaged',
     'RestorePointPaged',
     'DatabaseOperationPaged',
     'ElasticPoolOperationPaged',
+    'VulnerabilityAssessmentScanRecordPaged',
     'InstanceFailoverGroupPaged',
     'CheckNameAvailabilityReason',
     'ServerConnectionType',
@@ -547,6 +637,15 @@
     'SyncDirection',
     'SyncMemberState',
     'VirtualNetworkRuleState',
+    'JobAgentState',
+    'JobExecutionLifecycle',
+    'ProvisioningState',
+    'JobTargetType',
+    'JobScheduleType',
+    'JobStepActionType',
+    'JobStepActionSource',
+    'JobStepOutputType',
+    'JobTargetGroupMembershipType',
     'ManagedDatabaseStatus',
     'CatalogCollationType',
     'ManagedDatabaseCreateMode',
@@ -565,6 +664,8 @@
     'DatabaseReadScale',
     'ElasticPoolState',
     'ElasticPoolLicenseType',
+    'VulnerabilityAssessmentScanTriggerType',
+    'VulnerabilityAssessmentScanState',
     'InstanceFailoverGroupReplicationRole',
     'LongTermRetentionDatabaseState',
     'CapabilityGroup',

azure-mgmt-sql/azure/mgmt/sql/models/backup_long_term_retention_policy_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class BackupLongTermRetentionPolicy(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/short_term_retention_policy.py → azure-mgmt-sql/azure/mgmt/sql/models/backup_short_term_retention_policy.py

@@ -12,8 +12,8 @@
 from .proxy_resource import ProxyResource
 
 
-class ShortTermRetentionPolicy(ProxyResource):
-    """A short term retention policy resource.
+class BackupShortTermRetentionPolicy(ProxyResource):
+    """A short term retention policy.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -43,5 +43,5 @@ class ShortTermRetentionPolicy(ProxyResource):
     }
 
     def __init__(self, **kwargs):
-        super(ShortTermRetentionPolicy, self).__init__(**kwargs)
+        super(BackupShortTermRetentionPolicy, self).__init__(**kwargs)
         self.retention_days = kwargs.get('retention_days', None)

azure-mgmt-sql/azure/mgmt/sql/models/short_term_retention_policy_py3.py → azure-mgmt-sql/azure/mgmt/sql/models/backup_short_term_retention_policy_py3.py

@@ -9,11 +9,11 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
-class ShortTermRetentionPolicy(ProxyResource):
-    """A short term retention policy resource.
+class BackupShortTermRetentionPolicy(ProxyResource):
+    """A short term retention policy.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -43,5 +43,5 @@ class ShortTermRetentionPolicy(ProxyResource):
     }
 
     def __init__(self, *, retention_days: int=None, **kwargs) -> None:
-        super(ShortTermRetentionPolicy, self).__init__(**kwargs)
+        super(BackupShortTermRetentionPolicy, self).__init__(**kwargs)
         self.retention_days = retention_days

azure-mgmt-sql/azure/mgmt/sql/models/data_masking_policy_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DataMaskingPolicy(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/data_masking_rule_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DataMaskingRule(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_automatic_tuning_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DatabaseAutomaticTuning(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_blob_auditing_policy_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DatabaseBlobAuditingPolicy(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_operation_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DatabaseOperation(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class Database(TrackedResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_security_alert_policy_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class DatabaseSecurityAlertPolicy(ProxyResource):

azure-mgmt-sql/azure/mgmt/sql/models/database_vulnerability_assessment.py

@@ -0,0 +1,58 @@
+# 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 .proxy_resource import ProxyResource
+
+
+class DatabaseVulnerabilityAssessment(ProxyResource):
+    """A database vulnerability assessment.
+
+    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
+    :param storage_container_path: A blob storage container path to hold the
+     scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).
+    :type storage_container_path: str
+    :param storage_container_sas_key: A shared access signature (SAS Key) that
+     has write access to the blob container specified in 'storageContainerPath'
+     parameter.
+    :type storage_container_sas_key: str
+    :param recurring_scans: The recurring scans settings
+    :type recurring_scans:
+     ~azure.mgmt.sql.models.VulnerabilityAssessmentRecurringScansProperties
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'storage_container_path': {'key': 'properties.storageContainerPath', 'type': 'str'},
+        'storage_container_sas_key': {'key': 'properties.storageContainerSasKey', 'type': 'str'},
+        'recurring_scans': {'key': 'properties.recurringScans', 'type': 'VulnerabilityAssessmentRecurringScansProperties'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DatabaseVulnerabilityAssessment, self).__init__(**kwargs)
+        self.storage_container_path = kwargs.get('storage_container_path', None)
+        self.storage_container_sas_key = kwargs.get('storage_container_sas_key', None)
+        self.recurring_scans = kwargs.get('recurring_scans', None)