diff options
| author | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-14 13:21:10 +0100 |
|---|---|---|
| committer | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-14 13:45:32 +0100 |
| commit | 62a3003ccad402dbd004af62724c45df8fb84c07 (patch) | |
| tree | e568959948e307194ad1e3ff59dd2db54023bcb7 /src | |
| parent | 315169501173c1cf5f78397375fe05ea2ebb77f0 (diff) | |
| download | garage-62a3003ccad402dbd004af62724c45df8fb84c07.tar.gz garage-62a3003ccad402dbd004af62724c45df8fb84c07.zip | |
rename Condition into RedirectCondition in internal model
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/s3/website.rs | 8 | ||||
| -rw-r--r-- | src/model/bucket_table.rs | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/api/s3/website.rs b/src/api/s3/website.rs index 18384932..b714ea23 100644 --- a/src/api/s3/website.rs +++ b/src/api/s3/website.rs @@ -246,9 +246,11 @@ impl WebsiteConfiguration { .into_iter() .map(|rule| { bucket_table::RoutingRule { - condition: rule.condition.map(|condition| bucket_table::Condition { - http_error_code: condition.http_error_code.map(|c| c.0 as u16), - prefix: condition.prefix.map(|p| p.0), + condition: rule.condition.map(|condition| { + bucket_table::RedirectCondition { + http_error_code: condition.http_error_code.map(|c| c.0 as u16), + prefix: condition.prefix.map(|p| p.0), + } }), redirect: bucket_table::Redirect { hostname: rule.redirect.hostname.map(|h| h.0), diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs index c4d247d7..7317c36f 100644 --- a/src/model/bucket_table.rs +++ b/src/model/bucket_table.rs @@ -185,12 +185,12 @@ mod v2 { #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] pub struct RoutingRule { - pub condition: Option<Condition>, + pub condition: Option<RedirectCondition>, pub redirect: Redirect, } #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] - pub struct Condition { + pub struct RedirectCondition { pub http_error_code: Option<u16>, pub prefix: Option<String>, } |