Adding type in EncryptionKeyWrapMetadata and performing validation on partition key #21407
Conversation
simplynaveen20
requested review from
aayush3011,
FabianMeiswinkel,
kirankumarkolli,
kushagraThapar,
mbhaskar,
milismsft,
moderakh and
xinlian12
as code owners
ghost
added
the
simplynaveen20
changed the title
There was a problem hiding this comment.
@simplynaveen20 in similar scenario, does non Cosmos Exception type reach public surface area in the DotNet SDK?
| void validatePartitionKeyPathsAreNotEncrypted(List<List<String>> partitionKeyPathTokens) { | ||
| checkNotNull(partitionKeyPathTokens, "partitionKeyPathTokens cannot be null"); | ||
| List<String> propertiesToEncrypt = | ||
| this.includedPaths.stream().map(clientEncryptionIncludedPath -> clientEncryptionIncludedPath.getPath().substring(1)).collect(Collectors.toList()); |
There was a problem hiding this comment.
nice usage of java8 stream API. :-)
| @@ -82,6 +82,13 @@ public CosmosAsyncClientEncryptionKey getClientEncryptionKey(String id) { | |||
|
|
|||
| EncryptionKeyStoreProvider encryptionKeyStoreProvider = | |||
| this.cosmosEncryptionAsyncClient.getEncryptionKeyStoreProvider(); | |||
|
|
|||
| if (!encryptionKeyStoreProvider.getProviderName().equals(encryptionKeyWrapMetadata.getType())) { | |||
| throw new IllegalArgumentException("The EncryptionKeyWrapMetadata Type value does not match with the " + | |||
There was a problem hiding this comment.
in similar scenario, does non Cosmos Exception type reach public surface area in the DotNet SDK?
There was a problem hiding this comment.
Yes .NET has ArgumentException as well. To me this is correct and it should be non cosmos as it is validation on argument passed by user.
There was a problem hiding this comment.
how would it work on the async API? do we do validation upfront? or do we return a Mono.of(IllegalArgException)
There was a problem hiding this comment.
This validation is on async API itself which is doing validation upfront .
sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ClientEncryptionPolicy.java
Outdated
Show resolved
Hide resolved
sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/EncryptionKeyWrapMetadata.java
Outdated
Show resolved
Hide resolved
sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/EncryptionKeyWrapMetadata.java
Outdated
Show resolved
Hide resolved
| @@ -82,6 +82,13 @@ public CosmosAsyncClientEncryptionKey getClientEncryptionKey(String id) { | |||
|
|
|||
| EncryptionKeyStoreProvider encryptionKeyStoreProvider = | |||
| this.cosmosEncryptionAsyncClient.getEncryptionKeyStoreProvider(); | |||
|
|
|||
| if (!encryptionKeyStoreProvider.getProviderName().equals(encryptionKeyWrapMetadata.getType())) { | |||
| throw new IllegalArgumentException("The EncryptionKeyWrapMetadata Type value does not match with the " + | |||
There was a problem hiding this comment.
how would it work on the async API? do we do validation upfront? or do we return a Mono.of(IllegalArgException)
This PR contains 3 parts
closes #20376