Merge branch 'main' into rkapila/fix-java-release-process

Author: RitvikKapila

.github/workflows/ci_todos.yml

@@ -17,8 +17,8 @@ jobs:
         shell: bash
         # TODOs may be committed as long as the same line contains a link to a Github Issue or refers to a CrypTool SIM.
         run: |
-          ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
-          GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
+          ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./releases --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
+          GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./releases --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
           if [ "$ALL_TODO_COUNT" != "$GOOD_TODO_COUNT" ]; then
             exit 1;
           fi

.github/workflows/library_rust_tests.yml

@@ -32,7 +32,7 @@ jobs:
       id-token: write
       contents: read
     env:
-      RUST_MIN_STACK: 404857600
+      RUST_MIN_STACK: 838860800
     steps:
       - name: Support longpaths on Git checkout
         run: |
@@ -55,14 +55,11 @@ jobs:
         uses: actions-rust-lang/[email protected]
         with:
           components: rustfmt
-      # uncomment this after Rust formatter works
-      # - name: Rustfmt Check
-      #   uses: actions-rust-lang/rustfmt@v1
 
       - name: Setup Dafny
-        uses: dafny-lang/setup-dafny-action@v1.7.0
+        uses: dafny-lang/setup-dafny-action@v1.8.0
         with:
-          dafny-version: nightly-2024-12-03-4954170
+          dafny-version: nightly-2025-01-30-7db1e5f
 
       - name: Update MPL submodule if using MPL HEAD
         if: ${{ inputs.mpl-head == true }}
@@ -73,16 +70,6 @@ jobs:
           git submodule update --init --recursive
           git rev-parse HEAD
 
-      # Remove this after the formatting in Rust starts working
-      - name: smithy-dafny Rust hacks
-        shell: bash
-        run: |
-          if [ "$RUNNER_OS" == "macOS" ]; then
-            sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' submodules/smithy-dafny/SmithyDafnyMakefile.mk
-          else
-            sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' submodules/smithy-dafny/SmithyDafnyMakefile.mk
-          fi
-
       - name: Setup Java 17 for codegen
         uses: actions/setup-java@v3
         with:
@@ -123,6 +110,13 @@ jobs:
         run: |
           make test_rust
 
+      - name: Test ${{ matrix.library }} Rust Debug
+        if: ${{ matrix.library != 'TestVectors' }}
+        shell: bash
+        working-directory: ./${{ matrix.library }}
+        run: |
+          make test_rust test_rust_debug
+
       - name: Test Examples for Rust in ${{ matrix.library }}
         if: ${{ matrix.library == 'DynamoDbEncryption' }}
         working-directory: ./${{ matrix.library }}/runtimes/rust/

.github/workflows/smithy-diff.yml

@@ -35,7 +35,7 @@ jobs:
           FILES: ${{ steps.file-changes.outputs.FILES }}
         if: ${{env.FILES != ''}}
         run: |
-          # TODO: If https://github.com/smithy-lang/smithy-dafny/issues/491 is resolved, remove comment about this issue.
+          # If https://github.com/smithy-lang/smithy-dafny/issues/491 is resolved, remove comment about this issue.
           COMMENT="@${{github.event.pull_request.user.login}} and @${{github.actor}}, I noticed you are updating the smithy model files.\nDoes this update need new or updated javadoc trait documentation?\n Are you adding constraints inside list, map or union? Do you know about this issue: https://github.com/smithy-lang/smithy-dafny/issues/491?"
           COMMENT_URL="https://api.github.com/repos/${{ github.repository }}/issues/${PR_NUMBER}/comments"
           curl -s -H "Authorization: token ${GITHUB_TOKEN}" -X POST $COMMENT_URL -d "{\"body\":\"$COMMENT\"}"

DynamoDbEncryption/runtimes/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-db-esdk"
-version = "0.2.0"
+version = "1.0.0"
 edition = "2021"
 rust-version = "1.81.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]
@@ -16,20 +16,20 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = "1.5.11"
-aws-lc-rs = "1.12.0"
-aws-lc-sys = "0.24.0"
-aws-sdk-dynamodb = "1.56.0"
-aws-sdk-kms = "1.52.0"
+aws-config = "1.5.15"
+aws-lc-rs = "1.12.2"
+aws-lc-sys = "0.25.0"
+aws-sdk-dynamodb = "1.62.0"
+aws-sdk-kms = "1.57.0"
 aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
-aws-smithy-types = "1.2.10"
+aws-smithy-types = "1.2.12"
 chrono = "0.4.39"
 cpu-time = "1.0.0"
-dafny-runtime = "0.1.1"
+dafny_runtime = { path = "../../../submodules/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust", features = ["sync"] }
 dashmap = "6.1.0"
 pem = "3.0.4"
-tokio = {version = "1.42.0", features = ["full"] }
-uuid = { version = "1.11.0", features = ["v4"] }
+tokio = {version = "1.43.0", features = ["full"] }
+uuid = { version = "1.12.1", features = ["v4"] }
 
 [[example]]
 name = "main"

DynamoDbEncryption/runtimes/rust/RELEASE.md

@@ -1,6 +1,6 @@
 To publish a new version of the aws-db-esdk for version N.N.N
 
-1. Acquire the appropriate permissions
+1. acquire the AWS permissions to run the tests
 1. Ensure git checkout of main is fresh and clean
 1. ./start_release.sh N.N.N
 1. `cd ../../../releases/rust/db_esdk`

DynamoDbEncryption/runtimes/rust/examples/basic_get_put_example.rs

@@ -5,13 +5,13 @@ use crate::test_utils;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;
 
-use aws_db_esdk::CryptoAction;
 use aws_db_esdk::material_providers::client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
+use aws_db_esdk::CryptoAction;
 
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
 use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
 use aws_db_esdk::types::dynamo_db_tables_encryption_config::DynamoDbTablesEncryptionConfig;
 
 /*

DynamoDbEncryption/runtimes/rust/examples/clientsupplier/client_supplier_example.rs

@@ -4,11 +4,11 @@
 use super::regional_role_client_supplier::RegionalRoleClientSupplier;
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::DiscoveryFilter;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aws_config::Region;
+use aws_db_esdk::com_amazonaws_kms::client::Client as kms_client;
 use aws_db_esdk::material_providers::operation::get_client::GetClientInput;
 use aws_db_esdk::material_providers::types::error::Error;
 use aws_db_esdk::material_providers::types::ClientSupplier;
-use aws_db_esdk::com_amazonaws_kms::client::Client as kms_client;
 
 /*
  Example class demonstrating an implementation of a custom client supplier.

DynamoDbEncryption/runtimes/rust/examples/itemencryptor/item_encrypt_decrypt.rs

@@ -5,12 +5,12 @@ use crate::test_utils;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;
 
-use aws_db_esdk::CryptoAction;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
+use aws_db_esdk::CryptoAction;
 
-use aws_db_esdk::item_encryptor::types::dynamo_db_item_encryptor_config::DynamoDbItemEncryptorConfig;
 use aws_db_esdk::item_encryptor::client as enc_client;
+use aws_db_esdk::item_encryptor::types::dynamo_db_item_encryptor_config::DynamoDbItemEncryptorConfig;
 use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
 
 /*

DynamoDbEncryption/runtimes/rust/examples/keyring/hierarchical_keyring.rs

@@ -5,14 +5,14 @@ use super::branch_key_id_supplier::ExampleBranchKeyIdSupplier;
 use crate::test_utils;
 use aws_db_esdk::dynamodb::client as dbesdk_client;
 use aws_db_esdk::dynamodb::types::dynamo_db_encryption_config::DynamoDbEncryptionConfig;
+use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::key_store::client as keystore_client;
 use aws_db_esdk::key_store::types::key_store_config::KeyStoreConfig;
 use aws_db_esdk::key_store::types::KmsConfiguration;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
 use aws_db_esdk::CryptoAction;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/keyring/kms_rsa_keyring.rs

@@ -3,19 +3,19 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
 use std::io::Write;
 use std::path::Path;
- 
+
 /*
  This example sets up DynamoDb Encryption for the AWS SDK client
  using the KMS RSA Keyring. This keyring uses a KMS RSA key pair to

DynamoDbEncryption/runtimes/rust/examples/keyring/mrk_discovery_multi_keyring.rs

@@ -3,11 +3,11 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::DiscoveryFilter;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/keyring/multi_keyring.rs

@@ -3,11 +3,11 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::AesWrappingAlg;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/keyring/multi_mrk_keyring.rs

@@ -3,10 +3,10 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/keyring/raw_aes_keyring.rs

@@ -3,11 +3,11 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::AesWrappingAlg;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/keyring/raw_rsa_keyring.rs

@@ -3,11 +3,11 @@
 
 use crate::test_utils;
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::CryptoAction;
+use aws_db_esdk::intercept::DbEsdkInterceptor;
 use aws_db_esdk::material_providers::client as mpl_client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
 use aws_db_esdk::material_providers::types::PaddingScheme;
-use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::CryptoAction;
 use aws_db_esdk::DynamoDbTablesEncryptionConfig;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;

DynamoDbEncryption/runtimes/rust/examples/multi_get_put_example.rs

@@ -5,13 +5,13 @@ use crate::test_utils;
 use aws_sdk_dynamodb::types::AttributeValue;
 use std::collections::HashMap;
 
-use aws_db_esdk::CryptoAction;
 use aws_db_esdk::material_providers::client;
 use aws_db_esdk::material_providers::types::material_providers_config::MaterialProvidersConfig;
+use aws_db_esdk::CryptoAction;
 
 use aws_db_esdk::dynamodb::types::DynamoDbTableEncryptionConfig;
-use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
 use aws_db_esdk::intercept::DbEsdkInterceptor;
+use aws_db_esdk::material_providers::types::DbeAlgorithmSuiteId;
 use aws_db_esdk::types::dynamo_db_tables_encryption_config::DynamoDbTablesEncryptionConfig;
 
 /*