Fix parameter naming: enable_soft_deletion instead of enabled_soft_deletion

- Updated _params.py to use enable_soft_deletion parameter name
- Updated custom.py function signatures and implementations
- Updated _help.py examples to use --enable-soft-deletion
- Updated test file to use correct CLI option
- Removed unnecessary linter exclusions for soft delete parameters
- Kept required linter exclusions for list commands (no_ids_for_list_commands)

Author: mohhef

linter_exclusions.yml

@@ -3505,15 +3505,6 @@ neon postgres project:
   rule_exclusions:
   - require_wait_command_if_no_wait
 
-cosmosdb update:
-  parameters:
-    soft_deletion_retention_period_in_minutes:
-      rule_exclusions:
-      - unrecognized_help_parameter
-    min_minutes_before_permanent_deletion_allowed:
-      rule_exclusions:
-      - unrecognized_help_parameter
-
 cosmosdb sql softdeleted-database list:
   rule_exclusions:
   - no_ids_for_list_commands

src/cosmosdb-preview/azext_cosmosdb_preview/_help.py

@@ -564,25 +564,13 @@
         Default:        single region account in the location of the specified resource group.
         Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
         Multiple locations can be specified by using more than one `--locations` argument.
-  - name: --enabled-soft-deletion
-    short-summary: Enable or disable soft deletion on the account
-    long-summary: |
-        When enabled, deleted databases and containers are retained for the configured retention period and can be recovered.
-  - name: --sd-retention
-    short-summary: Soft deletion retention period in minutes
-    long-summary: |
-        The retention period for soft-deleted resources. Must be at least equal to min-minutes-before-permanent-deletion-allowed.
-  - name: --min-purge-minutes
-    short-summary: Minimum minutes before permanent deletion is allowed
-    long-summary: |
-        The minimum time that must pass after soft-deletion before a resource can be permanently deleted (purged).
 examples:
   - name: Update an Azure Cosmos DB database account. (autogenerated)
     text: az cosmosdb update --capabilities EnableGremlin --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
   - name: Update an Azure Cosmos DB database account to enable materialized views.
     text: az cosmosdb update --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --enable-materialized-views true
   - name: Enable soft deletion with 1440 minutes (24 hours) retention.
-    text: az cosmosdb update --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --enabled-soft-deletion true --sd-retention 1440 --min-purge-minutes 60
+    text: az cosmosdb update --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --enable-soft-deletion true --sd-retention 1440 --min-purge-minutes 60
 """
 
 # restore account

src/cosmosdb-preview/azext_cosmosdb_preview/_params.py

@@ -486,6 +486,9 @@ def load_arguments(self, _):
 
     with self.argument_context('cosmosdb update') as c:
         c.argument('key_uri', help="The URI of the key vault", is_preview=True)
+        c.argument('enable_soft_deletion', arg_type=get_three_state_flag(), help="Flag to enable or disable soft deletion on the account.", is_preview=True, arg_group='Soft Delete')
+        c.argument('soft_deletion_retention_period_in_minutes', options_list=['--soft-deletion-retention-period-in-minutes', '--sd-retention'], type=int, help="Soft deletion retention period in minutes. Must be at least equal to min_minutes_before_permanent_deletion_allowed.", is_preview=True, arg_group='Soft Delete')
+        c.argument('min_minutes_before_permanent_deletion_allowed', options_list=['--min-minutes-before-permanent-deletion-allowed', '--min-purge-minutes'], type=int, help="Minimum minutes before permanent deletion is allowed for soft-deleted resources.", is_preview=True, arg_group='Soft Delete')
 
     with self.argument_context('cosmosdb restore') as c:
         c.argument('target_database_account_name', options_list=['--target-database-account-name', '-n'], help='Name of the new target Cosmos DB database account after the restore')

src/cosmosdb-preview/azext_cosmosdb_preview/custom.py

@@ -956,7 +956,7 @@ def cli_cosmosdb_update(client,
                         enable_prpp_autoscale=None,
                         enable_partition_merge=None,
                         capacity_mode=None,
-                        enabled_soft_deletion=None,
+                        enable_soft_deletion=None,
                         soft_deletion_retention_period_in_minutes=None,
                         min_minutes_before_permanent_deletion_allowed=None):
     """Update an existing Azure Cosmos DB database account. """
@@ -1026,12 +1026,12 @@ def cli_cosmosdb_update(client,
         analytical_storage_configuration.schema_type = analytical_storage_schema_type
 
     soft_delete_configuration = None
-    if enabled_soft_deletion is not None or \
+    if enable_soft_deletion is not None or \
             soft_deletion_retention_period_in_minutes is not None or \
             min_minutes_before_permanent_deletion_allowed is not None:
         from azext_cosmosdb_preview.vendored_sdks.azure_mgmt_cosmosdb.models import SoftDeleteConfiguration
         soft_delete_configuration = SoftDeleteConfiguration(
-            enabled_soft_deletion=enabled_soft_deletion,
+            enable_soft_deletion=enable_soft_deletion,
             soft_deletion_retention_period_in_minutes=soft_deletion_retention_period_in_minutes,
             min_minutes_before_permanent_deletion_allowed=min_minutes_before_permanent_deletion_allowed
         )
@@ -1216,7 +1216,7 @@ def _create_database_account(client,
                              disable_ttl=None,
                              enable_partition_merge=None,
                              capacity_mode=None,
-                             enabled_soft_deletion=None,
+                             enable_soft_deletion=None,
                              soft_deletion_retention_period_in_minutes=None,
                              min_minutes_before_permanent_deletion_allowed=None):
     consistency_policy = None
@@ -1299,12 +1299,12 @@ def _create_database_account(client,
         analytical_storage_configuration.schema_type = analytical_storage_schema_type
 
     soft_delete_configuration = None
-    if enabled_soft_deletion is not None or \
+    if enable_soft_deletion is not None or \
             soft_deletion_retention_period_in_minutes is not None or \
             min_minutes_before_permanent_deletion_allowed is not None:
         from azext_cosmosdb_preview.vendored_sdks.azure_mgmt_cosmosdb.models import SoftDeleteConfiguration
         soft_delete_configuration = SoftDeleteConfiguration(
-            enabled_soft_deletion=enabled_soft_deletion,
+            enabled_soft_deletion=enable_soft_deletion,
             soft_deletion_retention_period_in_minutes=soft_deletion_retention_period_in_minutes,
             min_minutes_before_permanent_deletion_allowed=min_minutes_before_permanent_deletion_allowed
         )

src/cosmosdb-preview/azext_cosmosdb_preview/tests/latest/test_cosmosdb_softdelete_scenario.py

@@ -46,7 +46,7 @@ def _create_account_with_soft_delete(self, account_name, resource_group, locatio
         logger.info("Enabling soft delete on account")
         self.cmd(
             'az cosmosdb update -n {acc} -g {rg} '
-            '--enabled-soft-deletion true '
+            '--enable-soft-deletion true '
             '--sd-retention 0 '
             '--min-purge-minutes 0'
         )