Skip to content

Commit 90822df

Browse files
committed
m
1 parent 2fbfdc5 commit 90822df

File tree

13 files changed

+164
-20
lines changed

13 files changed

+164
-20
lines changed

DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.internald
402402
nameonly name: string ,
403403
nameonly length: BeaconBitLength ,
404404
nameonly loc: Option<TerminalLocation> := Option.None ,
405-
nameonly style: Option<BeaconStyle> := Option.None
405+
nameonly style: Option<BeaconStyle> := Option.None ,
406+
nameonly numberOfBuckets: Option<BucketCount> := Option.None
406407
)
407408
type StandardBeaconList = x: seq<StandardBeacon> | IsValid_StandardBeaconList(x) witness *
408409
predicate method IsValid_StandardBeaconList(x: seq<StandardBeacon>) {

DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,8 @@ structure StandardBeacon {
672672
loc : TerminalLocation,
673673
@javadoc("Optional augmented behavior.")
674674
style : BeaconStyle,
675+
@javadoc("The number of separate buckets across which this particular beacon should be divided. Ths must be no greater than the global numberOfBuckets, and can never be changed once an item containing this beacon has been written.")
676+
numberOfBuckets : BucketCount
675677
}
676678

677679
//= specification/searchable-encryption/beacons.md#compound-beacon-initialization

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: 18 additions & 6 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: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DynamoDbEncryption/runtimes/go/TestsFromDafny-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/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,15 @@ public static StandardBeacon StandardBeacon(
834834
ToDafny.BeaconStyle(nativeValue.style())
835835
)
836836
: Option.create_None(BeaconStyle._typeDescriptor());
837-
return new StandardBeacon(name, length, loc, style);
837+
Option<Integer> numberOfBuckets;
838+
numberOfBuckets =
839+
Objects.nonNull(nativeValue.numberOfBuckets())
840+
? Option.create_Some(
841+
TypeDescriptor.INT,
842+
(nativeValue.numberOfBuckets())
843+
)
844+
: Option.create_None(TypeDescriptor.INT);
845+
return new StandardBeacon(name, length, loc, style, numberOfBuckets);
838846
}
839847

840848
public static Upper Upper(

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToNative.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,11 @@ public static StandardBeacon StandardBeacon(
725725
ToNative.BeaconStyle(dafnyValue.dtor_style().dtor_value())
726726
);
727727
}
728+
if (dafnyValue.dtor_numberOfBuckets().is_Some()) {
729+
nativeBuilder.numberOfBuckets(
730+
(dafnyValue.dtor_numberOfBuckets().dtor_value())
731+
);
732+
}
728733
return nativeBuilder.build();
729734
}
730735

0 commit comments

Comments
 (0)