gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-31 01:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Condition into RedirectCondition in internal model

Browse Source
This commit is contained in:
Alex Auvolat
2025-02-14 13:21:10 +01:00
parent 3151695011
commit 62a3003cca
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/s3/website.rs
+5 -3
View File
@@ -246,9 +246,11 @@ impl WebsiteConfiguration {
.into_iter() .into_iter()
.map(|rule| { .map(|rule| {
bucket_table::RoutingRule { bucket_table::RoutingRule {
condition: rule.condition.map(|condition| bucket_table::Condition { condition: rule.condition.map(|condition| {
http_error_code: condition.http_error_code.map(|c| c.0 as u16), bucket_table::RedirectCondition {
prefix: condition.prefix.map(|p| p.0), http_error_code: condition.http_error_code.map(|c| c.0 as u16),
prefix: condition.prefix.map(|p| p.0),
}
}), }),
redirect: bucket_table::Redirect { redirect: bucket_table::Redirect {
hostname: rule.redirect.hostname.map(|h| h.0), hostname: rule.redirect.hostname.map(|h| h.0),
src/model/bucket_table.rs
+2 -2
View File
@@ -185,12 +185,12 @@ mod v2 {
#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct RoutingRule { pub struct RoutingRule {
pub condition: Option<Condition>, pub condition: Option<RedirectCondition>,
pub redirect: Redirect, pub redirect: Redirect,
} }
#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Condition { pub struct RedirectCondition {
pub http_error_code: Option<u16>, pub http_error_code: Option<u16>,
pub prefix: Option<String>, pub prefix: Option<String>,
} }