Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CosmosDB] Fixes issue with Update-AzCosmosDBSqlContainer command on containers with Client Encryption Policy #18480

Merged
merged 17 commits into from
Jun 14, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,9 @@ function Test-ClientEncryptionKeyCmdlets
Assert-AreEqual $ContainerWithEncryptionPolicy.Resource.ClientEncryptionPolicy.IncludedPaths[1].EncryptionType $EncryptionType_2
Assert-AreEqual $ContainerWithEncryptionPolicy.Resource.ClientEncryptionPolicy.PolicyFormatVersion 1

#validate update container works on container with encryption policy.
updateContainerTtl = Update-AzCosmosDBSqlContainer -AccountName $AccountName -ResourceGroupName $rgName -DatabaseName $DatabaseName -TtlInSeconds 7200
Assert-AreEqual updateContainerTtl.Resource.DefaultTtl 7200
}
Finally {
Remove-AzCosmosDBSqlDatabase -AccountName $AccountName -ResourceGroupName $rgName -Name $DatabaseName
Expand Down
1 change: 1 addition & 0 deletions src/CosmosDB/CosmosDB/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->

## Upcoming Release
* Fixed bug related to Update-AzCosmosDBSqlContainer command on containers with Client Encryption Policy.

## Version 1.8.0
* Introduced support for creating containers with Client Encryption Policy. The current supported version of Client Encryption Policy is 1.
Expand Down
3 changes: 2 additions & 1 deletion src/CosmosDB/CosmosDB/SQL/UpdateAzCosmosDBSqlContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ private static SqlContainerResource PopulateSqlContainerResource(SqlContainerGet
DefaultTtl = sqlContainerGetPropertiesResource.DefaultTtl,
Id = sqlContainerGetPropertiesResource.Id,
IndexingPolicy = sqlContainerGetPropertiesResource.IndexingPolicy,
PartitionKey = sqlContainerGetPropertiesResource.PartitionKey
PartitionKey = sqlContainerGetPropertiesResource.PartitionKey,
ClientEncryptionPolicy = sqlContainerGetPropertiesResource.ClientEncryptionPolicy
};
}
}
Expand Down