From 5b3e127d3b01308322809c74ce3e68577e0c4576 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 2 Nov 2023 18:13:38 -0400 Subject: [PATCH] m --- .../DynamoDbEncryption/TypeConversion.cs | 14 +++--------- .../TypeConversion.cs | 22 ++++++++----------- .../DynamoDbItemEncryptor/TypeConversion.cs | 6 ++--- ...BeaconStylesSearchableEncryptionExample.cs | 12 +++++----- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs index ec9861794..82135495f 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs @@ -1361,25 +1361,17 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph return AWS.Cryptography.MaterialProviders.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyMaterialProviders ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: - return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption - ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_AwsCryptographyPrimitives dafnyVal: return AWS.Cryptography.Primitives.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyPrimitives ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_ComAmazonawsDynamodb dafnyVal: - return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( - dafnyVal._ComAmazonawsDynamodb - ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_AwsCryptographyPrimitives dafnyVal: - return AWS.Cryptography.Primitives.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyPrimitives + case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_ComAmazonawsDynamodb dafnyVal: + return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( + dafnyVal._ComAmazonawsDynamodb ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_DynamoDbEncryptionException dafnyVal: return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S27_DynamoDbEncryptionException(dafnyVal); diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs index bec025c7e..466bc2cb6 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs @@ -6483,13 +6483,13 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph { switch (value) { - case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyMaterialProviders dafnyVal: - return AWS.Cryptography.MaterialProviders.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyMaterialProviders + case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: + return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( + dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor dafnyVal: - return AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor + case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_ComAmazonawsDynamodb dafnyVal: + return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( + dafnyVal._ComAmazonawsDynamodb ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkDynamoDb dafnyVal: return AWS.Cryptography.DbEncryptionSDK.DynamoDb.TypeConversion.FromDafny_CommonError( @@ -6499,13 +6499,9 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph return AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: - return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption - ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_ComAmazonawsDynamodb dafnyVal: - return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( - dafnyVal._ComAmazonawsDynamodb + case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_AwsCryptographyMaterialProviders dafnyVal: + return AWS.Cryptography.MaterialProviders.TypeConversion.FromDafny_CommonError( + dafnyVal._AwsCryptographyMaterialProviders ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.internaldafny.types.Error_DynamoDbEncryptionTransformsException dafnyVal: return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N10_transforms__S37_DynamoDbEncryptionTransformsException(dafnyVal); diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs index b3feb019e..84a1f7d91 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs @@ -922,9 +922,9 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph return AWS.Cryptography.MaterialProviders.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyMaterialProviders ); - case software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: - return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption + case software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.Error_ComAmazonawsDynamodb dafnyVal: + return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( + dafnyVal._ComAmazonawsDynamodb ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.Error_DynamoDbItemEncryptorException dafnyVal: return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S30_DynamoDbItemEncryptorException(dafnyVal); diff --git a/Examples/runtimes/net/src/searchableencryption/BeaconStylesSearchableEncryptionExample.cs b/Examples/runtimes/net/src/searchableencryption/BeaconStylesSearchableEncryptionExample.cs index c1617a1f6..461be4b35 100644 --- a/Examples/runtimes/net/src/searchableencryption/BeaconStylesSearchableEncryptionExample.cs +++ b/Examples/runtimes/net/src/searchableencryption/BeaconStylesSearchableEncryptionExample.cs @@ -63,28 +63,28 @@ public static async Task PutItemQueryItemWithBeaconStyles(String branchKeyId) // The basket beacon allows searching on the encrypted basket attribute // basket is used as a Set, and therefore needs a beacon style to reflect that. // Further, we need to be able to compare the items in basket to the fruit attribute - // so we `twin` this beacon to `fruit`. - // Since we need both of these things, we use the TwinnedSet style. + // so we `share` this beacon with `fruit`. + // Since we need both of these things, we use the SharedSet style. new StandardBeacon { Name = "basket", Length = 30, Style = new BeaconStyle { - TwinnedSet = new TwinnedSet { Other = "fruit" } + SharedSet = new SharedSet { Other = "fruit" } } }, // The dessert beacon allows searching on the encrypted dessert attribute // We need to be able to compare the dessert attribute to the fruit attribute - // so we `twin` this beacon to `fruit`. + // so we `share` this beacon with `fruit`. new StandardBeacon { Name = "dessert", Length = 30, Style = new BeaconStyle { - Twinned = new Twinned { Other = "fruit" } + Shared = new Shared { Other = "fruit" } } } }; @@ -268,7 +268,7 @@ public static async Task PutItemQueryItemWithBeaconStyles(String branchKeyId) Debug.Assert(scanResponse.Items.Count == 1); Debug.Assert(scanResponse.Items[0]["work_id"].S == item2["work_id"].S); - // Test a Twinned search. Select records where the dessert attribute matches the fruit attribute + // Test a Shared search. Select records where the dessert attribute matches the fruit attribute scanRequest = new ScanRequest { TableName = ddbTableName,