Merge branch 'main' into rkapila/shared-cache-beacons

Author: RitvikKapila

.github/dependabot.yml

@@ -20,3 +20,7 @@ updates:
     directory: ".github/workflows"
     schedule:
       interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "DynamoDbEncryption/runtimes/rust"
+    schedule:
+      interval: "daily"

DynamoDbEncryption/runtimes/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-db-esdk"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 rust-version = "1.80.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]

DynamoDbEncryption/runtimes/rust/RELEASE.md

@@ -0,0 +1,17 @@
+To publish a new version of the aws-db-esdk for version N.N.N
+
+1. Acquire the appropriate permissions
+1. Ensure git checkout of main is fresh and clean
+1. ./start_release.sh N.N.N
+1. `cd ../../../releases/rust/db_esdk`
+1. Create a PR with all changed or added files
+1. Within the PR, make sure you also:
+   1. Update the `CHANGELOG.md` in the root directory with the changes
+   1. If this is a major version bump, update the `SUPPORT_POLICY.rst` for Rust
+   1. Get the PR reviewed by a teammate
+   1. Before merging the PR, publish the new version of the `aws-db-esdk` crate and test the published crate (documented in next steps)
+1. Run `cargo publish`
+1. `cd ../../../DynamoDbEncryption/runtimes/rust/` # i.e. return here
+1. ./test_published.sh N.N.N
+1. Ignore/stash the changes in `DynamoDbEncryption/runtimes/rust/test_examples/Cargo.toml` which adds the `aws-db-esdk`
+1. Merge the release PR

DynamoDbEncryption/runtimes/rust/src/lib.rs

@@ -3,6 +3,8 @@
 
 #![allow(warnings, unconditional_panic)]
 #![allow(nonstandard_style)]
+#![allow(clippy::never_loop)]
+#![allow(clippy::absurd_extreme_comparisons)]
 
 pub mod client;
 pub mod conversions;
@@ -30,7 +32,7 @@ pub use crate::deps::aws_cryptography_materialProviders;
 pub use crate::deps::aws_cryptography_primitives;
 
 pub(crate) mod implementation_from_dafny;
-pub(crate) use crate::implementation_from_dafny::r#_Wrappers_Compile;
+pub(crate) use crate::implementation_from_dafny::_Wrappers_Compile;
 pub(crate) use crate::implementation_from_dafny::software;
 pub(crate) use crate::implementation_from_dafny::AesKdfCtr;
 pub(crate) use crate::implementation_from_dafny::ConcurrentCall;

DynamoDbEncryption/runtimes/rust/start_release.sh

@@ -0,0 +1,57 @@
+#!/bin/bash -eu
+
+# Check if exactly one argument is provided
+if [ "$#" -ne 1 ]; then
+    echo 1>&2 "USAGE: start_release.sh N.N.N"
+    exit 1
+fi
+
+# Go to the directory of this script
+cd $( dirname ${BASH_SOURCE[0]} )
+
+# Check if the provided argument matches the version pattern
+REGEX_VERSION='^\d+\.\d+\.\d+$'
+MATCHES=$(echo "$1" | egrep $REGEX_VERSION | wc -l)
+if [ $MATCHES -eq 0 ]; then
+   echo 1>&2 "Version \"$1\" must be N.N.N"
+   exit 1
+fi
+
+# Update the version in Cargo.toml
+perl -pe "s/^version = .*$/version = \"$1\"/" < Cargo.toml > new_Cargo.toml
+mv new_Cargo.toml Cargo.toml
+
+# Remove all files and directories in src except for specified files
+find src -depth 1 | egrep -v '(intercept.rs|lib.rs|software_externs.rs)' | xargs rm -rf
+
+# Change to the parent directory and run make polymorph and transpile commands
+cd ../..
+make polymorph_rust transpile_rust test_rust
+
+# Remove target directory
+cd runtimes/rust
+rm -rf target
+
+# Remove existing release directory and copy current directory to releases
+rm -rf ../../../releases/rust/db_esdk
+cp -r . ../../../releases/rust/db_esdk
+
+# Go to the release directory
+cd ../../../releases/rust/db_esdk
+
+# Restore the dafny_runtime_rust directory that was previously tracked by Git but had been deleted
+git checkout dafny_runtime_rust
+
+# Remove unnecessary files and directories
+rm -rf *~ copy_externs.sh start_release.sh test_published.sh test_examples *.pem RELEASE.md
+
+# Create .gitignore file with specified entries
+echo Cargo.lock > .gitignore
+echo target >> .gitignore
+
+# Run cargo test and example tests
+cargo test
+cargo run --example main
+
+# Remove Cargo.lock and .pem files after testing the examples
+rm -f Cargo.lock *.pem

DynamoDbEncryption/runtimes/rust/test_examples/.gitignore

@@ -0,0 +1,3 @@
+*~
+*.pem
+src

DynamoDbEncryption/runtimes/rust/test_examples/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "aws-db-esdk-examples"
+edition = "2021"
+rust-version = "1.80.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+aws-config = "1.5.10"
+aws-lc-rs = "1.11.1"
+aws-lc-sys = "0.23.1"
+aws-sdk-dynamodb = "1.54.0"
+aws-sdk-kms = "1.50.0"
+aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
+aws-smithy-types = "1.2.9"
+chrono = "0.4.38"
+dafny-runtime = "0.1.1"
+dashmap = "6.1.0"
+pem = "3.0.4"
+tokio = {version = "1.41.1", features = ["full"] }
+uuid = { version = "1.11.0", features = ["v4"] }

DynamoDbEncryption/runtimes/rust/test_published.sh

@@ -0,0 +1,39 @@
+#!/bin/bash -eu
+
+# Check if exactly one argument is provided
+if [ "$#" -ne 1 ]; then
+    echo 1>&2 "USAGE: test_published.sh N.N.N"
+    exit 1
+fi
+
+# Go to the directory of this script
+cd $( dirname ${BASH_SOURCE[0]} )
+
+# Check if the provided argument matches the version pattern
+REGEX_VERSION='^\d+\.\d+\.\d+$'
+echo "$1" | egrep -q $REGEX_VERSION
+if [ $? -ne 0 ]; then
+   echo 1>&2 "Version \"$1\" must be N.N.N"
+   exit 1
+fi
+
+VERSION=$1
+
+# Update examples in test_examples directory
+rm -rf test_examples/src
+cp -r examples test_examples/src/
+cd test_examples
+
+# Add aws-db-esdk
+cargo add aws-db-esdk
+
+# Check if the added version matches the provided version
+MATCH=$(fgrep "aws-db-esdk = \"$VERSION\"" Cargo.toml | wc -l)
+if [ $MATCH -eq "0" ]; then
+    echo Version $VERSION of aws-db-esdk not the most recent
+    egrep '^aws-db-esdk' Cargo.toml
+    exit 1
+fi
+
+# Run the cargo project
+cargo run

releases/rust/db_esdk/.gitignore~

@@ -1,6 +1,6 @@
 [package]
 name = "aws-db-esdk"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 rust-version = "1.80.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]

releases/rust/db_esdk/Cargo.toml

@@ -14,9 +14,6 @@ pub mod AesKdfCtr {
     use dafny_runtime::Sequence;
     use std::rc::Rc;
 
-    #[allow(non_camel_case_types)]
-    // pub struct _default {}
-
     fn error(s: &str) -> Rc<DafnyError> {
         Rc::new(DafnyError::AwsCryptographicPrimitivesError {
             message:

releases/rust/db_esdk/src/aes_kdf_ctr.rs

@@ -3,6 +3,8 @@
 
 #![allow(warnings, unconditional_panic)]
 #![allow(nonstandard_style)]
+#![allow(clippy::never_loop)]
+#![allow(clippy::absurd_extreme_comparisons)]
 
 pub mod client;
 pub mod conversions;
@@ -30,7 +32,7 @@ pub use crate::deps::aws_cryptography_materialProviders;
 pub use crate::deps::aws_cryptography_primitives;
 
 pub(crate) mod implementation_from_dafny;
-pub(crate) use crate::implementation_from_dafny::r#_Wrappers_Compile;
+pub(crate) use crate::implementation_from_dafny::_Wrappers_Compile;
 pub(crate) use crate::implementation_from_dafny::software;
 pub(crate) use crate::implementation_from_dafny::AesKdfCtr;
 pub(crate) use crate::implementation_from_dafny::ConcurrentCall;

releases/rust/db_esdk/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 pub fn ostring_to_dafny(
     input: &Option<String>,
 ) -> ::std::rc::Rc<

releases/rust/db_esdk/src/standard_library_conversions.rs

@@ -1,3 +1,6 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 // Annotation to ignore the case of this module
 use crate::r#_Wrappers_Compile;
 use crate::implementation_from_dafny::UTF8;