From 4965ee027b81ed53c3b9f654e2e8723f8b4da1ad Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Tue, 9 May 2023 18:50:12 -0500 Subject: [PATCH 1/9] Merge branch 'Az.CosmosDB-preview' of https://github.com/SrinikhilReddy/azure-powershell into features/users/nanarava/enablepmerge --- src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 | 8 ++++++++ .../CosmosDBAccount/NewOrUpdateAzCosmosDBAccount.cs | 3 +++ .../CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs | 7 +++++++ src/CosmosDB/CosmosDB/Helpers/Constants.cs | 1 + .../Models/DatabaseAccount/PSDatabaseAccountGetResults.cs | 5 +++++ 5 files changed, 24 insertions(+) diff --git a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 index 73d12867bb92..e4fdf865386b 100644 --- a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 +++ b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 @@ -72,6 +72,14 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypassResourceIds.Count 1 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 + Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 0 + + $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 1 + Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 1 + + $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 0 + Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 0 + $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -BackupStorageRedundancy "Geo" Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 diff --git a/src/CosmosDB/CosmosDB/CosmosDBAccount/NewOrUpdateAzCosmosDBAccount.cs b/src/CosmosDB/CosmosDB/CosmosDBAccount/NewOrUpdateAzCosmosDBAccount.cs index 726735bc80d0..809fe2a2eabf 100644 --- a/src/CosmosDB/CosmosDB/CosmosDBAccount/NewOrUpdateAzCosmosDBAccount.cs +++ b/src/CosmosDB/CosmosDB/CosmosDBAccount/NewOrUpdateAzCosmosDBAccount.cs @@ -70,6 +70,9 @@ public class NewOrUpdateAzCosmosDBAccount : AzureCosmosDBCmdletBase [Parameter(Mandatory = false, HelpMessage = Constants.EnableAnalyticalStorageHelpMessage)] public bool? EnableAnalyticalStorage { get; set; } + [Parameter(Mandatory = false, HelpMessage = Constants.EnablePartitionMergeHelpMessage)] + public bool? EnablePartitionMerge { get; set; } + [Parameter(Mandatory = false, HelpMessage = Constants.AsJobHelpMessage)] public SwitchParameter AsJob { get; set; } diff --git a/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs b/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs index 9f991aaa2e95..a284e61001b8 100644 --- a/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs +++ b/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs @@ -50,6 +50,9 @@ public class UpdateAzCosmosDBAccount : NewOrUpdateAzCosmosDBAccount [Parameter(Mandatory = false, HelpMessage = Constants.DisableKeyBasedMetadataWriteAccessHelpMessage)] public bool? DisableKeyBasedMetadataWriteAccess { get; set; } + [Parameter(Mandatory = false, HelpMessage = Constants.EnablePartitionMergeHelpMessage)] + public bool? EnableParitionMerge { get; set; } + public override void ExecuteCmdlet() { if (!ParameterSetName.Equals(NameParameterSet, StringComparison.Ordinal)) @@ -98,6 +101,10 @@ public override void ExecuteCmdlet() { databaseAccountUpdateParameters.EnableAnalyticalStorage = EnableAnalyticalStorage; } + if (EnableParitionMerge != null) + { + databaseAccountUpdateParameters.EnablePartitionMerge = EnableParitionMerge; + } if (NetworkAclBypass != null) { databaseAccountUpdateParameters.NetworkAclBypass = diff --git a/src/CosmosDB/CosmosDB/Helpers/Constants.cs b/src/CosmosDB/CosmosDB/Helpers/Constants.cs index a6901e87b3c4..216117ef7802 100644 --- a/src/CosmosDB/CosmosDB/Helpers/Constants.cs +++ b/src/CosmosDB/CosmosDB/Helpers/Constants.cs @@ -58,6 +58,7 @@ internal static class Constants public const string NetworkAclBypassResourceIdHelpMessage = "List of Resource Ids to allow Network Acl Bypass for Synapse Link."; public const string DatabaseResourceIdHelpMessage = "ResourceId of the database."; public const string AnalyticalStorageSchemaTypeHelpMessage = "The schema type for analytical storage. Valid values include: 'WellDefined' and 'FullFidelity'."; + public const string EnablePartitionMergeHelpMessage = "Enables partition merge feature on the Cosmos DB database account. Accepted values: false, true"; //Restore specific help messages public const string IsRestoreRequestHelpMessage = "Indicates that the new Cosmos DB account request is a restore request."; diff --git a/src/CosmosDB/CosmosDB/Models/DatabaseAccount/PSDatabaseAccountGetResults.cs b/src/CosmosDB/CosmosDB/Models/DatabaseAccount/PSDatabaseAccountGetResults.cs index 35951b6bcf01..0f2112de6250 100644 --- a/src/CosmosDB/CosmosDB/Models/DatabaseAccount/PSDatabaseAccountGetResults.cs +++ b/src/CosmosDB/CosmosDB/Models/DatabaseAccount/PSDatabaseAccountGetResults.cs @@ -65,6 +65,7 @@ public PSDatabaseAccountGetResults(DatabaseAccountGetResults databaseAccountGetR RestoreParameters = new PSRestoreParameters(databaseAccountGetResults.RestoreParameters); CreateMode = databaseAccountGetResults.CreateMode; AnalyticalStorageConfiguration = new PSAnalyticalStorageConfiguration(databaseAccountGetResults.AnalyticalStorageConfiguration); + EnablePartitionMerge = databaseAccountGetResults.EnablePartitionMerge; } // @@ -189,6 +190,10 @@ public PSDatabaseAccountGetResults(DatabaseAccountGetResults databaseAccountGetR public bool? EnableAnalyticalStorage { get; set; } // // Summary: + // Gets or sets flag to indicate whether Partition Merge is enabled. + public bool? EnablePartitionMerge { get; set; } + // + // Summary: // Gets or sets flag to indicate to allow Network Acl Bypass. public NetworkAclBypass? NetworkAclBypass { get; set; } // From 71505f30c8b2576a870c0a259faeaac2dd402702 Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Tue, 9 May 2023 18:54:57 -0500 Subject: [PATCH 2/9] CosmosDB: Adds changes to handle enabling partition merge on CosmosDB account. --- src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 | 6 +++--- .../CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 index e4fdf865386b..382b8527381e 100644 --- a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 +++ b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 @@ -72,13 +72,13 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypassResourceIds.Count 1 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 - Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 0 + Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 1 - Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 1 + Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 1 $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 0 - Assert-AreEqual $updatedCosmosDBAccount.EnableParitionMerge 0 + Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -BackupStorageRedundancy "Geo" diff --git a/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs b/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs index a284e61001b8..52d10e04fe41 100644 --- a/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs +++ b/src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs @@ -50,9 +50,6 @@ public class UpdateAzCosmosDBAccount : NewOrUpdateAzCosmosDBAccount [Parameter(Mandatory = false, HelpMessage = Constants.DisableKeyBasedMetadataWriteAccessHelpMessage)] public bool? DisableKeyBasedMetadataWriteAccess { get; set; } - [Parameter(Mandatory = false, HelpMessage = Constants.EnablePartitionMergeHelpMessage)] - public bool? EnableParitionMerge { get; set; } - public override void ExecuteCmdlet() { if (!ParameterSetName.Equals(NameParameterSet, StringComparison.Ordinal)) @@ -101,9 +98,9 @@ public override void ExecuteCmdlet() { databaseAccountUpdateParameters.EnableAnalyticalStorage = EnableAnalyticalStorage; } - if (EnableParitionMerge != null) + if (EnablePartitionMerge != null) { - databaseAccountUpdateParameters.EnablePartitionMerge = EnableParitionMerge; + databaseAccountUpdateParameters.EnablePartitionMerge = EnablePartitionMerge; } if (NetworkAclBypass != null) { From fee3fbd202e36a1e7cd49cbf8cdff4e4b73f3fed Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Tue, 9 May 2023 22:08:34 -0500 Subject: [PATCH 3/9] CosmosDB: Adds changes to handle enabling partition merge on CosmosDB account. --- src/CosmosDB/CosmosDB/ChangeLog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md index 17859928c831..8de6723ff308 100644 --- a/src/CosmosDB/CosmosDB/ChangeLog.md +++ b/src/CosmosDB/CosmosDB/ChangeLog.md @@ -20,6 +20,8 @@ ## Upcoming Release * Added support for Continuous 7 Days backup mode. +* New-AzCosmosDBAccount cmdlet was updated with new parameter: EnablePartitionMerge. +* Update-AzCosmosDBAccount cmdlet was updated with: EnablePartitionMerge. ## Version 1.10.1 * Updated Azure.Core to 1.31.0. From 5645d5562c552ab3132be6f20ea76c98ab30aaf0 Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Wed, 10 May 2023 15:33:03 -0500 Subject: [PATCH 4/9] Update src/CosmosDB/CosmosDB/ChangeLog.md Co-authored-by: Jin Lei <54836179+msJinLei@users.noreply.github.com> --- src/CosmosDB/CosmosDB/ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md index 8de6723ff308..f52f803015b8 100644 --- a/src/CosmosDB/CosmosDB/ChangeLog.md +++ b/src/CosmosDB/CosmosDB/ChangeLog.md @@ -21,7 +21,7 @@ ## Upcoming Release * Added support for Continuous 7 Days backup mode. * New-AzCosmosDBAccount cmdlet was updated with new parameter: EnablePartitionMerge. -* Update-AzCosmosDBAccount cmdlet was updated with: EnablePartitionMerge. +* Added new parameter `EnablePartitionMerg` to `Update-AzCosmosDBAccount` and `New-AzCosmosDBAccount`. ## Version 1.10.1 * Updated Azure.Core to 1.31.0. From 00e4d4d780fe36aa99a1191eb27f332b7d1afbba Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Wed, 10 May 2023 15:44:14 -0500 Subject: [PATCH 5/9] CosmosDB: Adds changes to handle enabling partition merge on CosmosDB account. --- src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 index 382b8527381e..7c6b914ac117 100644 --- a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 +++ b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 @@ -72,10 +72,6 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypassResourceIds.Count 1 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 - Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 - - $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 1 - Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 1 $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 0 Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 From 3b10f8c97a7c7dac772b3f81340b7c8daf660fc0 Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Wed, 10 May 2023 16:54:06 -0500 Subject: [PATCH 6/9] CosmosDB: Adds changes to handle enabling partition merge on CosmosDB account. --- src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 index 7c6b914ac117..59ce173396cc 100644 --- a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 +++ b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 @@ -73,7 +73,7 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 - $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableParitionMerge 0 + $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnablePartitionMerge 0 Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 From c2e5662ca62e889d43f7f012fc177e9b5549f2fd Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Wed, 10 May 2023 20:12:47 -0500 Subject: [PATCH 7/9] CosmosDB: Adds changes to handle enabling partition merge on CosmosDB account. --- src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 index 59ce173396cc..b9bb999f3b2e 100644 --- a/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 +++ b/src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1 @@ -59,7 +59,7 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $_.Exception.Message ("Resource with Name " + $cosmosDBAccountName + " already exists.") } - $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10 -MaxStalenessPrefix 20 -IpRule $IpRule -Tag $tags -EnableVirtualNetwork 1 -EnableAutomaticFailover 1 -PublicNetworkAccess $publicNetworkAccess -NetworkAclBypassResourceId $networkAclBypassResourceId + $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10 -MaxStalenessPrefix 20 -IpRule $IpRule -Tag $tags -EnableVirtualNetwork 1 -EnableAutomaticFailover 1 -PublicNetworkAccess $publicNetworkAccess -NetworkAclBypassResourceId $networkAclBypassResourceId -EnablePartitionMerge 0 Assert-AreEqual $cosmosDBAccountName $updatedCosmosDBAccount.Name Assert-AreEqual "BoundedStaleness" $updatedCosmosDBAccount.ConsistencyPolicy.DefaultConsistencyLevel @@ -72,11 +72,8 @@ function Test-AccountRelatedCmdlets Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypassResourceIds.Count 1 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 - - $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnablePartitionMerge 0 Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0 - $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -BackupStorageRedundancy "Geo" Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480 Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16 From 6898006cacc663bf96907878bd5901c37a05ff25 Mon Sep 17 00:00:00 2001 From: Jin Lei <54836179+msJinLei@users.noreply.github.com> Date: Fri, 12 May 2023 19:41:54 +0800 Subject: [PATCH 8/9] Update ChangeLog.md Remove duplicate line --- src/CosmosDB/CosmosDB/ChangeLog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md index f52f803015b8..5d6dbd6291fa 100644 --- a/src/CosmosDB/CosmosDB/ChangeLog.md +++ b/src/CosmosDB/CosmosDB/ChangeLog.md @@ -20,7 +20,6 @@ ## Upcoming Release * Added support for Continuous 7 Days backup mode. -* New-AzCosmosDBAccount cmdlet was updated with new parameter: EnablePartitionMerge. * Added new parameter `EnablePartitionMerg` to `Update-AzCosmosDBAccount` and `New-AzCosmosDBAccount`. ## Version 1.10.1 From 33fab6b271f8739e25259d803993203f44857c89 Mon Sep 17 00:00:00 2001 From: Srinikhil Naravamakula Date: Fri, 12 May 2023 19:50:09 -0500 Subject: [PATCH 9/9] Resolve code comments. --- src/CosmosDB/CosmosDB/ChangeLog.md | 2 +- .../CosmosDB/help/New-AzCosmosDBAccount.md | 17 +++++++++++++- .../CosmosDB/help/Update-AzCosmosDBAccount.md | 22 ++++++++++++++++--- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md index 5d6dbd6291fa..d9e7d46b01df 100644 --- a/src/CosmosDB/CosmosDB/ChangeLog.md +++ b/src/CosmosDB/CosmosDB/ChangeLog.md @@ -20,7 +20,7 @@ ## Upcoming Release * Added support for Continuous 7 Days backup mode. -* Added new parameter `EnablePartitionMerg` to `Update-AzCosmosDBAccount` and `New-AzCosmosDBAccount`. +* Added new parameter `EnablePartitionMerge` to `Update-AzCosmosDBAccount` and `New-AzCosmosDBAccount`. ## Version 1.10.1 * Updated Azure.Core to 1.31.0. diff --git a/src/CosmosDB/CosmosDB/help/New-AzCosmosDBAccount.md b/src/CosmosDB/CosmosDB/help/New-AzCosmosDBAccount.md index 46639bbf2c56..59ed487bbeeb 100644 --- a/src/CosmosDB/CosmosDB/help/New-AzCosmosDBAccount.md +++ b/src/CosmosDB/CosmosDB/help/New-AzCosmosDBAccount.md @@ -22,7 +22,7 @@ New-AzCosmosDBAccount [-EnableAutomaticFailover] [-EnableMultipleWriteLocations] [-PublicNetworkAccess ] [-KeyVaultKeyUri ] [-EnableAnalyticalStorage ] [-AsJob] [-NetworkAclBypass ] [-NetworkAclBypassResourceId ] [-ServerVersion ] [-BackupIntervalInMinutes ] [-BackupRetentionIntervalInHours ] - [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] + [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] [-EnablePartitionMerge ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -261,6 +261,21 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -EnablePartitionMerge +Bool to indicate if PartitionMerge is enabled on the account. +Accepted Values: false, true +```yaml +Type: System.Nullable`1[System.Boolean] +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -EnableAutomaticFailover Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account. diff --git a/src/CosmosDB/CosmosDB/help/Update-AzCosmosDBAccount.md b/src/CosmosDB/CosmosDB/help/Update-AzCosmosDBAccount.md index b61333ca64a9..5affd56fa8c1 100644 --- a/src/CosmosDB/CosmosDB/help/Update-AzCosmosDBAccount.md +++ b/src/CosmosDB/CosmosDB/help/Update-AzCosmosDBAccount.md @@ -22,7 +22,7 @@ Update-AzCosmosDBAccount [-EnableAutomaticFailover ] [-EnableMultipleWr [-PublicNetworkAccess ] [-KeyVaultKeyUri ] [-EnableAnalyticalStorage ] [-AsJob] [-NetworkAclBypass ] [-NetworkAclBypassResourceId ] [-ServerVersion ] [-BackupIntervalInMinutes ] [-BackupRetentionIntervalInHours ] - [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] + [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] [-EnablePartitionMerge ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -36,7 +36,7 @@ Update-AzCosmosDBAccount -ResourceId [-EnableAutomaticFailover ] [-KeyVaultKeyUri ] [-EnableAnalyticalStorage ] [-AsJob] [-NetworkAclBypass ] [-NetworkAclBypassResourceId ] [-ServerVersion ] [-BackupIntervalInMinutes ] [-BackupRetentionIntervalInHours ] - [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] + [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] [-EnablePartitionMerge ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -50,7 +50,7 @@ Update-AzCosmosDBAccount -InputObject [-EnableAuto [-PublicNetworkAccess ] [-KeyVaultKeyUri ] [-EnableAnalyticalStorage ] [-AsJob] [-NetworkAclBypass ] [-NetworkAclBypassResourceId ] [-ServerVersion ] [-BackupIntervalInMinutes ] [-BackupRetentionIntervalInHours ] - [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] + [-BackupStorageRedundancy ] [-BackupPolicyType ] [-ContinuousTier ] [-AnalyticalStorageSchemaType ] [-EnablePartitionMerge ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -274,6 +274,22 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -EnablePartitionMerge +Enable Partition Merge on Account +Accepted values: false, true + +```yaml +Type: System.Nullable`1[System.Boolean] +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -EnableMultipleWriteLocations Enable Multiple Write Locations. Accepted values: false, true