[SQL] 'az sql db str-policy set/show': Add Set and Show ShortTermRetentionPolicy

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

@@ -185,6 +185,27 @@
     text: az sql db list-editions -l westus --service-objective P1 --show-details max-size
 """
 
+helps['sql db str-policy'] = """
+type: group
+short-summary: Manage SQL database short term retention policy.
+"""
+
+helps['sql db str-policy set'] = """
+type: command
+short-summary: Update short term retention settings for a live database.
+examples:
+  - name: Set short term retention for a live database.
+    text: az sql db str-policy set -g mygroup -s myserver -n mydb --retention-days retentionindays --diffbackup-hours diffbackuphours
+"""
+
+helps['sql db str-policy show'] = """
+type: command
+short-summary: Show the short term retention policy for a live database.
+examples:
+  - name: Show short term retention policy for a live database.
+    text: az sql db str-policy show -g mygroup -s myserver -n mydb
+"""
+
 helps['sql db ltr-policy'] = """
 type: group
 short-summary: Manage SQL database long term retention policy.

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

@@ -1085,6 +1085,30 @@ def _configure_security_policy_storage_params(arg_ctx):
                    required=False,
                    arg_type=backup_storage_redundancy_param_type)
 
+    ###############################################
+    #                sql db str                   #
+    ###############################################
+    with self.argument_context('sql db str-policy set') as c:
+        create_args_for_complex_type(
+            c, 'parameters', Database, [
+                'retention_days',
+                'diffbackup_hours'
+            ])
+
+        c.argument(
+            'retention_days',
+            options_list=['--retention-days'],
+            required=True,
+            help='New backup short term retention policy retention in days.'
+            'Valid retention days for live database of (DTU) Basic can be 1-7 days; Rest models can be 1-35 days.')
+
+        c.argument(
+            'diffbackup_hours',
+            options_list=['--diffbackup-hours'],
+            required=True,
+            help='New backup short term retention policy differential backup interval in hours.'
+            'Valid differential backup interval for live database can be 12 or 24 hours.')
+
     ###############################################
     #                sql dw                       #
     ###############################################

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

@@ -176,6 +176,10 @@ def get_sql_managed_databases_operations(cli_ctx, _):
     return get_sql_management_client(cli_ctx).managed_databases
 
 
+def get_sql_backup_short_term_retention_policies_operations(cli_ctx, _):
+    return get_sql_management_client(cli_ctx).backup_short_term_retention_policies
+
+
 def get_sql_managed_backup_short_term_retention_policies_operations(cli_ctx, _):
     return get_sql_management_client(cli_ctx).managed_backup_short_term_retention_policies
 

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

@@ -24,6 +24,7 @@
 )
 
 from ._util import (
+    get_sql_backup_short_term_retention_policies_operations,
     get_sql_server_azure_ad_administrators_operations,
     get_sql_capabilities_operations,
     get_sql_databases_operations,
@@ -337,6 +338,18 @@ def load_command_table(self, _):
             supports_no_wait=True)
         g.wait_command('wait')
 
+    backup_short_term_retention_policies_operations = CliCommandType(
+        operations_tmpl='azure.mgmt.sql.operations#BackupShortTermRetentionPoliciesOperations.{}',
+        client_factory=get_sql_backup_short_term_retention_policies_operations)
+
+    with self.command_group('sql db str-policy',
+                            backup_short_term_retention_policies_operations,
+                            client_factory=get_sql_backup_short_term_retention_policies_operations,
+                            is_preview=True) as g:
+
+        g.custom_command('set', 'update_short_term_retention', supports_no_wait=True)
+        g.custom_show_command('show', 'get_short_term_retention')
+
     database_sensitivity_labels_operations = CliCommandType(
         operations_tmpl='azure.mgmt.sql.operations#SensitivityLabelsOperations.{}',
         client_factory=get_sql_database_sensitivity_labels_operations)

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

@@ -38,7 +38,7 @@
     PartnerRegionInfo,
     InstanceFailoverGroupReadOnlyEndpoint,
     InstanceFailoverGroupReadWriteEndpoint,
-    ServerPublicNetworkAccess,
+    ServerNetworkAccessFlag,
     ServerInfo,
     EncryptionProtector,
     ManagedInstanceEncryptionProtector,
@@ -2698,6 +2698,44 @@ def update_long_term_retention(
     return policy
 
 
+def update_short_term_retention(
+        client,
+        database_name,
+        server_name,
+        resource_group_name,
+        retention_days,
+        diffbackup_hours):
+    '''
+    Updates short term retention for live database
+    '''
+
+    policy = client.create_or_update(
+        database_name=database_name,
+        server_name=server_name,
+        resource_group_name=resource_group_name,
+        retention_days=retention_days,
+        diff_backup_interval_in_hours=diffbackup_hours)
+
+    return policy
+
+
+def get_short_term_retention(
+        client,
+        database_name,
+        server_name,
+        resource_group_name):
+    '''
+    Gets short term retention for live database
+    '''
+
+    policy = client.get(
+        database_name=database_name,
+        server_name=server_name,
+        resource_group_name=resource_group_name)
+
+    return policy
+
+
 def _list_by_database_long_term_retention_backups(
         client,
         location_name,
@@ -3436,8 +3474,8 @@ def server_create(
 
     if enable_public_network is not None:
         kwargs['public_network_access'] = (
-            ServerPublicNetworkAccess.enabled if enable_public_network
-            else ServerPublicNetworkAccess.disabled)
+            ServerNetworkAccessFlag.enabled if enable_public_network
+            else ServerNetworkAccessFlag.disabled)
 
     kwargs['key_id'] = key_id
 
@@ -3534,8 +3572,8 @@ def server_update(
 
     if enable_public_network is not None:
         instance.public_network_access = (
-            ServerPublicNetworkAccess.enabled if enable_public_network
-            else ServerPublicNetworkAccess.disabled)
+            ServerNetworkAccessFlag.enabled if enable_public_network
+            else ServerNetworkAccessFlag.disabled)
 
     instance.primary_user_assigned_identity_id = (
         primary_user_assigned_identity_id or instance.primary_user_assigned_identity_id)