3 files changed, 6 insertions, 33 deletions
diff --git a/src/api/api_server.rs b/src/api/api_server.rs
index c28e8832..e02b9204 100644
--- a/src/api/api_server.rs
+++ b/src/api/api_server.rs
@@ -156,7 +156,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 	};
 
 	let resp = match endpoint {
-		Endpoint::Options => handle_options(garage, &req, bucket_id).await,
+		Endpoint::Options => handle_options(&req, &bucket).await,
 		Endpoint::HeadObject { key, .. } => handle_head(garage, &req, bucket_id, &key).await,
 		Endpoint::GetObject { key, .. } => handle_get(garage, &req, bucket_id, &key).await,
 		Endpoint::UploadPart {
@@ -334,12 +334,12 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 		Endpoint::DeleteObjects {} => {
 			handle_delete_objects(garage, bucket_id, req, content_sha256).await
 		}
-		Endpoint::GetBucketWebsite {} => handle_get_website(garage, bucket_id).await,
+		Endpoint::GetBucketWebsite {} => handle_get_website(&bucket).await,
 		Endpoint::PutBucketWebsite {} => {
 			handle_put_website(garage, bucket_id, req, content_sha256).await
 		}
 		Endpoint::DeleteBucketWebsite {} => handle_delete_website(garage, bucket_id).await,
-		Endpoint::GetBucketCors {} => handle_get_cors(garage, bucket_id).await,
+		Endpoint::GetBucketCors {} => handle_get_cors(&bucket).await,
 		Endpoint::PutBucketCors {} => handle_put_cors(garage, bucket_id, req, content_sha256).await,
 		Endpoint::DeleteBucketCors {} => handle_delete_cors(garage, bucket_id).await,
 		endpoint => Err(Error::NotImplemented(endpoint.name().to_owned())),
diff --git a/src/api/s3_cors.rs b/src/api/s3_cors.rs
index d23bf48d..cde66079 100644
--- a/src/api/s3_cors.rs
+++ b/src/api/s3_cors.rs
@@ -18,16 +18,7 @@ use garage_model::garage::Garage;
 use garage_table::*;
 use garage_util::data::*;
 
-pub async fn handle_get_cors(
-	garage: Arc<Garage>,
-	bucket_id: Uuid,
-) -> Result<Response<Body>, Error> {
-	let bucket = garage
-		.bucket_table
-		.get(&EmptyKey, &bucket_id)
-		.await?
-		.ok_or(Error::NoSuchBucket)?;
-
+pub async fn handle_get_cors(bucket: &Bucket) -> Result<Response<Body>, Error> {
 	let param = bucket
 		.params()
 		.ok_or_internal_error("Bucket should not be deleted at this point")?;
@@ -109,16 +100,7 @@ pub async fn handle_put_cors(
 		.body(Body::empty())?)
 }
 
-pub async fn handle_options(
-	garage: Arc<Garage>,
-	req: &Request<Body>,
-	bucket_id: Uuid,
-) -> Result<Response<Body>, Error> {
-	let bucket = garage
-		.bucket_table
-		.get(&EmptyKey, &bucket_id)
-		.await?
-		.ok_or(Error::NoSuchBucket)?;
+pub async fn handle_options(req: &Request<Body>, bucket: &Bucket) -> Result<Response<Body>, Error> {
 	let origin = req
 		.headers()
 		.get("Origin")
diff --git a/src/api/s3_website.rs b/src/api/s3_website.rs
index d5864fc8..9d1da905 100644
--- a/src/api/s3_website.rs
+++ b/src/api/s3_website.rs
@@ -13,16 +13,7 @@ use garage_model::garage::Garage;
 use garage_table::*;
 use garage_util::data::*;
 
-pub async fn handle_get_website(
-	garage: Arc<Garage>,
-	bucket_id: Uuid,
-) -> Result<Response<Body>, Error> {
-	let bucket = garage
-		.bucket_table
-		.get(&EmptyKey, &bucket_id)
-		.await?
-		.ok_or(Error::NoSuchBucket)?;
-
+pub async fn handle_get_website(bucket: &Bucket) -> Result<Response<Body>, Error> {
 	let param = bucket
 		.params()
 		.ok_or_internal_error("Bucket should not be deleted at this point")?;