Skip to content

Commit ac87a66

Browse files
committed
chore(dafny): Add bucket beacon support
1 parent 69c37c6 commit ac87a66

File tree

16 files changed

+172
-12
lines changed

16 files changed

+172
-12
lines changed

DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.internald
1717
import AwsCryptographyKeyStoreTypes
1818
import AwsCryptographyPrimitivesTypes
1919
import ComAmazonawsDynamodbTypes
20-
// Generic helpers for verification of mock/unit tests.
20+
// Generic helpers for verification of mock/unit tests.
2121
datatype DafnyCallEvent<I, O> = DafnyCallEvent(input: I, output: O)
2222

2323
// Begin Generated Types
@@ -46,12 +46,17 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.internald
4646
nameonly compoundBeacons: Option<CompoundBeaconList> := Option.None ,
4747
nameonly virtualFields: Option<VirtualFieldList> := Option.None ,
4848
nameonly encryptedParts: Option<EncryptedPartsList> := Option.None ,
49-
nameonly signedParts: Option<SignedPartsList> := Option.None
49+
nameonly signedParts: Option<SignedPartsList> := Option.None ,
50+
nameonly numberOfBuckets: Option<BucketCount> := Option.None
5051
)
5152
type BeaconVersionList = x: seq<BeaconVersion> | IsValid_BeaconVersionList(x) witness *
5253
predicate method IsValid_BeaconVersionList(x: seq<BeaconVersion>) {
5354
( 1 <= |x| <= 1 )
5455
}
56+
type BucketCount = x: int32 | IsValid_BucketCount(x) witness *
57+
predicate method IsValid_BucketCount(x: int32) {
58+
( 1 <= x )
59+
}
5560
type Char = x: string | IsValid_Char(x) witness *
5661
predicate method IsValid_Char(x: string) {
5762
( 1 <= |x| <= 1 )

DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,9 @@ integer BeaconBitLength
286286
@range(min: 1)
287287
integer VersionNumber
288288

289+
@range(min: 1)
290+
integer BucketCount
291+
289292
@length(min: 1, max: 1)
290293
string Char
291294

@@ -796,6 +799,8 @@ structure BeaconVersion {
796799
encryptedParts : EncryptedPartsList,
797800
@javadoc("The list of Signed Parts that may be included in any compound beacon.")
798801
signedParts : SignedPartsList,
802+
@javadoc("The number of separate buckets across which beacons should be divided.")
803+
numberOfBuckets : BucketCount
799804
}
800805

801806
//= specification/searchable-encryption/search-config.md#initialization

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/Model/AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.transform
1717
import AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes
1818
import AwsCryptographyMaterialProvidersTypes
1919
import ComAmazonawsDynamodbTypes
20-
// Generic helpers for verification of mock/unit tests.
20+
// Generic helpers for verification of mock/unit tests.
2121
datatype DafnyCallEvent<I, O> = DafnyCallEvent(input: I, output: O)
2222

2323
// Begin Generated Types

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencry
1717
import AwsCryptographyMaterialProvidersTypes
1818
import AwsCryptographyPrimitivesTypes
1919
import ComAmazonawsDynamodbTypes
20-
// Generic helpers for verification of mock/unit tests.
20+
// Generic helpers for verification of mock/unit tests.
2121
datatype DafnyCallEvent<I, O> = DafnyCallEvent(input: I, output: O)
2222

2323
// Begin Generated Types

DynamoDbEncryption/dafny/StructuredEncryption/Model/AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.structuredencrypti
1111
import opened UTF8
1212
import AwsCryptographyMaterialProvidersTypes
1313
import AwsCryptographyPrimitivesTypes
14-
// Generic helpers for verification of mock/unit tests.
14+
// Generic helpers for verification of mock/unit tests.
1515
datatype DafnyCallEvent<I, O> = DafnyCallEvent(input: I, output: O)
1616

1717
// Begin Generated Types

DynamoDbEncryption/runtimes/go/ImplementationFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated/to_dafny.go

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DynamoDbEncryption/runtimes/go/ImplementationFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated/to_native.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DynamoDbEncryption/runtimes/go/ImplementationFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygeneratedtypes/types.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DynamoDbEncryption/runtimes/go/TestsFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated/to_dafny.go

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DynamoDbEncryption/runtimes/go/TestsFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated/to_native.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)