diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy index 6b5dd95af..812d451fb 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy @@ -35,9 +35,9 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy" | multi(multi: MultiKeyStore) datatype BeaconStyle = | partOnly(partOnly: PartOnly) - | twinned(twinned: Twinned) + | shared(shared: Shared) | asSet(asSet: AsSet) - | twinnedSet(twinnedSet: TwinnedSet) + | sharedSet(sharedSet: SharedSet) datatype BeaconVersion = | BeaconVersion ( nameonly version: VersionNumber , nameonly keyStore: AwsCryptographyKeyStoreTypes.IKeyStoreClient , @@ -336,6 +336,12 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy" nameonly versions: BeaconVersionList , nameonly writeVersion: VersionNumber ) + datatype Shared = | Shared ( + nameonly other: string + ) + datatype SharedSet = | SharedSet ( + nameonly other: string + ) datatype SignedPart = | SignedPart ( nameonly name: string , nameonly prefix: Prefix , @@ -363,12 +369,6 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy" predicate method IsValid_TerminalLocation(x: string) { ( 1 <= |x| ) } - datatype Twinned = | Twinned ( - nameonly other: string - ) - datatype TwinnedSet = | TwinnedSet ( - nameonly other: string - ) datatype Upper = | Upper ( ) diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy index 562bf0a2b..d9ca15296 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy @@ -479,25 +479,25 @@ structure PartOnly {} @javadoc("Attribute must be a Set. Beacon value will also be a Set.") structure AsSet {} -//= specification/searchable-encryption/beacons.md#twinned-initialization +//= specification/searchable-encryption/beacons.md#shared-initialization //= type=implication -//# On initialization of a Twinned, the caller MUST provide: +//# On initialization of a Shared, the caller MUST provide: //# //# * other : a beacon name @javadoc("This beacon should calculate values like another beacon, so they can be compared.") -structure Twinned { +structure Shared { @required @javadoc("Calculate beacon values as for this beacon.") other : String, } -//= specification/searchable-encryption/beacons.md#twinnedset-initialization +//= specification/searchable-encryption/beacons.md#sharedset-initialization //= type=implication -//# On initialization of a TwinnedSet, the caller MUST provide: +//# On initialization of a SharedSet, the caller MUST provide: //# //# * other : a beacon name -@javadoc("Both Twinned and AsSet.") -structure TwinnedSet { +@javadoc("Both Shared and AsSet.") +structure SharedSet { @required @javadoc("Calculate beacon values as for this beacon.") other : String, @@ -508,15 +508,15 @@ structure TwinnedSet { //# On initialization of a Beacon Style, the caller MUST provide exactly one of //# //# * a [PartOnly](#partonly-initialization) -//# * a [Twinned](#twinned-initialization) +//# * a [Shared](#shared-initialization) //# * an [AsSet](#asset-initialization) -//# * a [TwinnedSet](#twinnedset-initialization) +//# * a [SharedSet](#sharedset-initialization) union BeaconStyle { partOnly: PartOnly, - twinned: Twinned, + shared: Shared, asSet: AsSet, - twinnedSet: TwinnedSet, + sharedSet: SharedSet, } //= specification/searchable-encryption/beacons.md#encrypted-part-initialization diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/src/Beacon.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/src/Beacon.dfy index 44cd0f975..2ab32b296 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/src/Beacon.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/src/Beacon.dfy @@ -111,7 +111,7 @@ module BaseBeacon { loc : string, partOnly : bool, asSet : bool, - twin : Option + share : Option ) : (ret : Result) ensures ret.Success? ==> @@ -131,7 +131,7 @@ module BaseBeacon { termLoc, partOnly, asSet, - twin + share )) } datatype StandardBeacon = StandardBeacon ( @@ -140,7 +140,7 @@ module BaseBeacon { loc : TermLoc.TermLoc, partOnly : bool, asSet : bool, - twin : Option + share : Option ) { function method {:opaque} hash(val : Bytes, key : Bytes) : (ret : Result) @@ -155,12 +155,12 @@ module BaseBeacon { } // return the name of the hmac key to use - //= specification/searchable-encryption/beacons.md#twinned-initialization + //= specification/searchable-encryption/beacons.md#shared-initialization //# This beacon MUST calculate its [value](#beacon-value) as if it were the `other` beacon. function method keyName() : string { - if twin.Some? then - twin.value + if share.Some? then + share.value else base.name } diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/src/ConfigToInfo.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/src/ConfigToInfo.dfy index 35d1a324c..4dcd2033f 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/src/ConfigToInfo.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/src/ConfigToInfo.dfy @@ -403,31 +403,31 @@ module SearchConfigToInfo { Some(badSeq[0]) } - function method IsValidTwin(converted : I.BeaconMap, name : string, length : B.BeaconLength, twin : string) + function method IsValidShare(converted : I.BeaconMap, name : string, length : B.BeaconLength, share : string) : (ret : Result) ensures ret.Success? ==> - && twin in converted - && converted[twin].Standard? - && converted[twin].std.length == length + && share in converted + && converted[share].Standard? + && converted[share].std.length == length { - if twin in converted then - var tb := converted[twin]; + if share in converted then + var tb := converted[share]; if tb.Standard? then - if tb.std.twin.Some? then - if name == twin then - Failure(E("Beacon " + name + " is twinned to itself.")) + if tb.std.share.Some? then + if name == share then + Failure(E("Beacon " + name + " is shared to itself.")) else - Failure(E("Beacon " + name + " is twinned to " + twin + " which is in turn twinned to " + tb.std.twin.value - + ". Twin chains are not allowed.")) + Failure(E("Beacon " + name + " is shared to " + share + " which is in turn shared to " + tb.std.share.value + + ". Share chains are not allowed.")) else if tb.std.length == length then Success(true) else - Failure(E("Beacon " + name + " is twinned to " + twin + " but " + name + " has length " + Base10Int2String(length as int) - + " and " + twin + " has length " + Base10Int2String(tb.std.length as int) + ".")) + Failure(E("Beacon " + name + " is shared to " + share + " but " + name + " has length " + Base10Int2String(length as int) + + " and " + share + " has length " + Base10Int2String(tb.std.length as int) + ".")) else - Failure(E("Beacon " + name + " is twinned to " + twin + " but " + twin + " is a compound beacon.")) + Failure(E("Beacon " + name + " is shared to " + share + " but " + share + " is a compound beacon.")) else - Failure(E("Beacon " + name + " is twinned to " + twin + " which is not defined.")) + Failure(E("Beacon " + name + " is shared to " + share + " which is not defined.")) } // convert configured StandardBeacons to internal Beacons @@ -482,20 +482,20 @@ module SearchConfigToInfo { var locString := GetLocStr(beacons[0].name, beacons[0].loc); var isPartOnly := false; var isAsSet := false; - var twin : Option := None; + var share : Option := None; if beacons[0].style.Some? { match beacons[0].style.value { case partOnly(t) => isPartOnly := true; - case twinned(t) => twin := Some(t.other); + case shared(t) => share := Some(t.other); case asSet(t) => isAsSet := true; - //= specification/searchable-encryption/beacons.md#twinnedset-initialization - //# A TwinnedSet Beacon MUST behave both as [Twinned](#twinned-initialization) and [AsSet](#asset-initialization). - case twinnedSet(t) => twin := Some(t.other); isAsSet := true; + //= specification/searchable-encryption/beacons.md#sharedset-initialization + //# A SharedSet Beacon MUST behave both as [Shared](#shared-initialization) and [AsSet](#asset-initialization). + case sharedSet(t) => share := Some(t.other); isAsSet := true; } } var newBeacon :- B.MakeStandardBeacon(client, beacons[0].name, beacons[0].length as B.BeaconLength, locString, - isPartOnly, isAsSet, twin); + isPartOnly, isAsSet, share); //= specification/searchable-encryption/search-config.md#beacon-version-initialization //# Initialization MUST fail if the [terminal location](virtual.md#terminal-location) @@ -1070,18 +1070,18 @@ module SearchConfigToInfo { //# Initialization MUST fail if the configuration does not use a PartOnly in a [compound beacon](#compound-beacon). ensures |names| != 0 && I.IsPartOnly(data[names[0]]) && !ExistsInCompound(allNames, names[0], data) ==> ret.Failure? - ensures ret.Success? && 0 < |names| && data[names[0]].Standard? && data[names[0]].std.twin.Some? ==> - && var twin := data[names[0]].std.twin.value; - && IsValidTwin(data, names[0], data[names[0]].std.length, twin).Success? - //= specification/searchable-encryption/beacons.md#twinned-initialization + ensures ret.Success? && 0 < |names| && data[names[0]].Standard? && data[names[0]].std.share.Some? ==> + && var share := data[names[0]].std.share.value; + && IsValidShare(data, names[0], data[names[0]].std.length, share).Success? + //= specification/searchable-encryption/beacons.md#shared-initialization //= type=implication //# This name MUST be the name of a previously defined Standard Beacon. - && twin in data - && data[twin].Standard? - //= specification/searchable-encryption/beacons.md#twinned-initialization + && share in data + && data[share].Standard? + //= specification/searchable-encryption/beacons.md#shared-initialization //= type=implication //# This beacon's [length](#beacon-length) MUST be equal to the `other` beacon's [length](#beacon-length). - && data[twin].std.length == data[names[0]].std.length + && data[share].std.length == data[names[0]].std.length { if |names| == 0 then Success(true) @@ -1089,8 +1089,9 @@ module SearchConfigToInfo { var b := data[names[0]]; if I.IsPartOnly(b) && !ExistsInCompound(allNames, names[0], data) then Failure(E("PartOnly beacon " + names[0] + " MUST be used in a compound beacon.")) - else if b.Standard? && b.std.twin.Some? then - IsValidTwin(data, names[0], b.std.length, b.std.twin.value) + else if b.Standard? && b.std.share.Some? then + var _ :- IsValidShare(data, names[0], b.std.length, b.std.share.value); + CheckAllBeacons(names[1..], allNames, data) else CheckAllBeacons(names[1..], allNames, data) } diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/Beacon.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/Beacon.dfy index dbaff8cf5..fe463a91d 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/Beacon.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/Beacon.dfy @@ -304,90 +304,90 @@ module TestBaseBeacon { expect bv.error == E("Compound beacon compoundSet uses setBeacon which is an AsSet beacon, and therefore cannot be used in a Compound Beacon."); } - method {:test} TwinnedBadReferenceToCompound() + method {:test} SharedBadReferenceToCompound() { var version := GetLotsaBeacons(); - var twinBeacon := T.StandardBeacon(name := "twinBeacon", length := 24, loc := None, + var shareBeacon := T.StandardBeacon(name := "shareBeacon", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "NameTitle")) + T.shared(T.Shared(other := "NameTitle")) )); - var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["twinBeacon" := SE.ENCRYPT_AND_SIGN]); - version := version.(standardBeacons := version.standardBeacons + [twinBeacon]); + var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["shareBeacon" := SE.ENCRYPT_AND_SIGN]); + version := version.(standardBeacons := version.standardBeacons + [shareBeacon]); var src := GetLiteralSource([1,2,3,4,5], version); var bv := C.ConvertVersionWithSource(newConfig, version, src); expect bv.Failure?; - expect bv.error == E("Beacon twinBeacon is twinned to NameTitle but NameTitle is a compound beacon."); + expect bv.error == E("Beacon shareBeacon is shared to NameTitle but NameTitle is a compound beacon."); } - method {:test} ChainedTwin() + method {:test} ChainedShare() { var version := GetLotsaBeacons(); - var twinBeacon := T.StandardBeacon(name := "twinBeacon", length := 24, loc := None, + var shareBeacon := T.StandardBeacon(name := "shareBeacon", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "std2")) + T.shared(T.Shared(other := "std2")) )); var other := T.StandardBeacon(name := "std4", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "twinBeacon")) + T.shared(T.Shared(other := "shareBeacon")) )); - var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["twinBeacon" := SE.ENCRYPT_AND_SIGN]); - version := version.(compoundBeacons := None, standardBeacons := [std2, twinBeacon, other]); + var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["shareBeacon" := SE.ENCRYPT_AND_SIGN]); + version := version.(compoundBeacons := None, standardBeacons := [std2, shareBeacon, other]); var src := GetLiteralSource([1,2,3,4,5], version); var bv := C.ConvertVersionWithSource(newConfig, version, src); expect bv.Failure?; - expect bv.error == E("Beacon std4 is twinned to twinBeacon which is in turn twinned to std2. Twin chains are not allowed."); + expect bv.error == E("Beacon std4 is shared to shareBeacon which is in turn shared to std2. Share chains are not allowed."); } - method {:test} SelfTwin() + method {:test} SelfShare() { var version := GetLotsaBeacons(); - var twinBeacon := T.StandardBeacon(name := "twinBeacon", length := 24, loc := None, + var shareBeacon := T.StandardBeacon(name := "shareBeacon", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "twinBeacon")) + T.shared(T.Shared(other := "shareBeacon")) )); - var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["twinBeacon" := SE.ENCRYPT_AND_SIGN]); - version := version.(compoundBeacons := None, standardBeacons := [std2, twinBeacon]); + var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["shareBeacon" := SE.ENCRYPT_AND_SIGN]); + version := version.(compoundBeacons := None, standardBeacons := [std2, shareBeacon]); var src := GetLiteralSource([1,2,3,4,5], version); var bv := C.ConvertVersionWithSource(newConfig, version, src); expect bv.Failure?; print "\n", bv.error, "\n"; - expect bv.error == E("Beacon twinBeacon is twinned to itself."); + expect bv.error == E("Beacon shareBeacon is shared to itself."); } - method {:test} TwinnedBadReferenceNonExistent() + method {:test} SharedBadReferenceNonExistent() { var version := GetLotsaBeacons(); - var twinBeacon := T.StandardBeacon(name := "twinBeacon", length := 24, loc := None, + var shareBeacon := T.StandardBeacon(name := "shareBeacon", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "DoesNotExist")) + T.shared(T.Shared(other := "DoesNotExist")) )); - version := version.(standardBeacons := version.standardBeacons + [twinBeacon]); - var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["twinBeacon" := SE.ENCRYPT_AND_SIGN]); + version := version.(standardBeacons := version.standardBeacons + [shareBeacon]); + var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["shareBeacon" := SE.ENCRYPT_AND_SIGN]); var src := GetLiteralSource([1,2,3,4,5], version); var bv := C.ConvertVersionWithSource(newConfig, version, src); expect bv.Failure?; - expect bv.error == E("Beacon twinBeacon is twinned to DoesNotExist which is not defined."); + expect bv.error == E("Beacon shareBeacon is shared to DoesNotExist which is not defined."); } - method {:test} TwinnedBadLength() + method {:test} SharedBadLength() { var version := GetLotsaBeacons(); - var twinBeacon := T.StandardBeacon(name := "twinBeacon", length := 23, loc := None, + var shareBeacon := T.StandardBeacon(name := "shareBeacon", length := 23, loc := None, style := Some( - T.twinned(T.Twinned(other := "std2")) + T.shared(T.Shared(other := "std2")) )); - version := version.(standardBeacons := version.standardBeacons + [twinBeacon]); - var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["twinBeacon" := SE.ENCRYPT_AND_SIGN]); + version := version.(standardBeacons := version.standardBeacons + [shareBeacon]); + var newConfig := FullTableConfig.(attributeActionsOnEncrypt := FullTableConfig.attributeActionsOnEncrypt["shareBeacon" := SE.ENCRYPT_AND_SIGN]); var src := GetLiteralSource([1,2,3,4,5], version); var bv := C.ConvertVersionWithSource(newConfig, version, src); expect bv.Failure?; - expect bv.error == E("Beacon twinBeacon is twinned to std2 but twinBeacon has length 23 and std2 has length 24."); + expect bv.error == E("Beacon shareBeacon is shared to std2 but shareBeacon has length 23 and std2 has length 24."); } method {:test} TestPartOnlyNotStored() @@ -459,7 +459,7 @@ module TestBaseBeacon { expect badQuery.error == E("Field partOnly is encrypted, and has a PartOnly beacon, and so can only be used as part of a compound beacon."); } - method {:test} TestTwinSameBeacon() + method {:test} TestShareSameBeacon() { var MyItem : DDB.AttributeMap := map[ "std2" := DDB.AttributeValue.S("abc"), @@ -486,7 +486,7 @@ module TestBaseBeacon { partBeacon := T.StandardBeacon(name := "partOnly", length := 24, loc := None, style := Some( - T.twinned(T.Twinned(other := "std2")) + T.shared(T.Shared(other := "std2")) )); newVersion := version.( standardBeacons := version.standardBeacons + [partBeacon] @@ -494,7 +494,7 @@ module TestBaseBeacon { bv :- expect C.ConvertVersionWithSource(newConfig, newVersion, src); goodAttrs :- expect bv.GenerateEncryptedBeacons(MyItem, DontUseKeyId); - //= specification/searchable-encryption/beacons.md#twinned-initialization + //= specification/searchable-encryption/beacons.md#shared-initialization //= type=test //# This beacon MUST calculate its [value](#beacon-value) as if it were the `other` beacon. expect goodAttrs == map[ @@ -604,7 +604,7 @@ module TestBaseBeacon { expect badAttrs.error == E("Beacon partOnly has style AsSet, but attribute has type S."); } - method {:test} TestTwinnedSet() + method {:test} TestSharedSet() { var MyItem : DDB.AttributeMap := map[ "std2" := DDB.AttributeValue.S("abc"), @@ -615,7 +615,7 @@ module TestBaseBeacon { expect version.compoundBeacons.Some?; var partBeacon := T.StandardBeacon(name := "partOnly", length := 24, loc := None, style := Some( - T.twinnedSet(T.TwinnedSet(other := "std2")) + T.sharedSet(T.SharedSet(other := "std2")) )); var newVersion := version.( standardBeacons := version.standardBeacons + [partBeacon] @@ -631,9 +631,9 @@ module TestBaseBeacon { print "\n", goodAttrs.error, "\n"; } - //= specification/searchable-encryption/beacons.md#twinnedset-initialization + //= specification/searchable-encryption/beacons.md#sharedset-initialization //= type=test - //# A TwinnedSet Beacon MUST behave both as [Twinned](#twinned-initialization) and [AsSet](#asset-initialization). + //# A SharedSet Beacon MUST behave both as [Shared](#shared-initialization) and [AsSet](#asset-initialization). expect goodAttrs.Success?; expect goodAttrs.value == map[ "aws_dbe_b_std2" := DDB.AttributeValue.S("51e1da"), diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java index dffe86165..b3e5ccf18 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java @@ -46,11 +46,11 @@ import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.PartOnly; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.PlaintextOverride; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SearchConfig; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SignedPart; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SingleKeyStore; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.StandardBeacon; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Upper; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.VirtualField; import software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.VirtualPart; @@ -358,6 +358,20 @@ public static SearchConfig SearchConfig( return new SearchConfig(versions, writeVersion); } + public static Shared Shared( + software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Shared nativeValue) { + DafnySequence other; + other = software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(nativeValue.other()); + return new Shared(other); + } + + public static SharedSet SharedSet( + software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SharedSet nativeValue) { + DafnySequence other; + other = software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(nativeValue.other()); + return new SharedSet(other); + } + public static SignedPart SignedPart( software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SignedPart nativeValue) { DafnySequence name; @@ -397,20 +411,6 @@ public static StandardBeacon StandardBeacon( return new StandardBeacon(name, length, loc, style); } - public static Twinned Twinned( - software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Twinned nativeValue) { - DafnySequence other; - other = software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(nativeValue.other()); - return new Twinned(other); - } - - public static TwinnedSet TwinnedSet( - software.amazon.cryptography.dbencryptionsdk.dynamodb.model.TwinnedSet nativeValue) { - DafnySequence other; - other = software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(nativeValue.other()); - return new TwinnedSet(other); - } - public static Upper Upper( software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Upper nativeValue) { return new Upper(); @@ -494,14 +494,14 @@ public static BeaconStyle BeaconStyle( if (Objects.nonNull(nativeValue.partOnly())) { return BeaconStyle.create_partOnly(ToDafny.PartOnly(nativeValue.partOnly())); } - if (Objects.nonNull(nativeValue.twinned())) { - return BeaconStyle.create_twinned(ToDafny.Twinned(nativeValue.twinned())); + if (Objects.nonNull(nativeValue.shared())) { + return BeaconStyle.create_shared(ToDafny.Shared(nativeValue.shared())); } if (Objects.nonNull(nativeValue.asSet())) { return BeaconStyle.create_asSet(ToDafny.AsSet(nativeValue.asSet())); } - if (Objects.nonNull(nativeValue.twinnedSet())) { - return BeaconStyle.create_twinnedSet(ToDafny.TwinnedSet(nativeValue.twinnedSet())); + if (Objects.nonNull(nativeValue.sharedSet())) { + return BeaconStyle.create_sharedSet(ToDafny.SharedSet(nativeValue.sharedSet())); } throw new IllegalArgumentException("Cannot convert " + nativeValue + " to software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle."); } diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToNative.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToNative.java index d0b29eb71..ee31ab4eb 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToNative.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToNative.java @@ -47,11 +47,11 @@ import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.PartOnly; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.PlaintextOverride; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SearchConfig; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Shared; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SharedSet; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SignedPart; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SingleKeyStore; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.StandardBeacon; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Twinned; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.TwinnedSet; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Upper; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.VirtualField; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.VirtualPart; @@ -342,6 +342,20 @@ public static SearchConfig SearchConfig( return nativeBuilder.build(); } + public static Shared Shared( + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared dafnyValue) { + Shared.Builder nativeBuilder = Shared.builder(); + nativeBuilder.other(software.amazon.smithy.dafny.conversion.ToNative.Simple.String(dafnyValue.dtor_other())); + return nativeBuilder.build(); + } + + public static SharedSet SharedSet( + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet dafnyValue) { + SharedSet.Builder nativeBuilder = SharedSet.builder(); + nativeBuilder.other(software.amazon.smithy.dafny.conversion.ToNative.Simple.String(dafnyValue.dtor_other())); + return nativeBuilder.build(); + } + public static SignedPart SignedPart( software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SignedPart dafnyValue) { SignedPart.Builder nativeBuilder = SignedPart.builder(); @@ -375,20 +389,6 @@ public static StandardBeacon StandardBeacon( return nativeBuilder.build(); } - public static Twinned Twinned( - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned dafnyValue) { - Twinned.Builder nativeBuilder = Twinned.builder(); - nativeBuilder.other(software.amazon.smithy.dafny.conversion.ToNative.Simple.String(dafnyValue.dtor_other())); - return nativeBuilder.build(); - } - - public static TwinnedSet TwinnedSet( - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet dafnyValue) { - TwinnedSet.Builder nativeBuilder = TwinnedSet.builder(); - nativeBuilder.other(software.amazon.smithy.dafny.conversion.ToNative.Simple.String(dafnyValue.dtor_other())); - return nativeBuilder.build(); - } - public static Upper Upper( software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Upper dafnyValue) { Upper.Builder nativeBuilder = Upper.builder(); @@ -459,14 +459,14 @@ public static BeaconStyle BeaconStyle( if (dafnyValue.is_partOnly()) { nativeBuilder.partOnly(ToNative.PartOnly(dafnyValue.dtor_partOnly())); } - if (dafnyValue.is_twinned()) { - nativeBuilder.twinned(ToNative.Twinned(dafnyValue.dtor_twinned())); + if (dafnyValue.is_shared()) { + nativeBuilder.shared(ToNative.Shared(dafnyValue.dtor_shared())); } if (dafnyValue.is_asSet()) { nativeBuilder.asSet(ToNative.AsSet(dafnyValue.dtor_asSet())); } - if (dafnyValue.is_twinnedSet()) { - nativeBuilder.twinnedSet(ToNative.TwinnedSet(dafnyValue.dtor_twinnedSet())); + if (dafnyValue.is_sharedSet()) { + nativeBuilder.sharedSet(ToNative.SharedSet(dafnyValue.dtor_sharedSet())); } return nativeBuilder.build(); } diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/BeaconStyle.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/BeaconStyle.java index 280afaa4c..faf05ebea 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/BeaconStyle.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/BeaconStyle.java @@ -14,7 +14,7 @@ public class BeaconStyle { /** * This beacon should calculate values like another beacon, so they can be compared. */ - private final Twinned twinned; + private final Shared shared; /** * Attribute must be a Set. Beacon value will also be a Set. @@ -22,15 +22,15 @@ public class BeaconStyle { private final AsSet asSet; /** - * Both Twinned and AsSet. + * Both Shared and AsSet. */ - private final TwinnedSet twinnedSet; + private final SharedSet sharedSet; protected BeaconStyle(BuilderImpl builder) { this.partOnly = builder.partOnly(); - this.twinned = builder.twinned(); + this.shared = builder.shared(); this.asSet = builder.asSet(); - this.twinnedSet = builder.twinnedSet(); + this.sharedSet = builder.sharedSet(); } /** @@ -43,8 +43,8 @@ public PartOnly partOnly() { /** * @return This beacon should calculate values like another beacon, so they can be compared. */ - public Twinned twinned() { - return this.twinned; + public Shared shared() { + return this.shared; } /** @@ -55,10 +55,10 @@ public AsSet asSet() { } /** - * @return Both Twinned and AsSet. + * @return Both Shared and AsSet. */ - public TwinnedSet twinnedSet() { - return this.twinnedSet; + public SharedSet sharedSet() { + return this.sharedSet; } public Builder toBuilder() { @@ -81,14 +81,14 @@ public interface Builder { PartOnly partOnly(); /** - * @param twinned This beacon should calculate values like another beacon, so they can be compared. + * @param shared This beacon should calculate values like another beacon, so they can be compared. */ - Builder twinned(Twinned twinned); + Builder shared(Shared shared); /** * @return This beacon should calculate values like another beacon, so they can be compared. */ - Twinned twinned(); + Shared shared(); /** * @param asSet Attribute must be a Set. Beacon value will also be a Set. @@ -101,14 +101,14 @@ public interface Builder { AsSet asSet(); /** - * @param twinnedSet Both Twinned and AsSet. + * @param sharedSet Both Shared and AsSet. */ - Builder twinnedSet(TwinnedSet twinnedSet); + Builder sharedSet(SharedSet sharedSet); /** - * @return Both Twinned and AsSet. + * @return Both Shared and AsSet. */ - TwinnedSet twinnedSet(); + SharedSet sharedSet(); BeaconStyle build(); } @@ -116,20 +116,20 @@ public interface Builder { static class BuilderImpl implements Builder { protected PartOnly partOnly; - protected Twinned twinned; + protected Shared shared; protected AsSet asSet; - protected TwinnedSet twinnedSet; + protected SharedSet sharedSet; protected BuilderImpl() { } protected BuilderImpl(BeaconStyle model) { this.partOnly = model.partOnly(); - this.twinned = model.twinned(); + this.shared = model.shared(); this.asSet = model.asSet(); - this.twinnedSet = model.twinnedSet(); + this.sharedSet = model.sharedSet(); } public Builder partOnly(PartOnly partOnly) { @@ -141,13 +141,13 @@ public PartOnly partOnly() { return this.partOnly; } - public Builder twinned(Twinned twinned) { - this.twinned = twinned; + public Builder shared(Shared shared) { + this.shared = shared; return this; } - public Twinned twinned() { - return this.twinned; + public Shared shared() { + return this.shared; } public Builder asSet(AsSet asSet) { @@ -159,13 +159,13 @@ public AsSet asSet() { return this.asSet; } - public Builder twinnedSet(TwinnedSet twinnedSet) { - this.twinnedSet = twinnedSet; + public Builder sharedSet(SharedSet sharedSet) { + this.sharedSet = sharedSet; return this; } - public TwinnedSet twinnedSet() { - return this.twinnedSet; + public SharedSet sharedSet() { + return this.sharedSet; } public BeaconStyle build() { @@ -176,7 +176,7 @@ public BeaconStyle build() { } private boolean onlyOneNonNull() { - Object[] allValues = {this.partOnly, this.twinned, this.asSet, this.twinnedSet}; + Object[] allValues = {this.partOnly, this.shared, this.asSet, this.sharedSet}; boolean haveOneNonNull = false; for (Object o : allValues) { if (Objects.nonNull(o)) { diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Twinned.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Shared.java similarity index 88% rename from DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Twinned.java rename to DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Shared.java index a7f91e640..4be82055a 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Twinned.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/Shared.java @@ -8,13 +8,13 @@ /** * This beacon should calculate values like another beacon, so they can be compared. */ -public class Twinned { +public class Shared { /** * Calculate beacon values as for this beacon. */ private final String other; - protected Twinned(BuilderImpl builder) { + protected Shared(BuilderImpl builder) { this.other = builder.other(); } @@ -44,7 +44,7 @@ public interface Builder { */ String other(); - Twinned build(); + Shared build(); } static class BuilderImpl implements Builder { @@ -53,7 +53,7 @@ static class BuilderImpl implements Builder { protected BuilderImpl() { } - protected BuilderImpl(Twinned model) { + protected BuilderImpl(Shared model) { this.other = model.other(); } @@ -66,11 +66,11 @@ public String other() { return this.other; } - public Twinned build() { + public Shared build() { if (Objects.isNull(this.other())) { throw new IllegalArgumentException("Missing value for required field `other`"); } - return new Twinned(this); + return new Shared(this); } } } diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/TwinnedSet.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/SharedSet.java similarity index 85% rename from DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/TwinnedSet.java rename to DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/SharedSet.java index 9c382e11c..9b51d0c98 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/TwinnedSet.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/SharedSet.java @@ -6,15 +6,15 @@ import java.util.Objects; /** - * Both Twinned and AsSet. + * Both Shared and AsSet. */ -public class TwinnedSet { +public class SharedSet { /** * Calculate beacon values as for this beacon. */ private final String other; - protected TwinnedSet(BuilderImpl builder) { + protected SharedSet(BuilderImpl builder) { this.other = builder.other(); } @@ -44,7 +44,7 @@ public interface Builder { */ String other(); - TwinnedSet build(); + SharedSet build(); } static class BuilderImpl implements Builder { @@ -53,7 +53,7 @@ static class BuilderImpl implements Builder { protected BuilderImpl() { } - protected BuilderImpl(TwinnedSet model) { + protected BuilderImpl(SharedSet model) { this.other = model.other(); } @@ -66,11 +66,11 @@ public String other() { return this.other; } - public TwinnedSet build() { + public SharedSet build() { if (Objects.isNull(this.other())) { throw new IllegalArgumentException("Missing value for required field `other`"); } - return new TwinnedSet(this); + return new SharedSet(this); } } } diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/BeaconStyle.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/BeaconStyle.cs index a88aa4f87..cba389c79 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/BeaconStyle.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/BeaconStyle.cs @@ -8,9 +8,9 @@ namespace AWS.Cryptography.DbEncryptionSDK.DynamoDb public class BeaconStyle { private AWS.Cryptography.DbEncryptionSDK.DynamoDb.PartOnly _partOnly; - private AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned _twinned; + private AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared _shared; private AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet _asSet; - private AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet _twinnedSet; + private AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet _sharedSet; public AWS.Cryptography.DbEncryptionSDK.DynamoDb.PartOnly PartOnly { get { return this._partOnly; } @@ -20,14 +20,14 @@ public bool IsSetPartOnly() { return this._partOnly != null; } - public AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned Twinned + public AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared Shared { - get { return this._twinned; } - set { this._twinned = value; } + get { return this._shared; } + set { this._shared = value; } } - public bool IsSetTwinned() + public bool IsSetShared() { - return this._twinned != null; + return this._shared != null; } public AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet AsSet { @@ -38,21 +38,21 @@ public bool IsSetAsSet() { return this._asSet != null; } - public AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet TwinnedSet + public AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet SharedSet { - get { return this._twinnedSet; } - set { this._twinnedSet = value; } + get { return this._sharedSet; } + set { this._sharedSet = value; } } - public bool IsSetTwinnedSet() + public bool IsSetSharedSet() { - return this._twinnedSet != null; + return this._sharedSet != null; } public void Validate() { var numberOfPropertiesSet = Convert.ToUInt16(IsSetPartOnly()) + - Convert.ToUInt16(IsSetTwinned()) + + Convert.ToUInt16(IsSetShared()) + Convert.ToUInt16(IsSetAsSet()) + - Convert.ToUInt16(IsSetTwinnedSet()); + Convert.ToUInt16(IsSetSharedSet()); if (numberOfPropertiesSet == 0) throw new System.ArgumentException("No union value set"); if (numberOfPropertiesSet > 1) throw new System.ArgumentException("Multiple union values set"); diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/OpaqueError.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/OpaqueError.cs index 6787de186..998c141f5 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/OpaqueError.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/OpaqueError.cs @@ -10,7 +10,7 @@ public class OpaqueError : Exception public readonly object obj; public OpaqueError(Exception ex) : base("OpaqueError:", ex) { this.obj = ex; } public OpaqueError() : base("Unknown Unexpected Error") { } - public OpaqueError(object obj) : base("Opaque obj is not an Exception.") { this.obj = obj; } + public OpaqueError(object obj) : base(obj is Exception ? "OpaqueError:" : "Opaque obj is not an Exception.", obj as Exception) { this.obj = obj; } } } diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Twinned.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Shared.cs similarity index 96% rename from DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Twinned.cs rename to DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Shared.cs index 5f1b03bc5..b5de3da40 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Twinned.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/Shared.cs @@ -5,7 +5,7 @@ using AWS.Cryptography.DbEncryptionSDK.DynamoDb; namespace AWS.Cryptography.DbEncryptionSDK.DynamoDb { - public class Twinned + public class Shared { private string _other; public string Other diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TwinnedSet.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/SharedSet.cs similarity index 96% rename from DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TwinnedSet.cs rename to DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/SharedSet.cs index f62dd3c9a..34676cae4 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TwinnedSet.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/SharedSet.cs @@ -5,7 +5,7 @@ using AWS.Cryptography.DbEncryptionSDK.DynamoDb; namespace AWS.Cryptography.DbEncryptionSDK.DynamoDb { - public class TwinnedSet + public class SharedSet { private string _other; public string Other diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs index 6d6acafb9..2e09859f6 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs @@ -79,9 +79,9 @@ internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle FromDafny_ converted.PartOnly = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M8_partOnly(concrete.dtor_partOnly); return converted; } - if (value.is_twinned) + if (value.is_shared) { - converted.Twinned = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(concrete.dtor_twinned); + converted.Shared = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(concrete.dtor_shared); return converted; } if (value.is_asSet) @@ -89,9 +89,9 @@ internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle FromDafny_ converted.AsSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(concrete.dtor_asSet); return converted; } - if (value.is_twinnedSet) + if (value.is_sharedSet) { - converted.TwinnedSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(concrete.dtor_twinnedSet); + converted.SharedSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(concrete.dtor_sharedSet); return converted; } throw new System.ArgumentException("Invalid AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle state"); @@ -102,17 +102,17 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_partOnly(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M8_partOnly(value.PartOnly)); } - if (value.IsSetTwinned()) + if (value.IsSetShared()) { - return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_twinned(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(value.Twinned)); + return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_shared(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(value.Shared)); } if (value.IsSetAsSet()) { return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_asSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(value.AsSet)); } - if (value.IsSetTwinnedSet()) + if (value.IsSetSharedSet()) { - return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_twinnedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(value.TwinnedSet)); + return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_sharedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(value.SharedSet)); } throw new System.ArgumentException("Invalid AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle state"); } @@ -307,13 +307,13 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S8_PartOnly(value); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared value) { - return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(value); + return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(value); } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared value) { - return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(value); + return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(value); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IAsSet value) { @@ -323,13 +323,13 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S5_AsSet(value); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet value) { - return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(value); + return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(value); } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet value) { - return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(value); + return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(value); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.IDynamoDbKeyBranchKeyIdSupplier FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S48_CreateDynamoDbEncryptionBranchKeyIdSupplierInput__M25_ddbKeyBranchKeyIdSupplier(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.IDynamoDbKeyBranchKeyIdSupplier value) { @@ -465,14 +465,14 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.PartOnly(); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared value) { - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(concrete._other); return converted; + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(concrete._other); return converted; } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared value) { - return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(value.Other)); + return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(value.Other)); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S5_AsSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IAsSet value) { @@ -483,14 +483,14 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.AsSet(); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet value) { - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(concrete._other); return converted; + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(concrete._other); return converted; } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet value) { - return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(value.Other)); + return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(value.Other)); } public static AWS.Cryptography.DbEncryptionSDK.DynamoDb.IDynamoDbKeyBranchKeyIdSupplier FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S39_DynamoDbKeyBranchKeyIdSupplierReference(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.IDynamoDbKeyBranchKeyIdSupplier value) { @@ -657,19 +657,19 @@ internal static AWS.Cryptography.MaterialProviders.CacheType FromDafny_N3_aws__N { return value == null ? Wrappers_Compile.Option.create_None() : Wrappers_Compile.Option.create_Some(ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S9_CacheType((AWS.Cryptography.MaterialProviders.CacheType)value)); } - internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(Dafny.ISequence value) + internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(Dafny.ISequence value) { return FromDafny_N6_smithy__N3_api__S6_String(value); } - internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(string value) + internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(string value) { return ToDafny_N6_smithy__N3_api__S6_String(value); } - internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(Dafny.ISequence value) + internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(Dafny.ISequence value) { return FromDafny_N6_smithy__N3_api__S6_String(value); } - internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(string value) + internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(string value) { return ToDafny_N6_smithy__N3_api__S6_String(value); } @@ -908,15 +908,15 @@ internal static software.amazon.cryptography.services.dynamodb.internaldafny.typ { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_B(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M1_B(value.B)); } - if (!value.SS.Any()) + if (value.SS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_SS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_SS(value.SS)); } - if (!value.NS.Any()) + if (value.NS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_NS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_NS(value.NS)); } - if (!value.BS.Any()) + if (value.BS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_BS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_BS(value.BS)); } @@ -1357,22 +1357,22 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph { switch (value) { - 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_ComAmazonawsDynamodb dafnyVal: return Com.Amazonaws.Dynamodb.TypeConversion.FromDafny_CommonError( dafnyVal._ComAmazonawsDynamodb ); - 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_AwsCryptographyMaterialProviders dafnyVal: 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_DynamoDbEncryptionException dafnyVal: return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S27_DynamoDbEncryptionException(dafnyVal); case software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Error_CollectionOfErrors dafnyVal: diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/OpaqueError.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/OpaqueError.cs index 152296e4c..d1e66e394 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/OpaqueError.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/OpaqueError.cs @@ -10,7 +10,7 @@ public class OpaqueError : Exception public readonly object obj; public OpaqueError(Exception ex) : base("OpaqueError:", ex) { this.obj = ex; } public OpaqueError() : base("Unknown Unexpected Error") { } - public OpaqueError(object obj) : base("Opaque obj is not an Exception.") { this.obj = obj; } + public OpaqueError(object obj) : base(obj is Exception ? "OpaqueError:" : "Opaque obj is not an Exception.", obj as Exception) { this.obj = obj; } } } diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs index f12670b4c..03b0f0065 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs @@ -3175,15 +3175,15 @@ internal static software.amazon.cryptography.services.dynamodb.internaldafny.typ { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_B(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M1_B(value.B)); } - if (!value.SS.Any()) + if (value.SS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_SS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_SS(value.SS)); } - if (!value.NS.Any()) + if (value.NS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_NS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_NS(value.NS)); } - if (!value.BS.Any()) + if (value.BS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_BS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_BS(value.BS)); } @@ -5703,9 +5703,9 @@ internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle FromDafny_ converted.PartOnly = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M8_partOnly(concrete.dtor_partOnly); return converted; } - if (value.is_twinned) + if (value.is_shared) { - converted.Twinned = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(concrete.dtor_twinned); + converted.Shared = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(concrete.dtor_shared); return converted; } if (value.is_asSet) @@ -5713,9 +5713,9 @@ internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle FromDafny_ converted.AsSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(concrete.dtor_asSet); return converted; } - if (value.is_twinnedSet) + if (value.is_sharedSet) { - converted.TwinnedSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(concrete.dtor_twinnedSet); + converted.SharedSet = FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(concrete.dtor_sharedSet); return converted; } throw new System.ArgumentException("Invalid AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle state"); @@ -5726,17 +5726,17 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_partOnly(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M8_partOnly(value.PartOnly)); } - if (value.IsSetTwinned()) + if (value.IsSetShared()) { - return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_twinned(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(value.Twinned)); + return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_shared(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(value.Shared)); } if (value.IsSetAsSet()) { return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_asSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(value.AsSet)); } - if (value.IsSetTwinnedSet()) + if (value.IsSetSharedSet()) { - return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_twinnedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(value.TwinnedSet)); + return software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.BeaconStyle.create_sharedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(value.SharedSet)); } throw new System.ArgumentException("Invalid AWS.Cryptography.DbEncryptionSDK.DynamoDb.BeaconStyle state"); } @@ -5820,13 +5820,13 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S8_PartOnly(value); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared value) { - return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(value); + return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(value); } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M7_twinned(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M6_shared(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared value) { - return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(value); + return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(value); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M5_asSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IAsSet value) { @@ -5836,13 +5836,13 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda { return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S5_AsSet(value); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet value) { - return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(value); + return FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(value); } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M10_twinnedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_BeaconStyle__M9_sharedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet value) { - return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(value); + return ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(value); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Constructor FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S15_ConstructorList__M6_member(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IConstructor value) { @@ -5922,14 +5922,14 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.PartOnly(); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared value) { - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(concrete._other); return converted; + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(concrete._other); return converted; } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinned ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Twinned value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IShared ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared(AWS.Cryptography.DbEncryptionSDK.DynamoDb.Shared value) { - return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Twinned(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(value.Other)); + return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.Shared(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(value.Other)); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.AsSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S5_AsSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IAsSet value) { @@ -5940,14 +5940,14 @@ internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internalda return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.AsSet(); } - internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet value) + internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet value) { - software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(concrete._other); return converted; + software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet concrete = (software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet)value; AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet converted = new AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet(); converted.Other = (string)FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(concrete._other); return converted; } - internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ITwinnedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.TwinnedSet value) + internal static software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ISharedSet ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet(AWS.Cryptography.DbEncryptionSDK.DynamoDb.SharedSet value) { - return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.TwinnedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(value.Other)); + return new software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.SharedSet(ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(value.Other)); } internal static AWS.Cryptography.DbEncryptionSDK.DynamoDb.Constructor FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S11_Constructor(software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._IConstructor value) { @@ -6064,19 +6064,19 @@ internal static int ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S18 { return ToDafny_N3_aws__N12_cryptography__N17_materialProviders__S14_CountingNumber(value); } - internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(Dafny.ISequence value) + internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(Dafny.ISequence value) { return FromDafny_N6_smithy__N3_api__S6_String(value); } - internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S7_Twinned__M5_other(string value) + internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S6_Shared__M5_other(string value) { return ToDafny_N6_smithy__N3_api__S6_String(value); } - internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(Dafny.ISequence value) + internal static string FromDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(Dafny.ISequence value) { return FromDafny_N6_smithy__N3_api__S6_String(value); } - internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S10_TwinnedSet__M5_other(string value) + internal static Dafny.ISequence ToDafny_N3_aws__N12_cryptography__N15_dbEncryptionSdk__N8_dynamoDb__S9_SharedSet__M5_other(string value) { return ToDafny_N6_smithy__N3_api__S6_String(value); } @@ -6483,10 +6483,6 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph { switch (value) { - 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 @@ -6495,13 +6491,17 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph return AWS.Cryptography.DbEncryptionSDK.DynamoDb.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyDbEncryptionSdkDynamoDb ); + 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_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_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/OpaqueError.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/OpaqueError.cs index 486fdba1d..9a5c3d35e 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/OpaqueError.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/OpaqueError.cs @@ -10,7 +10,7 @@ public class OpaqueError : Exception public readonly object obj; public OpaqueError(Exception ex) : base("OpaqueError:", ex) { this.obj = ex; } public OpaqueError() : base("Unknown Unexpected Error") { } - public OpaqueError(object obj) : base("Opaque obj is not an Exception.") { this.obj = obj; } + public OpaqueError(object obj) : base(obj is Exception ? "OpaqueError:" : "Opaque obj is not an Exception.", obj as Exception) { this.obj = obj; } } } diff --git a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs index 6241d55a7..3d320c863 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs @@ -527,15 +527,15 @@ internal static software.amazon.cryptography.services.dynamodb.internaldafny.typ { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_B(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M1_B(value.B)); } - if (!value.SS.Any()) + if (value.SS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_SS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_SS(value.SS)); } - if (!value.NS.Any()) + if (value.NS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_NS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_NS(value.NS)); } - if (!value.BS.Any()) + if (value.BS.Any()) { return software.amazon.cryptography.services.dynamodb.internaldafny.types.AttributeValue.create_BS(ToDafny_N3_com__N9_amazonaws__N8_dynamodb__S14_AttributeValue__M2_BS(value.BS)); } @@ -906,25 +906,25 @@ public static System.Exception FromDafny_CommonError(software.amazon.cryptograph { switch (value) { - case software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.Error_AwsCryptographyDbEncryptionSdkDynamoDb dafnyVal: - return AWS.Cryptography.DbEncryptionSDK.DynamoDb.TypeConversion.FromDafny_CommonError( - dafnyVal._AwsCryptographyDbEncryptionSdkDynamoDb - ); case software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types.Error_AwsCryptographyMaterialProviders dafnyVal: 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_AwsCryptographyDbEncryptionSdkDynamoDb dafnyVal: + return AWS.Cryptography.DbEncryptionSDK.DynamoDb.TypeConversion.FromDafny_CommonError( + dafnyVal._AwsCryptographyDbEncryptionSdkDynamoDb + ); + 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_AwsCryptographyPrimitives dafnyVal: return AWS.Cryptography.Primitives.TypeConversion.FromDafny_CommonError( dafnyVal._AwsCryptographyPrimitives ); - 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_AwsCryptographyDbEncryptionSdkStructuredEncryption dafnyVal: + return AWS.Cryptography.DbEncryptionSDK.StructuredEncryption.TypeConversion.FromDafny_CommonError( + dafnyVal._AwsCryptographyDbEncryptionSdkStructuredEncryption ); 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/DynamoDbEncryption/runtimes/net/Generated/StructuredEncryption/OpaqueError.cs b/DynamoDbEncryption/runtimes/net/Generated/StructuredEncryption/OpaqueError.cs index 057e17dfd..40ca05b66 100644 --- a/DynamoDbEncryption/runtimes/net/Generated/StructuredEncryption/OpaqueError.cs +++ b/DynamoDbEncryption/runtimes/net/Generated/StructuredEncryption/OpaqueError.cs @@ -10,7 +10,7 @@ public class OpaqueError : Exception public readonly object obj; public OpaqueError(Exception ex) : base("OpaqueError:", ex) { this.obj = ex; } public OpaqueError() : base("Unknown Unexpected Error") { } - public OpaqueError(object obj) : base("Opaque obj is not an Exception.") { this.obj = obj; } + public OpaqueError(object obj) : base(obj is Exception ? "OpaqueError:" : "Opaque obj is not an Exception.", obj as Exception) { this.obj = obj; } } } diff --git a/Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/BeaconStylesSearchableEncryptionExample.java b/Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/BeaconStylesSearchableEncryptionExample.java index 58a138d84..d3ec132e8 100644 --- a/Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/BeaconStylesSearchableEncryptionExample.java +++ b/Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/searchableencryption/BeaconStylesSearchableEncryptionExample.java @@ -20,8 +20,8 @@ import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.BeaconVersion; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.CompoundBeacon; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.BeaconStyle; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.TwinnedSet; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Twinned; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.SharedSet; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Shared; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.Constructor; import software.amazon.cryptography.dbencryptionsdk.dynamodb.model.ConstructorPart; @@ -90,14 +90,14 @@ public static void PutItemQueryItemWithBeaconStyles(String ddbTableName, String // 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. StandardBeacon basketBeacon = StandardBeacon.builder() .name("basket") .length(30) .style( BeaconStyle.builder() - .twinnedSet(TwinnedSet.builder().other("fruit").build()) + .sharedSet(SharedSet.builder().other("fruit").build()) .build() ) .build(); @@ -105,13 +105,13 @@ public static void PutItemQueryItemWithBeaconStyles(String ddbTableName, String // 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`. StandardBeacon dessertBeacon = StandardBeacon.builder() .name("dessert") .length(30) .style( BeaconStyle.builder() - .twinned(Twinned.builder().other("fruit").build()) + .shared(Shared.builder().other("fruit").build()) .build() ) .build(); @@ -302,7 +302,7 @@ public static void PutItemQueryItemWithBeaconStyles(String ddbTableName, String assert scanResponse.items().size() == 1; assert scanResponse.items().get(0).equals(item2); - // 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 = ScanRequest.builder() .tableName(ddbTableName) .filterExpression("dessert = fruit") diff --git a/specification/searchable-encryption/beacons.md b/specification/searchable-encryption/beacons.md index bbae8e0b1..e401fb2fd 100644 --- a/specification/searchable-encryption/beacons.md +++ b/specification/searchable-encryption/beacons.md @@ -299,9 +299,9 @@ Initialization MUST fail if two standard beacons are configured with the same lo On initialization of a Beacon Style, the caller MUST provide exactly one of * a [PartOnly](#partonly-initialization) - * a [Twinned](#twinned-initialization) + * a [Shared](#shared-initialization) * an [AsSet](#asset-initialization) - * a [TwinnedSet](#twinnedset-initialization) + * a [SharedSet](#sharedset-initialization) ### PartOnly Initialization @@ -325,9 +325,9 @@ and that attribute is not of type Set. * The Standard Beacon MUST be stored in the item as a Set, comprised of the [beacon values](#beacon-value) of all the elements in the original Set. -### Twinned Initialization +### Shared Initialization -On initialization of a Twinned, the caller MUST provide: +On initialization of a Shared, the caller MUST provide: * other : a beacon name @@ -337,13 +337,13 @@ This beacon's [length](#beacon-length) MUST be equal to the `other` beacon's [le This beacon MUST calculate its [value](#beacon-value) as if it were the `other` beacon. -### TwinnedSet Initialization +### SharedSet Initialization -On initialization of a TwinnedSet, the caller MUST provide: +On initialization of a SharedSet, the caller MUST provide: * other : a beacon name -A TwinnedSet Beacon MUST behave both as [Twinned](#twinned-initialization) and [AsSet](#asset-initialization). +A SharedSet Beacon MUST behave both as [Shared](#shared-initialization) and [AsSet](#asset-initialization). ### Compound Beacon Initialization