diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index ad463e8..72a736d 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -28,8 +28,8 @@ jobs: if: github.repository_owner == 'aws-samples' runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: 3.x cache: pip diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e8473d7..516017f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,7 +25,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Cache - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 + uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 - name: Format run: cargo fmt --all -- --check --verbose - name: Build diff --git a/Cargo.lock b/Cargo.lock index bc29dca..6b0ead6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,9 +34,9 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "ascii-canvas" @@ -47,17 +47,6 @@ dependencies = [ "term", ] -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -66,9 +55,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.11" +version = "1.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d1c2c88936a73c699225d0bc00684a534166b0cebc2659c3cdf08de8edc64c" +checksum = "649316840239f4e58df0b7f620c428f5fababbbca2d504488c641534050bd141" dependencies = [ "aws-credential-types", "aws-runtime", @@ -114,24 +103,23 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8478a5c29ead3f3be14aff8a202ad965cf7da6856860041bfca271becf8ba48b" +checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2" dependencies = [ "bindgen", "cc", "cmake", "dunce", "fs_extra", - "libc", "paste", ] [[package]] name = "aws-runtime" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a12520b4e6d08b73f77680f12c16e8ae43250d55100e0b2be46d78da16a48" +checksum = "44f6f1124d6e19ab6daf7f2e615644305dc6cb2d706892a8a8c0b98db35de020" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -154,9 +142,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.52.0" +version = "1.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299dae7b1dc0ee50434453fa5a229dc4b22bd3ee50409ff16becf1f7346e0193" +checksum = "cf3a9f073ae3a53b54421503063dfb87ff1ea83b876f567d92e8b8d9942ba91b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -200,9 +188,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa8ff1492fd9fb99ae28e8467af0dbbb7c31512b16fabf1a0f10d7bb6ef78bb" +checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28" dependencies = [ "futures-util", "pin-project-lite", @@ -250,9 +238,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.5" +version = "1.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431a10d0e07e09091284ef04453dae4069283aa108d209974d67e77ae1caa658" +checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -294,9 +282,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.10" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecbf4d5dfb169812e2b240a4350f15ad3c6b03a54074e5712818801615f2dc5" +checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d" dependencies = [ "base64-simd", "bytes", @@ -340,11 +328,10 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.9" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ - "async-trait", "axum-core", "bytes", "futures-util", @@ -373,11 +360,10 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" dependencies = [ - "async-trait", "bytes", "futures-util", "http 1.2.0", @@ -506,9 +492,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" dependencies = [ "jobserver", "libc", @@ -858,9 +844,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "h2" @@ -1350,9 +1336,9 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" @@ -1466,9 +1452,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -1510,7 +1496,7 @@ dependencies = [ "fastrand", "serde", "serde_json", - "thiserror 2.0.8", + "thiserror 2.0.9", "tokio", "tracing", "tracing-subscriber", @@ -1623,9 +1609,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -1815,9 +1801,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -1890,18 +1876,18 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -1910,9 +1896,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -2039,9 +2025,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.90" +version = "2.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" dependencies = [ "proc-macro2", "quote", @@ -2086,11 +2072,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.8" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.8", + "thiserror-impl 2.0.9", ] [[package]] @@ -2106,9 +2092,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.8" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", diff --git a/enclave/Cargo.toml b/enclave/Cargo.toml index 88cc5dc..0114f8f 100644 --- a/enclave/Cargo.toml +++ b/enclave/Cargo.toml @@ -13,14 +13,14 @@ name = "enclave-vault" path = "src/main.rs" [dependencies] -anyhow = { version = "=1.0.94", default-features = false } +anyhow = { version = "=1.0.95", default-features = false } aws-lc-rs = { version = "=1.12.0", default-features = false } byteorder = { version = "=1.5.0", default-features = false } cel-interpreter = { version = "=0.9.0", default-features = false, features = ["json", "chrono"] } chrono = { version = "=0.4.39", default-features = false, features = ["now"] } data-encoding = { version = "=2.6.0", default-features = false, features = ["alloc"] } -serde = { version = "=1.0.216", default-features = false, features = ["derive"] } -serde_json = { version = "=1.0.133", default-features = false } +serde = { version = "=1.0.217", default-features = false, features = ["derive"] } +serde_json = { version = "=1.0.134", default-features = false } rustls = { version = "=0.23.20", default-features = false, features = ["aws_lc_rs"] } vsock = { version = "=0.5.1", default-features = false } zeroize = { version = "=1.8.1", default-features = false, features = ["zeroize_derive"] } diff --git a/enclave/src/expressions.rs b/enclave/src/expressions.rs index da11a9c..1c38edc 100644 --- a/enclave/src/expressions.rs +++ b/enclave/src/expressions.rs @@ -185,7 +185,7 @@ mod tests { let expected: BTreeMap = BTreeMap::from([ ("first_name".into(), "Bob".into()), ("birth_date".into(), "1979-01-01".into()), - ("age".into(), 45.into()), + ("age".into(), 46.into()), ]); let actual = execute_expressions(&fields, &expressions).unwrap(); diff --git a/parent/Cargo.toml b/parent/Cargo.toml index 6831d52..8c1dbf3 100644 --- a/parent/Cargo.toml +++ b/parent/Cargo.toml @@ -14,16 +14,16 @@ name = "parent-vault" path = "src/main.rs" [dependencies] -anyhow = { version = "=1.0.94", default-features = false } -aws-config = { version = "=1.5.11", default-features = false, features = ["rustls", "rt-tokio", "behavior-version-latest"] } +anyhow = { version = "=1.0.95", default-features = false } +aws-config = { version = "=1.5.12", default-features = false, features = ["rustls", "rt-tokio", "behavior-version-latest"] } aws-credential-types = { version = "=1.2.1", default-features = false } -axum = { version = "=0.7.9", default-features = false, features = ["http1", "json", "tokio", "tracing"] } +axum = { version = "=0.8.1", default-features = false, features = ["http1", "json", "tokio", "tracing"] } byteorder = { version = "=1.5.0", default-features = false } clap = { version = "=4.5.23", default-features = false, features = ["std", "derive", "env"] } fastrand = { version = "=2.3.0", default-features = false } -serde = { version = "=1.0.216", default-features = false, features = ["derive"] } -serde_json = { version = "=1.0.133", default-features = false } -thiserror = { version = "=2.0.8", default-features = false } +serde = { version = "=1.0.217", default-features = false, features = ["derive"] } +serde_json = { version = "=1.0.134", default-features = false } +thiserror = { version = "=2.0.9", default-features = false } tokio = { version = "=1.42.0", default-features = false, features = ["rt-multi-thread", "process", "tracing"] } tracing = { version = "=0.1.41", default-features = false, features = ["log"] } tracing-subscriber = { version = "=0.3.19", default-features = false, features = ["ansi", "env-filter", "fmt", "json"] } diff --git a/parent/src/application.rs b/parent/src/application.rs index 27874e2..a27a717 100644 --- a/parent/src/application.rs +++ b/parent/src/application.rs @@ -18,7 +18,7 @@ pub struct AppState { pub struct Application { port: u16, - server: Serve, + server: Serve, } impl Application { @@ -41,7 +41,7 @@ impl Application { } pub async fn run_until_stopped(self) -> Result<(), std::io::Error> { - self.server.tcp_nodelay(true).await + self.server.await } } @@ -50,7 +50,7 @@ pub fn run( listener: TcpListener, options: ParentOptions, enclaves: Arc, -) -> Result, std::io::Error> { +) -> Result, std::io::Error> { let state = Arc::new(AppState { options, enclaves }); let app = Router::new() diff --git a/parent/src/main.rs b/parent/src/main.rs index 186732f..46b75fd 100644 --- a/parent/src/main.rs +++ b/parent/src/main.rs @@ -23,7 +23,7 @@ async fn main() -> Result<(), Error> { // show up in a confusing manner in CloudWatch logs. .with_ansi(false) // disabling time is handy because CloudWatch will add the ingestion time. - //.without_time() + .without_time() // remove the name of the function from every log entry .with_target(false) .init();