Fixed styling and error handling

Author: rambabu-yalla

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

@@ -1595,7 +1595,7 @@
 type: command
 short-summary: Create a server.
 long-summary: |
-    Create a new SQL server. The server can be configured with various security, networking, 
+    Create a new SQL server. The server can be configured with various security, networking,
     and identity management options including soft delete protection for disaster recovery.
 parameters:
   - name: --enable-soft-delete
@@ -1637,24 +1637,24 @@
 type: command
 short-summary: Restore a deleted SQL server.
 long-summary: |
-    Restore a deleted SQL server from a soft-deleted state. The server must have been deleted 
-    with soft delete enabled and must be within the retention period. The server will be restored 
+    Restore a deleted SQL server from a soft-deleted state. The server must have been deleted
+    with soft delete enabled and must be within the retention period. The server will be restored
     to the specified name in the same location where it was originally deleted.
 parameters:
   - name: --name -n
     short-summary: Name of the server to restore to.
     long-summary: |
-        The name for the restored server. This is typically the same name as the deleted server 
+        The name for the restored server. This is the same name as the deleted server
         you want to restore.
   - name: --resource-group -g
     short-summary: Name of the resource group.
     long-summary: |
-        The resource group where the server will be restored. This is typically the same 
+        The resource group where the server will be restored. This is the same
         resource group where the deleted server was originally located.
   - name: --location -l
     short-summary: Location where the deleted server was originally located.
     long-summary: |
-        Specifies the location where the deleted server was originally located. The restored 
+        Specifies the location where the deleted server was originally located. The restored
         server will be created in this same location.
 examples:
   - name: Restore a deleted server.
@@ -1845,7 +1845,7 @@
 type: command
 short-summary: Update a server.
 long-summary: |
-    Update an existing SQL server's configuration including security settings, networking options, 
+    Update an existing SQL server's configuration including security settings, networking options,
     identity management, and soft delete protection settings.
 parameters:
   - name: --enable-soft-delete
@@ -1861,12 +1861,12 @@
   - name: --enable-public-network -e
     short-summary: Update public network access to server.
     long-summary: |
-        Controls whether the server can be accessed from public networks. When false, only private 
+        Controls whether the server can be accessed from public networks. When false, only private
         endpoint connections are allowed.
   - name: --restrict-outbound-network-access
     short-summary: Update outbound network access restriction.
     long-summary: |
-        Controls whether the server can initiate outbound network connections. When enabled, 
+        Controls whether the server can initiate outbound network connections. When enabled,
         restricts outbound connections for enhanced security.
 examples:
   - name: Update a server password.

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

@@ -1912,16 +1912,15 @@ def _configure_security_policy_storage_params(arg_ctx):
         c.argument('federated_client_id',
                    options_list=['--federated-client-id', '--fid'],
                    help='The federated client id used in cross tenant CMK scenario.')
-        
+
         c.argument('enable_soft_delete',
-                   options_list=['--enable-soft-delete', '-esd'],
+                   options_list=['--enable-soft-delete'],
                    arg_type=get_three_state_flag(),
                    help='Set whether soft delete is enabled or not. When true,'
-                   'the soft delete is enabled for 7 days by default.',
-                   is_preview=True)
+                   'the soft delete is enabled for 7 days by default.')
 
         c.argument('soft_delete_retention_days',
-                   options_list=['--soft-delete-retention-days', '--sdrd'],
+                   options_list=['--soft-delete-retention-days'],
                    help='The number of days to retain soft deleted resources.',
                    validator=validate_soft_delete_parameters)
 

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

@@ -263,5 +263,6 @@ def get_sql_managed_database_ledger_digest_uploads_operations(cli_ctx, _):
 def get_sql_managed_database_move_operations(cli_ctx, _):
     return get_sql_management_client(cli_ctx).managed_database_move_operations
 
+
 def get_sql_deleted_servers_operations(cli_ctx, _):
     return get_sql_management_client(cli_ctx).deleted_servers

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

@@ -4,6 +4,10 @@
 # --------------------------------------------------------------------------------------------
 
 from azure.cli.core.util import CLIError
+from azure.cli.core.azclierror import (
+    RequiredArgumentMissingError,
+    InvalidArgumentValueError
+)
 
 # Important note: if cmd validator exists, then individual param validators will not be
 # executed. See C:\git\azure-cli\env\lib\site-packages\knack\invocation.py `def _validation`
@@ -148,28 +152,38 @@ def validate_managed_instance_storage_size(namespace):
 def validate_soft_delete_parameters(namespace):
     enable_soft_delete = getattr(namespace, 'enable_soft_delete', None)
     soft_delete_retention_days = getattr(namespace, 'soft_delete_retention_days', None)
-    
+
     # Check if soft_delete_retention_days is specified without enable_soft_delete
     if soft_delete_retention_days is not None and enable_soft_delete is None:
-        raise CLIError('incorrect usage: --soft-delete-retention-days can only be specified when --enable-soft-delete is also specified')
-    
+        raise RequiredArgumentMissingError(
+            'The --soft-delete-retention-days parameter requires --enable-soft-delete to be specified.',
+            'Please specify both --enable-soft-delete and --soft-delete-retention-days together.')
+
     # Validate soft_delete_retention_days value when specified
     if soft_delete_retention_days is not None:
         try:
             retention_days = int(soft_delete_retention_days)
             namespace.soft_delete_retention_days = retention_days
-        except (ValueError, TypeError):
-            raise CLIError('incorrect usage: --soft-delete-retention-days must be a valid integer')
-        
+        except (ValueError, TypeError) as exc:
+            raise InvalidArgumentValueError(
+                'The value for --soft-delete-retention-days must be a valid integer.') from exc
+
         # Validate range based on enable_soft_delete value
         if enable_soft_delete is True:
             # When enable_soft_delete is true, retention days must be 1-7
-            if not (1 <= retention_days <= 7):
-                raise CLIError('incorrect usage: --soft-delete-retention-days must be between 1 and 7 (inclusive) when --enable-soft-delete is true')
+            if not 1 <= retention_days <= 7:
+                raise InvalidArgumentValueError(
+                    'The --soft-delete-retention-days value must be between 1 and 7 (inclusive) '
+                    'when --enable-soft-delete is true.',
+                    'Please specify a value between 1 and 7 days.')
         elif enable_soft_delete is False:
             # When enable_soft_delete is false, retention days must be 0
             if retention_days != 0:
-                raise CLIError('incorrect usage: --soft-delete-retention-days must be 0 when --enable-soft-delete is false')
+                raise InvalidArgumentValueError(
+                    'The --soft-delete-retention-days value must be 0 when --enable-soft-delete is false.',
+                    'Please set --soft-delete-retention-days to 0 or remove it when disabling soft delete.')
         else:
             # This shouldn't happen since we check above, but for safety
-            raise CLIError('incorrect usage: --soft-delete-retention-days can only be specified when --enable-soft-delete is also specified')
+            raise RequiredArgumentMissingError(
+                'The --soft-delete-retention-days parameter requires --enable-soft-delete to be specified.',
+                'Please specify both --enable-soft-delete and --soft-delete-retention-days together.')

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

@@ -13,6 +13,11 @@
     CLIError,
     sdk_no_wait,
 )
+from azure.cli.core.azclierror import (
+    ResourceNotFoundError,
+    ValidationError,
+    AzCLIError
+)
 
 from azure.mgmt.sql.models import (
     AdministratorName,
@@ -183,15 +188,20 @@ def _is_serverless_slo(sku_name):
 
 def _check_server_exists(client, resource_group_name, server_name):
     '''
-    Checks if a server already exists and raises CLIError if it does.
-    Returns False if server doesn't exist (ResourceNotFound/NotFound), 
+    Checks if a server already exists and raises ValidationError if it does.
+    Returns False if server doesn't exist (ResourceNotFound/NotFound),
     raises the original exception for other errors.
     '''
     try:
         existing_server = client.get(resource_group_name, server_name)
         if existing_server:
-            raise CLIError('Server "{}" already exists in resource group "{}". '
-                          'Cannot restore to an existing server name.'.format(server_name, resource_group_name))
+            raise ValidationError(
+                f'Server "{server_name}" already exists in resource group "{resource_group_name}". '
+                'Cannot restore to an existing server name.',
+                'Please specify a different server name for the restore operation.')
+    except ValidationError:
+        # Re-raise ValidationError as-is
+        raise
     except Exception as ex:
         # If server doesn't exist, that's what we want - continue with restore
         if 'ResourceNotFound' not in str(ex) and 'NotFound' not in str(ex):
@@ -215,16 +225,17 @@ def _validate_deleted_server_exists(cmd, location, server_name):
     except Exception as ex:
         # If server doesn't exist in deleted servers, raise appropriate error
         if 'ResourceNotFound' in str(ex) or 'NotFound' in str(ex):
-            raise CLIError('No deleted server found with name "{}" in location "{}". '
-                          'Please verify the server was deleted with soft delete enabled and '
-                          'is within the retention period.'.format(server_name, location))
+            raise ResourceNotFoundError(
+                f'No deleted server found with name "{server_name}" in location "{location}".',
+                'Please verify the server was deleted with soft delete enabled '
+                'and is within the retention period.') from ex
         # Handle any other unexpected errors
-        raise CLIError('Failed to validate deleted server "{}": {}'.format(server_name, str(ex)))
+        raise AzCLIError(f'Failed to validate deleted server "{server_name}": {str(ex)}') from ex
 
     # This shouldn't be reached if the API call succeeds but returns None
-    raise CLIError('No deleted server found with name "{}" in location "{}". '
-                  'Please verify the server was deleted with soft delete enabled and '
-                  'is within the retention period.'.format(server_name, location))
+    raise ResourceNotFoundError(
+        f'No deleted server found with name "{server_name}" in location "{location}".',
+        'Please verify the server was deleted with soft delete enabled and is within the retention period.')
 
 
 def _get_default_server_version(location_capabilities):
@@ -4465,7 +4476,7 @@ def server_create(
         tenant_id=tenant_id)
 
     kwargs['create_mode'] = ServerCreateMode.NORMAL
-    
+
     if enable_soft_delete is not None:
         if soft_delete_retention_days is not None:
             kwargs['retention_days'] = soft_delete_retention_days
@@ -4501,11 +4512,11 @@ def server_restore(
 
     # Validate deleted server exists
     _validate_deleted_server_exists(cmd, location, server_name)
-    
+
     # Set required parameters for restore
     kwargs['location'] = location
     kwargs['create_mode'] = ServerCreateMode.RESTORE
-    
+
     logger.info('Attempting to restore server "%s" in location "%s"',
                 server_name, location)