Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d4b742e

Browse files
authoredOct 17, 2024··
Merge branch 'main' into rkapila/shared-cache-examples
2 parents fb72db1 + b9333fb commit d4b742e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed
 

‎DynamoDbEncryption/dafny/DynamoDbEncryption/src/SearchInfo.dfy

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,11 @@ module SearchableEncryptionInfo {
248248
assume {:axiom} cache.Modifies == {};
249249
var getCacheOutput := cache.GetCacheEntry(getCacheInput);
250250

251+
// If error is not EntryDoesNotExist, return failure
252+
if (getCacheOutput.Failure? && !getCacheOutput.error.EntryDoesNotExist?) {
253+
return Failure(AwsCryptographyMaterialProviders(AwsCryptographyMaterialProviders:=getCacheOutput.error));
254+
}
255+
251256
if getCacheOutput.Failure? {
252257
//= specification/searchable-encryption/search-config.md#beacon-keys
253258
//# Beacon keys MUST be obtained from the configured [Beacon Key Source](#beacon-key-source).
@@ -280,7 +285,11 @@ module SearchableEncryptionInfo {
280285

281286
verifyValidStateCache(cache);
282287
assume {:axiom} cache.Modifies == {};
283-
var _ := cache.PutCacheEntry(putCacheEntryInput);
288+
289+
var putResult := cache.PutCacheEntry(putCacheEntryInput);
290+
if (putResult.Failure? && !putResult.error.EntryAlreadyExists?) {
291+
return Failure(AwsCryptographyMaterialProviders(AwsCryptographyMaterialProviders:=putResult.error));
292+
}
284293
return Success(keyMap);
285294
} else {
286295
:- Need(

‎project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ mplDependencyJavaVersion=1.6.0
33
dafnyVersion=4.8.0
44
dafnyVerifyVersion=4.8.0
55
dafnyRuntimeJavaVersion=4.8.0
6-
smithyDafnyJavaConversionVersion=0.1
6+
smithyDafnyJavaConversionVersion=0.1.1

0 commit comments

Comments
 (0)
Please sign in to comment.