Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
],
packageRules: [
{
matchPackageNames: [
matchDepNames: [
"actionlint",
"aqua:owenlamont/ryl",
"biome",
Expand Down
2 changes: 1 addition & 1 deletion default.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
],
"packageRules": [
{
"matchPackageNames": [
"matchDepNames": [
"actionlint",
"aqua:owenlamont/ryl",
"biome",
Expand Down
70 changes: 59 additions & 11 deletions src/registry/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ fn default_renovate_preset_covers_all_linter_tools_weekly() {
.find(|rule| rule["groupName"].as_str() == Some("linters"))
.expect("default.json must define a packageRules entry with groupName 'linters'");

let actual = package_names(linters_rule);
let actual = dep_names(linters_rule);
let expected: Vec<&str> = builtin()
.into_iter()
.filter(|check| check.uses_binary())
Expand All @@ -413,8 +413,8 @@ fn default_renovate_preset_covers_all_linter_tools_weekly() {
);
assert_eq!(
actual,
sorted_package_names(linters_rule),
"default.json weekly linters rule matchPackageNames must be sorted"
sorted_dep_names(linters_rule),
"default.json weekly linters rule matchDepNames must be sorted"
);

assert_eq!(
Expand Down Expand Up @@ -461,14 +461,19 @@ fn repo_renovate_config_stays_aligned_with_shared_preset_contract() {
"package rule {group_name:?} schedule in .github/renovate.json5 drifted from default.json"
);
assert_eq!(
package_names(default_rule),
package_names(repo_rule),
"package rule {group_name:?} matchPackageNames in .github/renovate.json5 drifted from default.json"
rule_name_field(default_rule),
rule_name_field(repo_rule),
"package rule {group_name:?} matcher field in .github/renovate.json5 drifted from default.json"
);
assert_eq!(
package_names(repo_rule),
sorted_package_names(repo_rule),
"package rule {group_name:?} matchPackageNames in .github/renovate.json5 must be sorted"
rule_names(default_rule),
rule_names(repo_rule),
"package rule {group_name:?} package matcher in .github/renovate.json5 drifted from default.json"
);
assert_eq!(
rule_names(repo_rule),
sorted_rule_names(repo_rule),
"package rule {group_name:?} package matcher in .github/renovate.json5 must be sorted"
Comment thread
zeitlinger marked this conversation as resolved.
);
}

Expand Down Expand Up @@ -553,8 +558,51 @@ fn package_names(rule: &serde_json::Value) -> Vec<&str> {
.collect()
}

fn sorted_package_names(rule: &serde_json::Value) -> Vec<&str> {
let mut names = package_names(rule);
fn dep_names(rule: &serde_json::Value) -> Vec<&str> {
rule["matchDepNames"]
.as_array()
.expect("package rule must declare matchDepNames")
.iter()
.map(|value| {
value
.as_str()
.expect("package rule matchDepNames entries must be strings")
})
.collect()
}

fn sorted_dep_names(rule: &serde_json::Value) -> Vec<&str> {
let mut names = dep_names(rule);
names.sort_unstable();
names
}

fn rule_name_field(rule: &serde_json::Value) -> &'static str {
match (
rule.get("matchDepNames").is_some(),
rule.get("matchPackageNames").is_some(),
) {
(true, false) => "matchDepNames",
(false, true) => "matchPackageNames",
(true, true) => {
panic!("package rule must not declare both matchDepNames and matchPackageNames")
}
(false, false) => {
panic!("package rule must declare matchDepNames or matchPackageNames")
}
}
}

fn rule_names(rule: &serde_json::Value) -> Vec<&str> {
match rule_name_field(rule) {
"matchDepNames" => dep_names(rule),
"matchPackageNames" => package_names(rule),
_ => unreachable!("unexpected rule_name_field result"),
}
}

fn sorted_rule_names(rule: &serde_json::Value) -> Vec<&str> {
let mut names = rule_names(rule);
names.sort_unstable();
names
}
Expand Down
Loading