Merge pull request 'add request context helper' (#751) from yuka/garage:req-ctx into main

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/751

1 files changed, 5 insertions, 5 deletions

diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs
index 1baec1db..822bec44 100644
--- a/src/api/k2v/index.rs
+++ b/src/api/k2v/index.rs
@@ -3,12 +3,9 @@ use std::sync::Arc;
 use hyper::Response;
 use serde::Serialize;
 
-use garage_util::data::*;
-
 use garage_rpc::ring::Ring;
 use garage_table::util::*;
 
-use garage_model::garage::Garage;
 use garage_model::k2v::item_table::{BYTES, CONFLICTS, ENTRIES, VALUES};
 
 use crate::helpers::*;
@@ -17,14 +14,17 @@ use crate::k2v::error::*;
 use crate::k2v::range::read_range;
 
 pub async fn handle_read_index(
-	garage: Arc<Garage>,
-	bucket_id: Uuid,
+	ctx: ReqCtx,
 	prefix: Option<String>,
 	start: Option<String>,
 	end: Option<String>,
 	limit: Option<u64>,
 	reverse: Option<bool>,
 ) -> Result<Response<ResBody>, Error> {
+	let ReqCtx {
+		garage, bucket_id, ..
+	} = &ctx;
+
 	let reverse = reverse.unwrap_or(false);
 
 	let ring: Arc<Ring> = garage.system.ring.borrow().clone();