Skip to content
Merged
8 changes: 8 additions & 0 deletions src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.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


$updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -BackupStorageRedundancy "Geo"
Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480
Expand Down
2 changes: 2 additions & 0 deletions src/CosmosDB/CosmosDB/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ public override void ExecuteCmdlet()
{
databaseAccountUpdateParameters.EnableAnalyticalStorage = EnableAnalyticalStorage;
}
if (EnablePartitionMerge != null)
{
databaseAccountUpdateParameters.EnablePartitionMerge = EnablePartitionMerge;
}
if (NetworkAclBypass != null)
{
databaseAccountUpdateParameters.NetworkAclBypass =
Expand Down
1 change: 1 addition & 0 deletions src/CosmosDB/CosmosDB/Helpers/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public PSDatabaseAccountGetResults(DatabaseAccountGetResults databaseAccountGetR
RestoreParameters = new PSRestoreParameters(databaseAccountGetResults.RestoreParameters);
CreateMode = databaseAccountGetResults.CreateMode;
AnalyticalStorageConfiguration = new PSAnalyticalStorageConfiguration(databaseAccountGetResults.AnalyticalStorageConfiguration);
EnablePartitionMerge = databaseAccountGetResults.EnablePartitionMerge;
}

//
Expand Down Expand Up @@ -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; }
//
Expand Down