Merge pull request #122 from jplock/jp-axum-update

Update dependencies
aws-samples · Jan 1, 2025 · bcde4d2 · bcde4d2
2 parents 415d459 + 8831980
commit bcde4d2
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 77 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -185,7 +185,7 @@ mod tests {
         let expected: BTreeMap<String, Value> = 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
@@ -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
@@ -18,7 +18,7 @@ pub struct AppState {
 
 pub struct Application {
     port: u16,
-    server: Serve<Router, Router>,
+    server: Serve<TcpListener, Router, Router>,
 }
 
 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<Enclaves>,
-) -> Result<Serve<Router, Router>, std::io::Error> {
+) -> Result<Serve<TcpListener, Router, Router>, std::io::Error> {
     let state = Arc::new(AppState { options, enclaves });
 
     let app = Router::new()