Deuxfleurs/garage
31
61
Fork 80
Code Issues 91 Pull requests 14 Releases 31 Wiki Activity

rename Condition into RedirectCondition in internal model
Some checks failed
ci/woodpecker/pr/debug Pipeline failed
Details

Browse source
This commit is contained in:
Alex 2025-02-14 13:21:10 +01:00
parent 3151695011
commit e4b0723aa3
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/s3/website.rs
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| {
bucket_table::RedirectCondition {
http_error_code: condition.http_error_code.map(|c| c.0 as u16), http_error_code: condition.http_error_code.map(|c| c.0 as u16),
prefix: condition.prefix.map(|p| p.0), 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),
@ -435,7 +437,7 @@ mod tests {
routing_rules: RoutingRules { routing_rules: RoutingRules {
rules: vec![ rules: vec![
RoutingRule { RoutingRule {
condition: Some(Condition { condition: Some(RedirectCondition {
http_error_code: Some(IntValue(404)), http_error_code: Some(IntValue(404)),
prefix: Some(Value("prefix1".to_owned())), prefix: Some(Value("prefix1".to_owned())),
}), }),
@ -448,7 +450,7 @@ mod tests {
}, },
}, },
RoutingRule { RoutingRule {
condition: Some(Condition { condition: Some(RedirectCondition {
http_error_code: None, http_error_code: None,
prefix: Some(Value("".to_owned())), prefix: Some(Value("".to_owned())),
}), }),

4
src/model/bucket_table.rs
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>,
} }