gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-10 14:36:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 1686a/s3-redirects

Browse Source
This commit is contained in:
trinity-1686a
2025-02-08 16:01:11 +01:00
parent bf0f792418 d3226bfa91
commit f034e834fa
149 changed files with 2387 additions and 8944 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/web_server.rs
+8 -6
View File
@@ -21,14 +21,16 @@ use opentelemetry::{
use crate::error::*;
use garage_api::generic_server::{server_loop, UnixListenerOn};
use garage_api::helpers::*;
use garage_api::s3::api_server::ResBody;
use garage_api::s3::cors::{add_cors_headers, find_matching_cors_rule, handle_options_for_bucket};
use garage_api::s3::error::{
use garage_api_common::cors::{
add_cors_headers, find_matching_cors_rule, handle_options_for_bucket,
};
use garage_api_common::generic_server::{server_loop, UnixListenerOn};
use garage_api_common::helpers::*;
use garage_api_s3::api_server::ResBody;
use garage_api_s3::error::{
CommonErrorDerivative, Error as ApiError, OkOrBadRequest, OkOrInternalError,
};
use garage_api::s3::get::{handle_get_without_ctx, handle_head_without_ctx};
use garage_api_s3::get::{handle_get_without_ctx, handle_head_without_ctx};
use garage_model::bucket_table::{self, RoutingRule};
use garage_model::garage::Garage;