Skip to content

Commit 2eaaa3e

Browse files
committed
formatting, complete incomplete .NET regeneration
1 parent bedce38 commit 2eaaa3e

File tree

8 files changed

+180
-20
lines changed

8 files changed

+180
-20
lines changed

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/src/DdbMiddlewareConfig.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module DdbMiddlewareConfig {
99
import EncTypes = AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes
1010
import DDBE = AwsCryptographyDbEncryptionSdkDynamoDbTypes
1111
import SearchableEncryptionInfo
12-
12+
1313
datatype TableConfig = TableConfig(
1414
physicalTableName: ComAmazonawsDynamodbTypes.TableName,
1515
logicalTableName: string,

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorOperations.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorOperations refines Abs
4545
nameonly plaintextOverride: DDBE.PlaintextOverride,
4646
nameonly internalLegacyOverride: Option<InternalLegacyOverride.InternalLegacyOverride> := None
4747
)
48-
48+
4949
type InternalConfig = Config
5050
type ValidConfig = x : Config | ValidInternalConfig?(x) witness *
5151

DynamoDbEncryption/dafny/StructuredEncryption/src/AwsCryptographyDbEncryptionSdkStructuredEncryptionOperations.dfy

+8-8
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ module AwsCryptographyDbEncryptionSdkStructuredEncryptionOperations refines Abst
357357
assert |data_c| == |newSchema.SchemaMap|;
358358

359359
var canon := EncryptCanonData(
360-
encFields_c,
361-
signedFields_c,
362-
data_c,
363-
CryptoSchema(
364-
content := newSchema,
365-
attributes := None
366-
)
367-
);
360+
encFields_c,
361+
signedFields_c,
362+
data_c,
363+
CryptoSchema(
364+
content := newSchema,
365+
attributes := None
366+
)
367+
);
368368
assert ValidEncryptCanon?(canon);
369369
Success(canon)
370370
}

DynamoDbEncryption/dafny/StructuredEncryption/src/Index.dfy

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ module
2323
{
2424
var maybePrimitives := Primitives.AtomicPrimitives();
2525
var primitives :- maybePrimitives.MapFailure(e => AwsCryptographyPrimitives(e));
26-
26+
2727
var maybeMatProv := MaterialProviders.MaterialProviders();
2828
var matProv :- maybeMatProv.MapFailure(e => AwsCryptographyMaterialProviders(e));
2929

3030
var client := new StructuredEncryptionClient(Operations.Config(primitives := primitives, materialProviders := matProv));
3131
return Success(client);
3232
}
3333

34-
34+
3535

3636
class StructuredEncryptionClient... {
3737

DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/ResolveAttributesInput.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ public void Validate()
4141
{
4242
if (!IsSetTableName()) throw new System.ArgumentException("Missing value for required property 'TableName'");
4343
if (!IsSetItem()) throw new System.ArgumentException("Missing value for required property 'Item'");
44-
44+
if (IsSetVersion())
45+
{
46+
if (Version < 1)
47+
{
48+
throw new System.ArgumentException(
49+
String.Format("Member Version of structure ResolveAttributesInput has type VersionNumber which has a minimum of 1 but was given the value {0}.", Version));
50+
}
51+
}
4552
}
4653
}
4754
}

DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs

+138-4
Large diffs are not rendered by default.

DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DecryptIte
1313
}
1414
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IDecryptItemInput ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S16_DecryptItemInput(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DecryptItemInput value)
1515
{
16+
value.Validate();
1617

1718
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.DecryptItemInput(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S16_DecryptItemInput__M13_encryptedItem(value.EncryptedItem));
1819
}
@@ -23,6 +24,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DecryptIte
2324
}
2425
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IDecryptItemOutput ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_DecryptItemOutput(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DecryptItemOutput value)
2526
{
27+
value.Validate();
2628
AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHeader var_parsedHeader = value.IsSetParsedHeader() ? value.ParsedHeader : (AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHeader)null;
2729
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.DecryptItemOutput(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_DecryptItemOutput__M13_plaintextItem(value.PlaintextItem), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_DecryptItemOutput__M12_parsedHeader(var_parsedHeader));
2830
}
@@ -42,6 +44,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DynamoDbIt
4244
}
4345
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IDynamoDbItemEncryptorConfig ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S27_DynamoDbItemEncryptorConfig(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.DynamoDbItemEncryptorConfig value)
4446
{
47+
value.Validate();
4548
string var_sortKeyName = value.IsSetSortKeyName() ? value.SortKeyName : (string)null;
4649
System.Collections.Generic.List<string> var_allowedUnsignedAttributes = value.IsSetAllowedUnsignedAttributes() ? value.AllowedUnsignedAttributes : (System.Collections.Generic.List<string>)null;
4750
string var_allowedUnsignedAttributePrefix = value.IsSetAllowedUnsignedAttributePrefix() ? value.AllowedUnsignedAttributePrefix : (string)null;
@@ -71,6 +74,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.EncryptIte
7174
}
7275
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IEncryptItemInput ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S16_EncryptItemInput(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.EncryptItemInput value)
7376
{
77+
value.Validate();
7478

7579
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.EncryptItemInput(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S16_EncryptItemInput__M13_plaintextItem(value.PlaintextItem));
7680
}
@@ -81,6 +85,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.EncryptIte
8185
}
8286
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IEncryptItemOutput ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_EncryptItemOutput(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.EncryptItemOutput value)
8387
{
88+
value.Validate();
8489
AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHeader var_parsedHeader = value.IsSetParsedHeader() ? value.ParsedHeader : (AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHeader)null;
8590
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.EncryptItemOutput(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_EncryptItemOutput__M13_encryptedItem(value.EncryptedItem), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S17_EncryptItemOutput__M12_parsedHeader(var_parsedHeader));
8691
}
@@ -249,6 +254,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHead
249254
}
250255
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types._IParsedHeader ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader(AWS.Cryptography.DbEncryptionSDK.DynamoDb.ItemEncryptor.ParsedHeader value)
251256
{
257+
value.Validate();
252258

253259
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.ParsedHeader(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M25_attributeActionsOnEncrypt(value.AttributeActionsOnEncrypt), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M16_algorithmSuiteId(value.AlgorithmSuiteId), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M17_encryptedDataKeys(value.EncryptedDataKeys), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M23_storedEncryptionContext(value.StoredEncryptionContext), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M17_encryptionContext(value.EncryptionContext), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__N13_itemEncryptor__S12_ParsedHeader__M15_selectorContext(value.SelectorContext));
254260
}
@@ -331,6 +337,7 @@ public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.LegacyOverride FromDafny
331337
}
332338
public static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ILegacyOverride ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S14_LegacyOverride(AWS.Cryptography.DbEncryptionSDK.DynamoDb.LegacyOverride value)
333339
{
340+
value.Validate();
334341
AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.CryptoAction var_defaultAttributeFlag = value.IsSetDefaultAttributeFlag() ? value.DefaultAttributeFlag : (AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.CryptoAction)null;
335342
return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.LegacyOverride(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S14_LegacyOverride__M6_policy(value.Policy), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S14_LegacyOverride__M9_encryptor(value.Encryptor), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S14_LegacyOverride__M25_attributeActionsOnEncrypt(value.AttributeActionsOnEncrypt), ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S14_LegacyOverride__M20_defaultAttributeFlag(var_defaultAttributeFlag));
336343
}
@@ -860,6 +867,7 @@ public static AWS.Cryptography.MaterialProviders.EncryptedDataKey FromDafny_N3_a
860867
}
861868
public static software.amazon.cryptography.materialproviders.internaldafny.types._IEncryptedDataKey ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S16_EncryptedDataKey(AWS.Cryptography.MaterialProviders.EncryptedDataKey value)
862869
{
870+
value.Validate();
863871

864872
return new software.amazon.cryptography.materialproviders.internaldafny.types.EncryptedDataKey(ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S16_EncryptedDataKey__M13_keyProviderId(value.KeyProviderId), ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S16_EncryptedDataKey__M15_keyProviderInfo(value.KeyProviderInfo), ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S16_EncryptedDataKey__M10_ciphertext(value.Ciphertext));
865873
}

0 commit comments

Comments
 (0)