Skip to content

Commit 40fe664

Browse files
Merge from main by copying the diff
For some reason some code did not got merged
1 parent 4530d55 commit 40fe664

File tree

1 file changed

+4
-2
lines changed
  • DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/src

1 file changed

+4
-2
lines changed

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/src/Index.dfy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include "DdbMiddlewareConfig.dfy"
55
include "AwsCryptographyDbEncryptionSdkDynamoDbTransformsOperations.dfy"
66
include "../../DynamoDbEncryption/src/ConfigToInfo.dfy"
77

8-
module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny" } DynamoDbEncryptionTransforms
8+
module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny" } DynamoDbEncryptionTransforms
99
refines AbstractAwsCryptographyDbEncryptionSdkDynamoDbTransformsService
1010
{
1111
import opened DdbMiddlewareConfig
@@ -135,6 +135,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.transform
135135
(if tableConfig.keyring.Some? then tableConfig.keyring.value.Modifies else {})
136136
+ (if tableConfig.cmm.Some? then tableConfig.cmm.value.Modifies else {})
137137
+ (if tableConfig.legacyOverride.Some? then tableConfig.legacyOverride.value.encryptor.Modifies else {})
138+
+ (if tableConfig.search.Some? then tableConfig.search.value.versions[0].keyStore.Modifies else {})
138139
)
139140
{:nowarn} :: o; // ignore warning for missing trigger on quantifier
140141

@@ -155,10 +156,11 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.transform
155156
var tableName: string := tableNamesSeq[i];
156157

157158
var inputConfig := config.tableEncryptionConfigs[tableName];
158-
:- Need(inputConfig.logicalTableName !in allLogicalTableNames, E("Duplicate logical table maped to multipule physical tables: " + inputConfig.logicalTableName));
159+
:- Need(inputConfig.logicalTableName !in allLogicalTableNames, E("Duplicate logical table mapped to multiple physical tables: " + inputConfig.logicalTableName));
159160

160161
assert SearchConfigToInfo.ValidSearchConfig(inputConfig.search);
161162
SearchInModifies(config, tableName);
163+
reveal SearchConfigToInfo.ValidSharedCache();
162164
var searchR := SearchConfigToInfo.Convert(inputConfig);
163165
var search :- searchR.MapFailure(e => AwsCryptographyDbEncryptionSdkDynamoDb(e));
164166
assert search.None? || search.value.ValidState();

0 commit comments

Comments
 (0)