Merge branch 'main' into ajewell/async-example

aws · Jan 28, 2025 · 7ff1bbe · 7ff1bbe
2 parents 368d53f + 510dde3
commit 7ff1bbe
Show file tree

Hide file tree

Showing 24 changed files with 69 additions and 28 deletions.
diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   require-approvals:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       issues: write
       pull-requests: write

diff --git a/.github/workflows/check_only_key_word.yml b/.github/workflows/check_only_key_word.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   grep-only-verification-keyword:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       issues: write
       pull-requests: write

diff --git a/.github/workflows/ci_codegen.yml b/.github/workflows/ci_codegen.yml
@@ -17,7 +17,7 @@ jobs:
         # Note dotnet is only used for formatting generated code
         # in this workflow
         dotnet-version: ["6.0.x"]
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     defaults:
       run:

diff --git a/.github/workflows/ci_duvet.yml b/.github/workflows/ci_duvet.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   duvet:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/ci_static_analysis.yml b/.github/workflows/ci_static_analysis.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   not-grep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: not-grep

diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         library: [DynamoDbEncryption]
         dotnet-version: ["6.0.x"]
-        os: [macos-13, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write

diff --git a/.github/workflows/ci_test_vector_net.yml b/.github/workflows/ci_test_vector_net.yml
@@ -27,7 +27,7 @@ jobs:
         dotnet-version: ["6.0.x"]
         os: [
             # Run on ubuntu image that comes pre-configured with docker
-            ubuntu-latest,
+            ubuntu-22.04,
           ]
     runs-on: ${{ matrix.os }}
     permissions:

diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml
@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_interop_examples_net.yml b/.github/workflows/dafny_interop_examples_net.yml
@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml
@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_interop_test_net.yml b/.github/workflows/dafny_interop_test_net.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         library: [DynamoDbEncryption]
         dotnet-version: ["6.0.x"]
-        os: [macos-13, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_interop_test_vector_java.yml b/.github/workflows/dafny_interop_test_vector_java.yml
@@ -30,7 +30,7 @@ jobs:
         java-version: [8, 11, 16, 17]
         os: [
             # Run on ubuntu image that comes pre-configured with docker
-            ubuntu-latest,
+            ubuntu-22.04,
           ]
     runs-on: ${{ matrix.os }}
     permissions:
@@ -65,7 +65,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_interop_test_vector_net.yml b/.github/workflows/dafny_interop_test_vector_net.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         library: [TestVectors]
         dotnet-version: ["6.0.x"]
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -61,7 +61,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/dafny_verify_version.yml b/.github/workflows/dafny_verify_version.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   getDafnyVerifyVersion:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.read_property.outputs.dafnyVerifyVersion }}
     steps:

diff --git a/.github/workflows/dafny_version.yml b/.github/workflows/dafny_version.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   getDafnyVersion:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.read_property.outputs.dafnyVersion }}
     steps:

diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml
@@ -26,7 +26,7 @@ jobs:
       matrix:
         library: [DynamoDbEncryption, TestVectors]
         # removed windows-latest because somehow it can't build aws-lc in CI
-        os: [ubuntu-latest, macos-13]
+        os: [ubuntu-22.04, macos-13]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write

diff --git a/.github/workflows/mpl_head_version.yml b/.github/workflows/mpl_head_version.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   getMplHeadVersion:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.read_property.outputs.mplVersion }}
     steps:
@@ -31,7 +31,6 @@ jobs:
         shell: bash
         run: |
           git checkout ${{inputs.mpl-head}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -66,7 +66,7 @@ jobs:
       regenerate-code: true
 
   cut-issue-on-failure:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/smithy-diff.yml b/.github/workflows/smithy-diff.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   require-approvals:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       issues: write
       pull-requests: write

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # Changelog
 
+## [3.8.0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.7.0...v3.8.0) (2025-01-27)
+
+This release is available in the following languages:
+
+- Java
+
+### Features
+
+- **SharedCache:** Shared Cache for Searchable Encryption ([#1476](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1476)) ([46076f8](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/46076f86aec77f7df204c1e06a8ecb2400f01b6f))
+
+### Fixes
+
+- ensure algorithmSuite is properly copied in getTableConfig for E… ([#1474](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1474)) ([ff3acac](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/ff3acaccbb4da8f5c693324631b085d99d8f9222))
+- **Java:** Improve Collection of Errors string ([#1478](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1478)) ([562b3ef](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/562b3efbd8b5be54e21dd868dd4a1cb9539ac3a1))
+- **SearchableEncryption:** disable shared cached ([#1507](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1507)) ([ffc67be](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/ffc67beac04fac031cad1cab379a3b14669dedc5))
+- **SearchableEncryption:** respect CMC contract ([#1434](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1434)) ([b9333fb](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/b9333fbb20cd56a36e32b0cdd71d4e896140d996))
+- support new input validation ([#1518](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1518)) ([12bbfbf](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/12bbfbff0b8640e26e188bddabefeccdb43faa95))
+- Upgrade .net DDB SDK ([8aeed4e](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/8aeed4e5b901e7882da7d1c17975d77dff0bf028))
+
+### Maintenance
+
+- add dependabot for rust ([#1481](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1481)) ([67f3d2e](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/67f3d2e567b513a53d208f60ec6991a0b6c825d0))
+- Add ECDH examples ([#1461](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1461)) ([cc937b4](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/cc937b41190c17e1087acbdcd524becc1a97e214))
+- add Rust release directory ([#1479](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1479)) ([97dde01](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/97dde01a3b6d9a33a8b60dcb6e63debc5329d691))
+- add rust support ([#1376](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1376)) ([98ddfe9](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/98ddfe95d5a0a3b5986f0493f013bd4edef55d87))
+- always use dotnet 6 for format checking. ([#1403](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1403)) ([2b85507](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/2b855078d2fb4fd60b7ecd0c3d1a6d3f1c50e114))
+- bump macos from 12 to 13 in CI ([#1472](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1472)) ([1abb2dd](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/1abb2dd7e9b2cadf6301aa5570dd5e5a0bedd4e1))
+- Bump to MPL HEAD, Smithy-Dafny HEAD ([#1299](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1299)) ([b2674a9](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/b2674a96dfaa62e151637c7adcb2ab5975b44ffc))
+- change exported names, update docs ([#1524](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1524)) ([640b4d7](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/640b4d70744b2d979e4976e0d54639f93fb2e19d))
+- **CI:** make smithy fidd check smarter ([#1381](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1381)) ([bb399bf](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/bb399bf0a356827558b3c8a66ec92b2f4128af1c))
+- **CI:** mpl head step for rust ([#1583](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1583)) ([98724d3](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/98724d3a7fb16e1d9653c2b2db3aea6dbc47ffcd))
+- create Rust release runbook ([#1488](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1488)) ([e51f340](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/e51f340466dcd9ceaea6b46fbd6f127b632600a3))
+- enable local testing ([#1380](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1380)) ([36f48b0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/36f48b00dbae048bfd8f9f01cd93fbc7345d6ad1))
+- **examples:** Shared cache across Hierarchical Keyrings ([#1410](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1410)) ([21f7fe1](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/21f7fe168cedc0e6553926c7e3808081f172f7b0))
+- **GHA:** Add pr-ci-all-required to pull.yaml; use ubuntu-22.04 instead of ubuntu-latest in CI ([#1579](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1579)) ([c231473](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/c23147393c92686ea05e55610a4af2e9e8788e90))
+- **gha:** fix workflows triggered by dafny-interop.yml ([#1598](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1598)) ([0cb009d](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/0cb009dd47266e34d8b5e3f716eec084b4bb5fcc))
+- **gha:** use ubuntu-22.04 ([#1594](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1594)) ([5e24233](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/5e2423355fa792353f41b161fd037e55247e074b))
+- **Java:** bump conversion library ([#1423](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1423)) ([8931e27](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/8931e274c60a5fdb045dbcf24770820ebe05f741))
+- new mpl ([#1530](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1530)) ([fe03425](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/fe03425f078bdad53401c9c602cf684ab8a8e544))
+- **README:** point to release examples ([#1525](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1525)) ([a4ca2f9](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/a4ca2f92b6bc79272dd56faf20c952503aa7d99e))
+- **Rust-docs:** Update README ([#1520](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1520)) ([96dd848](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/96dd8481d951d1ae74e25259939aa6a4633e91cb))
+- **rust:** add comments to release scripts ([7b45929](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/7b45929cf586354ded2f1629b47126e33780de8a))
+- slight updates to properly publish as a crate ([#1480](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1480)) ([aa9175b](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/aa9175b14aacbd53e5b60a88f54f3a7276557ad7))
+- update for complete copyright notices ([#1489](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1489)) ([c0ec84d](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/c0ec84d4404a289887f693cbda06f7a5cf3baca3))
+- update Github alias ([dc6ca47](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/dc6ca479fc7389336bd582ae515233551b9d26b1))
+- update Github alias ([ff4500a](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/ff4500a5a63f64788c3a79ce9d155ad3aa749ce8))
+- update MPL ([#1519](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1519)) ([b0a97e0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/b0a97e0c211e083a36791fb48de8efbbbe307b58))
+
 ## [3.7.0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.6.2...v3.7.0) (2024-09-17)
 
 ### Features

diff --git a/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs b/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
@@ -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.8.0")]
 
diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
@@ -5,7 +5,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>true</IsPackable>
 
-    <Version>3.7.0</Version>
+    <Version>3.8.0</Version>
 
     <AssemblyName>AWS.Cryptography.DbEncryptionSDK.DynamoDb</AssemblyName>
     <PackageId>AWS.Cryptography.DbEncryptionSDK.DynamoDb</PackageId>

diff --git a/TestVectors/runtimes/java/build.gradle.kts b/TestVectors/runtimes/java/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
     implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}")
     implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")
     implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}")
-    implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}")
+    implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.8.0-SNAPSHOT")
 
     implementation(platform("software.amazon.awssdk:bom:2.26.25"))
     implementation("software.amazon.awssdk:dynamodb")

diff --git a/project.properties b/project.properties
@@ -1,5 +1,5 @@
-projectJavaVersion=3.7.0-SNAPSHOT
-mplDependencyJavaVersion=1.8.0-SNAPSHOT
+projectJavaVersion=3.8.0
+mplDependencyJavaVersion=1.8.0
 dafnyVersion=4.9.0
 dafnyVerifyVersion=4.9.0
 dafnyRuntimeJavaVersion=4.9.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ on: @@
     jobs:
       duvet:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
           - uses: actions/checkout@v3
@@ Expand Down @@