Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

schnauzer: add support for update repository & ecr registry in iso-e #4141

Merged
merged 1 commit into from
Aug 14, 2024
Merged

schnauzer: add support for update repository & ecr registry in iso-e #4141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions sources/api/schnauzer/src/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ lazy_static! {
m.insert("cn-northwest-1", "183901325759");
m.insert("eu-central-1", "328549459982");
m.insert("eu-central-2", "861738308508");
m.insert("eu-isoe-west-1", "589460436674");
m.insert("eu-north-1", "328549459982");
m.insert("eu-south-1", "586180183710");
m.insert("eu-south-2", "620625777247");
Expand Down Expand Up @@ -76,6 +77,7 @@ lazy_static! {
let mut m = HashMap::new();
m.insert("cn-north-1", "bottlerocket-updates-cn-north-1.s3.dualstack");
m.insert("cn-northwest-1", "bottlerocket-updates-cn-northwest-1.s3.dualstack");
m.insert("eu-isoe-west-1", "bottlerocket-updates-eu-isoe-west-1.s3");
m
};
}
Expand All @@ -88,6 +90,7 @@ lazy_static! {
let mut m = HashMap::new();
m.insert("cn-north-1", "aws-cn");
m.insert("cn-northwest-1", "aws-cn");
m.insert("eu-isoe-west-1", "aws-iso-e");
m.insert("us-gov-east-1", "aws-us-gov");
m.insert("us-gov-west-1", "aws-us-gov");
m
Expand Down Expand Up @@ -1755,6 +1758,7 @@ fn ecr_registry<S: AsRef<str>>(region: S) -> String {
};
match partition {
"aws-cn" => format!("{}.dkr.ecr.{}.amazonaws.com.cn", registry_id, region),
"aws-iso-e" => format!("{}.dkr.ecr.{}.cloud.adc-e.uk", registry_id, region),
_ => format!("{}.dkr.ecr.{}.amazonaws.com", registry_id, region),
}
}
Expand All @@ -1773,6 +1777,7 @@ fn tuf_repository<S: AsRef<str>>(region: S) -> String {
};
match partition {
"aws-cn" => format!("https://{}.{}.amazonaws.com.cn/latest", endpoint, region),
"aws-iso-e" => format!("https://{}.{}.cloud.adc-e.uk/latest", endpoint, region),
_ => format!("https://{}.{}.amazonaws.com/latest", endpoint, region),
}
}
Expand Down Expand Up @@ -2273,6 +2278,10 @@ mod test_ecr_registry {
"eu-south-2",
"620625777247.dkr.ecr.eu-south-2.amazonaws.com/bottlerocket-admin:v0.5.1",
),
(
"eu-isoe-west-1",
"589460436674.dkr.ecr.eu-isoe-west-1.cloud.adc-e.uk/bottlerocket-admin:v0.5.1",
),
];

const ADMIN_CONTAINER_TEMPLATE: &str =
Expand Down Expand Up @@ -2321,6 +2330,8 @@ mod test_tuf_repository {
const EXPECTED_URL_CN_NORTH_1: &str =
"https://bottlerocket-updates-cn-north-1.s3.dualstack.cn-north-1.amazonaws.com.cn/latest/metadata/2020-07-07/";

const EXPECTED_URL_EU_ISOE_WEST_1: &str = "https://bottlerocket-updates-eu-isoe-west-1.s3.eu-isoe-west-1.cloud.adc-e.uk/latest/metadata/2020-07-07/";

#[test]
fn url_af_south_1() {
let result = setup_and_render_template(
Expand Down Expand Up @@ -2350,6 +2361,16 @@ mod test_tuf_repository {
.unwrap();
assert_eq!(result, EXPECTED_URL_CN_NORTH_1);
}

#[test]
fn url_eu_isoe_west_1() {
let result = setup_and_render_template(
METADATA_TEMPLATE,
&json!({"settings": {"aws": {"region": "eu-isoe-west-1"}}}),
)
.unwrap();
assert_eq!(result, EXPECTED_URL_EU_ISOE_WEST_1);
}
}

#[cfg(test)]
Expand Down