From be4709e94c905bcf5f8bc18579df937804727261 Mon Sep 17 00:00:00 2001 From: Carolyn Jackson Date: Thu, 29 Feb 2024 12:07:26 -0600 Subject: [PATCH] add missing stable changes for minimal tls version from https://github.com/Azure/azure-cli/pull/27322 --- .../azext_cosmosdb_preview/_params.py | 3 ++- .../azext_cosmosdb_preview/custom.py | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py b/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py index 86adf89643c..cf16f784dc7 100644 --- a/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py +++ b/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py @@ -29,7 +29,7 @@ CreatePhysicalPartitionIdListAction) from azext_cosmosdb_preview.vendored_sdks.azure_mgmt_cosmosdb.models import ( - ContinuousTier, DefaultPriorityLevel + ContinuousTier, DefaultPriorityLevel, MinimalTlsVersion ) from azure.cli.core.util import shell_safe_json_parse @@ -343,6 +343,7 @@ def load_arguments(self, _): c.argument('default_priority_level', arg_type=get_enum_type(DefaultPriorityLevel), help="Default Priority Level of Request if not specified.", is_preview=True) c.argument('enable_per_region_per_partition_autoscale', arg_type=get_three_state_flag(), help="Enable or disable PerRegionPerPartitionAutoscale.", is_preview=True) c.argument('enable_partition_merge', arg_type=get_three_state_flag(), help="Flag to enable partition merge on the account.") + c.argument('minimal_tls_version', arg_type=get_enum_type(MinimalTlsVersion), help="Indicates the minimum allowed TLS version") with self.argument_context('cosmosdb update') as c: c.argument('key_uri', help="The URI of the key vault", is_preview=True) diff --git a/src/cosmosdb-preview/azext_cosmosdb_preview/custom.py b/src/cosmosdb-preview/azext_cosmosdb_preview/custom.py index ca5fdc7a672..4699318fb2a 100644 --- a/src/cosmosdb-preview/azext_cosmosdb_preview/custom.py +++ b/src/cosmosdb-preview/azext_cosmosdb_preview/custom.py @@ -781,7 +781,8 @@ def cli_cosmosdb_create(cmd, enable_priority_based_execution=None, default_priority_level=None, enable_per_region_per_partition_autoscale=None, - enable_partition_merge=None): + enable_partition_merge=None, + minimal_tls_version=None): """Create a new Azure Cosmos DB database account.""" from azure.cli.core.commands.client_factory import get_mgmt_service_client @@ -839,7 +840,8 @@ def cli_cosmosdb_create(cmd, enable_priority_based_execution=enable_priority_based_execution, default_priority_level=default_priority_level, enable_per_region_per_partition_autoscale=enable_per_region_per_partition_autoscale, - enable_partition_merge=enable_partition_merge) + enable_partition_merge=enable_partition_merge + minimal_tls_version=minimal_tls_version) # pylint: disable=too-many-branches @@ -875,7 +877,8 @@ def cli_cosmosdb_update(client, enable_priority_based_execution=None, default_priority_level=None, enable_per_region_per_partition_autoscale=None, - enable_partition_merge=None): + enable_partition_merge=None, + minimal_tls_version=None): """Update an existing Azure Cosmos DB database account. """ existing = client.get(resource_group_name, account_name) @@ -966,7 +969,8 @@ def cli_cosmosdb_update(client, enable_priority_based_execution=enable_priority_based_execution, default_priority_level=default_priority_level, enable_per_region_per_partition_autoscale=enable_per_region_per_partition_autoscale, - enable_partition_merge=enable_partition_merge) + enable_partition_merge=enable_partition_merge, + minimal_tls_version=minimal_tls_version) async_docdb_update = client.begin_update(resource_group_name, account_name, params) docdb_account = async_docdb_update.result() @@ -1176,7 +1180,8 @@ def _create_database_account(client, default_priority_level=None, enable_per_region_per_partition_autoscale=None, disable_ttl=None, - enable_partition_merge=None): + enable_partition_merge=None, + minimal_tls_version=None): consistency_policy = None if default_consistency_level is not None: consistency_policy = ConsistencyPolicy(default_consistency_level=default_consistency_level, @@ -1315,7 +1320,8 @@ def _create_database_account(client, enable_priority_based_execution=enable_priority_based_execution, default_priority_level=default_priority_level, enable_per_region_per_partition_autoscale=enable_per_region_per_partition_autoscale, - enable_partition_merge=enable_partition_merge + enable_partition_merge=enable_partition_merge, + minimal_tls_version=minimal_tls_version ) async_docdb_create = client.begin_create_or_update(resource_group_name, account_name, params)