Skip to content

Commit beff849

Browse files
committed
merge main
2 parents 576e13e + 04a8eb2 commit beff849

File tree

8 files changed

+20
-9
lines changed

8 files changed

+20
-9
lines changed

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencry
1313
static method {:extern} Build(encryptorConfig: Types.DynamoDbItemEncryptorConfig)
1414
returns (output: Result<Option<InternalLegacyOverride>, Types.Error>)
1515

16-
const policy: DDBE.LegacyPolicy
16+
const {:extern} policy: DDBE.LegacyPolicy
1717

1818
method {:extern} EncryptItem(input: Types.EncryptItemInput)
1919
returns (output: Result<Types.EncryptItemOutput, Types.Error>)

DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@ namespace software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.in
88

99
public partial class InternalLegacyOverride
1010
{
11-
11+
public software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ILegacyPolicy _policy
12+
{
13+
get => software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types.LegacyPolicy.create_FORBID__LEGACY__ENCRYPT__FORBID__LEGACY__DECRYPT();
14+
set { }
15+
}
16+
public software.amazon.cryptography.dbencryptionsdk.dynamodb.internaldafny.types._ILegacyPolicy policy
17+
{
18+
get
19+
{
20+
return this._policy;
21+
}
22+
}
1223
public static Wrappers_Compile._IResult<
1324
Wrappers_Compile._IOption<InternalLegacyOverride>,
1425
_IError

DynamoDbEncryption/runtimes/rust/src/intercept.rs

-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ impl DbEsdkInterceptor {
9191
}
9292
}
9393

94-
unsafe impl Sync for DbEsdkInterceptor {}
95-
unsafe impl Send for DbEsdkInterceptor {}
96-
9794
#[derive(Debug)]
9895
struct OriginalRequest(Input);
9996

DynamoDbEncryption/runtimes/rust/src/software_externs.rs

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ pub mod software {
5858
}
5959

6060
impl InternalLegacyOverride {
61+
pub fn policy(&self) -> Rc<LegacyPolicy> {
62+
self.r#__i_policy.clone()
63+
}
6164
pub fn Build(
6265
config: &Rc<crate::software::amazon::cryptography::dbencryptionsdk::dynamodb::itemencryptor::internaldafny::types::DynamoDbItemEncryptorConfig>,
6366
) -> Rc<

TestVectors/runtimes/java/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dependencies {
9090
implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}")
9191
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")
9292
implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}")
93-
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.8.0-SNAPSHOT")
93+
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}")
9494

9595
implementation(platform("software.amazon.awssdk:bom:2.26.25"))
9696
implementation("software.amazon.awssdk:dynamodb")

project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
projectJavaVersion=3.8.0
2-
mplDependencyJavaVersion=1.8.0
2+
mplDependencyJavaVersion=1.9.0
33
dafnyVersion=4.9.0
44
dafnyVerifyVersion=4.9.0
55
dafnyRuntimeJavaVersion=4.9.0

submodules/smithy-dafny

0 commit comments

Comments
 (0)