Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci_examples_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ jobs:
with:
submodules: recursive

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: "7.6" # Supports Java 8-17
cache-read-only: false

- name: Setup Java ${{ matrix.java-version }}
uses: actions/setup-java@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/library_rust_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
- name: Setup Rust Toolchain for GitHub CI
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: 1.86.0
components: rustfmt
# uncomment this after Rust formatter works
# - name: Rustfmt Check
Expand All @@ -62,7 +63,7 @@ jobs:
- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
with:
dafny-version: nightly-2024-12-03-4954170
dafny-version: 4.10.0

- name: Update MPL submodule if using MPL HEAD
if: ${{ inputs.mpl-head == true }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [3.7.1]

Pin DynamoDb and aws sdk version < 4.x

## [3.7.0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.6.2...v3.7.0) (2024-09-17)

### Features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module DynamoDbEncryptionBranchKeyIdSupplierTest {
const logicalKeyStoreName := branchKeyStoreName

// These tests require a keystore populated with a key with this Id
const BRANCH_KEY_ID := "75789115-1deb-4fe3-a2ec-be9e885d1945"
const BRANCH_KEY_ID := "3f43a9af-08c5-4317-b694-3d3e883dcaef"
const BRANCH_KEY_ID_UTF8 := UTF8.EncodeAscii(BRANCH_KEY_ID)
const ALTERNATE_BRANCH_KEY_ID := "4bb57643-07c1-419e-92ad-0df0df149d7c"

Expand Down
1 change: 0 additions & 1 deletion DynamoDbEncryption/runtimes/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ To use the DB-ESDK for DynamoDB in Java, you must have:

The KMS and DynamoDB-Enhanced Clients from the AWS SDK For Java V2
are **optional** dependencies.

- **Via Gradle Kotlin**
In a Gradle Java Project, add the following to the _dependencies_ section:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class TestUtils {
public static final String TEST_KEY_STORE_KMS_KEY =
"arn:aws:kms:us-west-2:370957321024:key/9d989aa2-2f9c-438c-a745-cc57d3ad0126";
public static final String BRANCH_KEY_ID =
"75789115-1deb-4fe3-a2ec-be9e885d1945";
"3f43a9af-08c5-4317-b694-3d3e883dcaef";
public static final String ALTERNATE_BRANCH_KEY_ID =
"4bb57643-07c1-419e-92ad-0df0df149d7c";

Expand Down
2 changes: 1 addition & 1 deletion DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
[assembly: AssemblyTitle("AWS.Cryptography.DbEncryptionSDK.DynamoDb")]

// This should be kept in sync with the version number in MPL.csproj
[assembly: AssemblyVersion("3.7.0")]
[assembly: AssemblyVersion("3.7.1")]

5 changes: 2 additions & 3 deletions DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPackable>true</IsPackable>

<Version>3.7.0</Version>
<Version>3.7.1</Version>

<AssemblyName>AWS.Cryptography.DbEncryptionSDK.DynamoDb</AssemblyName>
<PackageId>AWS.Cryptography.DbEncryptionSDK.DynamoDb</PackageId>
Expand Down Expand Up @@ -57,8 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.402.2"/>
<PackageReference Include="AWSSDK.Core" Version="3.7.400.38"/>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="[3.7.*, 4.0)" />
<PackageReference Include="DafnyRuntime" Version="$(DafnyVersion)" />
<ProjectReference Include="../../../submodules/MaterialProviders/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj"/>
<!--
Expand Down
5 changes: 4 additions & 1 deletion DynamoDbEncryption/runtimes/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
aws-smithy-types = "1.2.10"
chrono = "0.4.39"
cpu-time = "1.0.0"
dafny-runtime = "0.1.1"
dafny-runtime = "0.2.0"
dashmap = "6.1.0"
pem = "3.0.4"
tokio = {version = "1.42.0", features = ["full"] }
uuid = { version = "1.11.0", features = ["v4"] }

[[example]]
name = "main"

[lints.rust]
deprecated = "allow"
5 changes: 4 additions & 1 deletion TestVectors/runtimes/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
aws-smithy-types = "1.2.10"
chrono = "0.4.39"
cpu-time = "1.0.0"
dafny_runtime = { path = "../../../submodules/MaterialProviders/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust"}
dafny-runtime = "0.2.0"
dashmap = "6.1.0"
pem = "3.0.4"
tokio = {version = "1.42.0", features = ["full"] }
uuid = { version = "1.11.0", features = ["v4"] }

[lints.rust]
deprecated = "allow"
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
1 change: 0 additions & 1 deletion specification/dynamodb-encryption-client/decrypt-item.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
1 change: 0 additions & 1 deletion specification/dynamodb-encryption-client/encrypt-item.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
1 change: 0 additions & 1 deletion specification/structured-encryption/decrypt-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.1.0

- Update for simplified structured encryption

- 1.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
1 change: 0 additions & 1 deletion specification/structured-encryption/encrypt-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.1.0

- Update for simplified structured encryption

- 1.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.0.0

- Initial record

## Definitions
Expand Down
1 change: 0 additions & 1 deletion specification/structured-encryption/structures.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
### Changelog

- 1.1.0

- Update for simplified structured encryption

- 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion submodules/MaterialProviders
Loading