[SQL] Bump sdk version

src/azure-cli/azure/cli/command_modules/sql/_format.py

@@ -244,16 +244,15 @@ def elastic_pool_transform(result):
     '''
     Transforms the json response for an elastic pool.
     '''
-    from azure.mgmt.sql.models import ElasticPoolEdition
 
     # Add properties in order to improve backwards compatibility with api-version 2014-04-01
     result.edition = result.sku.tier
     result.storageMb = result.max_size_bytes / 1024 / 1024
 
     is_dtu = result.sku.tier in (
-        ElasticPoolEdition.basic.value,
-        ElasticPoolEdition.standard.value,
-        ElasticPoolEdition.premium.value)
+        'Basic',
+        'Standard',
+        'Premium')
 
     result.dtu = result.sku.capacity if is_dtu else None
     result.database_dtu_min = int(result.per_database_settings.min_capacity) if is_dtu else None

src/azure-cli/azure/cli/command_modules/sql/_params.py

@@ -28,7 +28,6 @@
     ElasticPoolLicenseType,
     SampleName,
     SecurityAlertPolicyState,
-    SecurityAlertPolicyEmailAccountAdmins,
     ServerConnectionType,
     ServerKeyType,
     StorageKeyType,
@@ -940,8 +939,7 @@ def _configure_security_policy_storage_params(arg_ctx):
         c.argument('email_account_admins',
                    arg_group=notification_arg_group,
                    options_list=['--email-account-admins'],
-                   help='Whether the alert is sent to the account administrators.',
-                   arg_type=get_enum_type(SecurityAlertPolicyEmailAccountAdmins))
+                   help='Whether the alert is sent to the account administrators.')
 
         # TODO: use server default
 

src/azure-cli/azure/cli/command_modules/sql/_util.py

@@ -53,7 +53,7 @@ def get_sql_database_sensitivity_labels_operations(cli_ctx, _):
 
 
 def get_sql_database_threat_detection_policies_operations(cli_ctx, _):
-    return get_sql_management_client(cli_ctx).database_threat_detection_policies
+    return get_sql_management_client(cli_ctx).database_security_alert_policies
 
 
 def get_sql_database_transparent_data_encryption_activities_operations(cli_ctx, _):
@@ -201,7 +201,7 @@ def get_sql_managed_database_long_term_retention_backups_operations(cli_ctx, _):
 
 
 def get_sql_database_long_term_retention_policies_operations(cli_ctx, _):
-    return get_sql_management_client(cli_ctx).backup_long_term_retention_policies
+    return get_sql_management_client(cli_ctx).long_term_retention_policies
 
 
 def get_sql_database_long_term_retention_backups_operations(cli_ctx, _):

src/azure-cli/azure/cli/command_modules/sql/commands.py

@@ -290,7 +290,7 @@ def load_command_table(self, _):
         g.custom_wait_command('wait', 'server_ms_support_audit_policy_get')
 
     database_long_term_retention_policies_operations = CliCommandType(
-        operations_tmpl='azure.mgmt.sql.operations#BackupLongTermRetentionPoliciesOperations.{}',
+        operations_tmpl='azure.mgmt.sql.operations#LongTermRetentionPoliciesOperations.{}',
         client_factory=get_sql_database_long_term_retention_policies_operations)
 
     with self.command_group('sql db ltr-policy',
@@ -346,7 +346,7 @@ def load_command_table(self, _):
         g.command('disable', 'disable_recommendation')
 
     database_threat_detection_policies_operations = CliCommandType(
-        operations_tmpl='azure.mgmt.sql.operations#DatabaseThreatDetectionPoliciesOperations.{}',
+        operations_tmpl='azure.mgmt.sql.operations#DatabaseSecurityAlertPoliciesOperations.{}',
         client_factory=get_sql_database_threat_detection_policies_operations)
 
     with self.command_group('sql db threat-policy',

src/azure-cli/azure/cli/command_modules/sql/custom.py

@@ -25,7 +25,7 @@
     IdentityType,
     PartnerInfo,
     PerformanceLevelUnit,
-    ReplicationRole,
+    FailoverGroupReplicationRole,
     ResourceIdentity,
     SecurityAlertPolicyState,
     SensitivityLabel,
@@ -41,7 +41,8 @@
     InstanceFailoverGroupReadOnlyEndpoint,
     InstanceFailoverGroupReadWriteEndpoint,
     ServerPublicNetworkAccess,
-    ServerInfo
+    ServerInfo,
+    EncryptionProtector
 )
 
 from azure.cli.core.profiles import ResourceType
@@ -1135,7 +1136,7 @@ def db_failover(
 
     # If a replica is primary, then it has 1 or more links (to its secondaries).
     # If a replica is secondary, then it has exactly 1 link (to its primary).
-    primary_link = next((link for link in links if link.partner_role == ReplicationRole.primary), None)
+    primary_link = next((link for link in links if link.partner_role == FailoverGroupReplicationRole.primary), None)
     if not primary_link:
         # No link to a primary, so this must already be a primary. Do nothing.
         return
@@ -2794,10 +2795,10 @@ def db_threat_detection_policy_update(
         instance.retention_days = retention_days
 
     if email_addresses:
-        instance.email_addresses = ";".join(email_addresses)
+        instance.email_addresses = email_addresses
 
     if disabled_alerts:
-        instance.disabled_alerts = ";".join(disabled_alerts)
+        instance.disabled_alerts = disabled_alerts
 
     if email_account_admins:
         instance.email_account_admins = email_account_admins
@@ -3482,11 +3483,8 @@ def server_key_create(
         resource_group_name=resource_group_name,
         server_name=server_name,
         key_name=key_name,
-        parameters=ServerKey(
-            server_key_type=ServerKeyType.azure_key_vault.value,
-            uri=kid
-        )
-    )
+        server_key_type='AzureKeyVault',
+        uri=kid)
 
 
 def server_key_get(
@@ -3606,9 +3604,10 @@ def encryption_protector_update(
     return client.create_or_update(
         resource_group_name=resource_group_name,
         server_name=server_name,
-        server_key_type=server_key_type,
-        server_key_name=key_name
-    )
+        encryption_protector_name='Current',
+        parameters=EncryptionProtector(server_key_type=server_key_type,
+        server_key_name=key_name,
+        auto_rotation_enabled=False))
 
 #####
 #           sql server aad-only