Skip to content

fix: bxl target patterns didn't accept multiple args #1279

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

Open
lf- wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −41
Open

fix: bxl target patterns didn't accept multiple args #1279

Show file tree
Hide file tree
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
99 changes: 58 additions & 41 deletions app/buck2_bxl/src/bxl/starlark_defs/cli_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,9 +603,9 @@ impl CliArgType {
)
}))
}
CliArgType::TargetExpr => clap.num_args(1),
CliArgType::ConfiguredTargetExpr => clap.num_args(1),
CliArgType::SubTargetExpr => clap.num_args(1),
CliArgType::TargetExpr => clap.num_args(1).action(ArgAction::Append),
CliArgType::ConfiguredTargetExpr => clap.num_args(1).action(ArgAction::Append),
CliArgType::SubTargetExpr => clap.num_args(1).action(ArgAction::Append),
CliArgType::Json => clap.num_args(1),
CliArgType::JsonFile => clap.num_args(1),
}
Expand Down Expand Up @@ -742,20 +742,25 @@ impl CliArgType {
r.map(Some)
})?,
CliArgType::TargetExpr => {
let x = clap.value_of().unwrap_or("");
let pattern = ParsedPattern::<TargetPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
x,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)?;
let loaded = load_patterns(
&mut ctx.dice.clone(),
vec![pattern],
MissingTargetBehavior::Fail,
)
.await?;
let patterns = clap
.values_of()
.map(|xs| {
xs.map(|x| {
ParsedPattern::<TargetPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
x,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)
})
.collect::<buck2_error::Result<Vec<_>>>()
})
.unwrap_or(Ok(Vec::new()))?;

let loaded =
load_patterns(&mut ctx.dice.clone(), patterns, MissingTargetBehavior::Fail)
.await?;
Some(CliArgValue::List(
loaded
.iter_loaded_targets()
Expand All @@ -764,18 +769,25 @@ impl CliArgType {
))
}
CliArgType::ConfiguredTargetExpr => {
let arg = clap.value_of().unwrap_or("");
let pattern_with_modifiers =
ParsedPatternWithModifiers::<TargetPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
arg,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)?;
let patterns = clap
.values_of()
.map(|xs| {
xs.map(|x| {
ParsedPatternWithModifiers::<TargetPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
x,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)
})
.collect::<buck2_error::Result<Vec<_>>>()
})
.unwrap_or(Ok(Vec::new()))?;

let result = load_compatible_patterns_with_modifiers(
&mut ctx.dice.clone(),
vec![pattern_with_modifiers],
patterns,
&ctx.global_cfg_options,
MissingTargetBehavior::Fail,
false,
Expand All @@ -790,20 +802,25 @@ impl CliArgType {
))
}
CliArgType::SubTargetExpr => {
let x = clap.value_of().unwrap_or("");
let pattern = ParsedPattern::<ProvidersPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
x,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)?;
let loaded = load_patterns(
&mut ctx.dice.clone(),
vec![pattern],
MissingTargetBehavior::Fail,
)
.await?;
let patterns = clap
.values_of()
.map(|xs| {
xs.map(|x| {
ParsedPattern::<ProvidersPatternExtra>::parse_relaxed(
&ctx.target_alias_resolver,
ctx.relative_dir.as_cell_path(),
x,
&ctx.cell_resolver,
&ctx.cell_alias_resolver,
)
})
.collect::<buck2_error::Result<Vec<_>>>()
})
.unwrap_or(Ok(Vec::new()))?;

let loaded =
load_patterns(&mut ctx.dice.clone(), patterns, MissingTargetBehavior::Fail)
.await?;

Some(CliArgValue::List(
loaded
Expand Down
6 changes: 6 additions & 0 deletions tests/core/bxl/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ async def test_bxl_cli(buck: Buck) -> None:
"3",
"--target",
":foo",
"--target",
":bar",
"--sub_target",
"cell/pkg:bar[sub]",
"--sub_target",
"cell/pkg:bar[sub2]",
"--configured_target",
"root//:t1?root//:macos",
"--configured_target",
"root//:t1?root//:linux",
)

golden(
Expand Down
Loading