Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function Test-AccountRelatedCmdlets
$publicNetworkAccess = "Enabled"
$networkAclBypass = "AzureServices"
$networkAclBypassResourceId = @("/subscriptions/subId/resourcegroups/rgName/providers/Microsoft.Synapse/workspaces/workspaceName")

$cosmosDBAccount = New-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10 -MaxStalenessPrefix 20 -Location $location -IpRule $IpRule -Tag $tags -EnableVirtualNetwork -EnableMultipleWriteLocations -EnableAutomaticFailover -ApiKind "MongoDB" -PublicNetworkAccess $publicNetworkAccess -EnableFreeTier 0 -EnableAnalyticalStorage 0 -ServerVersion "3.2" -NetworkAclBypass $NetworkAclBypass -BackupRetentionIntervalInHours 16 -BackupIntervalInMinutes 480 -EnableBurstCapacity 1
$cosmosDBAccount = New-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10 -MaxStalenessPrefix 20 -Location $location -IpRule $IpRule -Tag $tags -EnableVirtualNetwork -EnableMultipleWriteLocations -EnableAutomaticFailover -ApiKind "MongoDB" -PublicNetworkAccess $publicNetworkAccess -EnableFreeTier 0 -EnableAnalyticalStorage 0 -ServerVersion "3.2" -NetworkAclBypass $NetworkAclBypass -BackupRetentionIntervalInHours 16 -BackupIntervalInMinutes 480 -EnableBurstCapacity 1 -MinimalTlsVersion "Tls11"

Assert-AreEqual $cosmosDBAccountName $cosmosDBAccount.Name
Assert-AreEqual "BoundedStaleness" $cosmosDBAccount.ConsistencyPolicy.DefaultConsistencyLevel
Expand All @@ -51,6 +51,7 @@ function Test-AccountRelatedCmdlets
Assert-AreEqual $cosmosDBAccount.BackupPolicy.BackupIntervalInMinutes 480
Assert-AreEqual $cosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16
Assert-AreEqual $cosmosDBAccount.EnableBurstCapacity 1
Assert-AreEqual $cosmosDBAccount.MinimalTlsVersion "Tls11"

# create an existing database
Try {
Expand All @@ -60,7 +61,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 -EnablePartitionMerge 0 -EnableBurstCapacity 0
$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 -EnableBurstCapacity 0 -MinimalTlsVersion "Tls12"

Assert-AreEqual $cosmosDBAccountName $updatedCosmosDBAccount.Name
Assert-AreEqual "BoundedStaleness" $updatedCosmosDBAccount.ConsistencyPolicy.DefaultConsistencyLevel
Expand All @@ -75,6 +76,7 @@ function Test-AccountRelatedCmdlets
Assert-AreEqual $updatedCosmosDBAccount.BackupPolicy.BackupRetentionIntervalInHours 16
Assert-AreEqual $updatedCosmosDBAccount.EnablePartitionMerge 0
Assert-AreEqual $updatedCosmosDBAccount.EnableBurstCapacity 0
Assert-AreEqual $updatedCosmosDBAccount.MinimalTlsVersion "Tls12"

$updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -EnableBurstCapacity 1
Assert-AreEqual $updatedCosmosDBAccount.EnableBurstCapacity 1
Expand Down
5 changes: 5 additions & 0 deletions src/CosmosDB/CosmosDB/CosmosDBAccount/NewAzCosmosDBAccount.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public class NewAzCosmosDBAccount : NewOrUpdateAzCosmosDBAccount, IDynamicParame
[Parameter(Mandatory = false, HelpMessage = Constants.LocationObjectHelpMessage)]
[ValidateNotNullOrEmpty]
public PSLocation[] LocationObject { get; set; }

[Parameter(Mandatory = false, HelpMessage = Constants.MinimalTlsVersionHelpMessage)]
[PSArgumentCompleter(SDKModel.MinimalTlsVersion.Tls, SDKModel.MinimalTlsVersion.Tls11, SDKModel.MinimalTlsVersion.Tls12)]
public string MinimalTlsVersion { get; set; }

// As of 03082022, using this list only for Mongo Accounts >= 3.6
[Parameter(Mandatory = false, HelpMessage = Constants.LocationHelpMessage)]
Expand Down Expand Up @@ -171,6 +175,7 @@ public override void ExecuteCmdlet()
Collection<string> networkAclBypassResourceId = NetworkAclBypassResourceId != null ? new Collection<string>(NetworkAclBypassResourceId) : new Collection<string>();
databaseAccountCreateUpdateParameters.NetworkAclBypassResourceIds = networkAclBypassResourceId;
databaseAccountCreateUpdateParameters.EnableBurstCapacity = EnableBurstCapacity;
databaseAccountCreateUpdateParameters.MinimalTlsVersion = MinimalTlsVersion;

if (IpRule != null && IpRule.Length > 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ public class NewOrUpdateAzCosmosDBAccount : AzureCosmosDBCmdletBase
[PSArgumentCompleter(SDKModel.AnalyticalStorageSchemaType.WellDefined, SDKModel.AnalyticalStorageSchemaType.FullFidelity)]
public string AnalyticalStorageSchemaType { get; set; }

[Parameter(Mandatory = false, HelpMessage = Constants.MinimalTlsVersionHelpMessage)]
[PSArgumentCompleter(SDKModel.MinimalTlsVersion.Tls, SDKModel.MinimalTlsVersion.Tls11, SDKModel.MinimalTlsVersion.Tls12)]
public string MinimalTlsVersion { get; set; }

public ConsistencyPolicy PopoulateConsistencyPolicy(string DefaultConsistencyLevel, int? MaxStalenessIntervalInSeconds, int? MaxStalenessPrefix)
{
ConsistencyPolicy consistencyPolicy = new ConsistencyPolicy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public class UpdateAzCosmosDBAccount : NewOrUpdateAzCosmosDBAccount
[Parameter(Mandatory = false, HelpMessage = Constants.DisableKeyBasedMetadataWriteAccessHelpMessage)]
public bool? DisableKeyBasedMetadataWriteAccess { get; set; }

[Parameter(Mandatory = false, HelpMessage = Constants.MinimalTlsVersionHelpMessage)]
public string MinimalTlsVersion { get; set; }

public override void ExecuteCmdlet()
{
if (!ParameterSetName.Equals(NameParameterSet, StringComparison.Ordinal))
Expand Down Expand Up @@ -229,6 +232,11 @@ public override void ExecuteCmdlet()
};
}
}

if(!string.IsNullOrEmpty(MinimalTlsVersion))
{
databaseAccountUpdateParameters.MinimalTlsVersion = MinimalTlsVersion;
}

// Update analytical storage schema type.
databaseAccountUpdateParameters.AnalyticalStorageConfiguration = CreateAnalyticalStorageConfiguration(AnalyticalStorageSchemaType);
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 @@ -60,6 +60,7 @@ internal static class Constants
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";
public const string MinimalTlsVersionHelpMessage = "Indicates the minimum allowed Tls version. The default value is Tls 1.2. Cassandra and Mongo APIs only work with Tls 1.2. Possible values include: 'Tls', 'Tls11', 'Tls12'.";

//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 @@ -68,6 +68,7 @@ public PSDatabaseAccountGetResults(DatabaseAccountGetResults databaseAccountGetR
CreateMode = databaseAccountGetResults.CreateMode;
AnalyticalStorageConfiguration = new PSAnalyticalStorageConfiguration(databaseAccountGetResults.AnalyticalStorageConfiguration);
EnablePartitionMerge = databaseAccountGetResults.EnablePartitionMerge;
MinimalTlsVersion = databaseAccountGetResults.MinimalTlsVersion;
}

//
Expand Down Expand Up @@ -234,5 +235,10 @@ public PSDatabaseAccountGetResults(DatabaseAccountGetResults databaseAccountGetR
// Summary:
// Gets or sets the AnalyticalStorageConfiguration of the CosmosDB Account
public PSAnalyticalStorageConfiguration AnalyticalStorageConfiguration { get; set; }
//
//
// Summary:
// Gets or sets the MinimalTlsVersion of the CosmosDB Account
public string MinimalTlsVersion { get; set; }
}
}