fix(permissions): ignore empty values (denoland#15447)

cli/file_watcher.rs

@@ -261,7 +261,7 @@ pub async fn watch_func2<T: Clone, O, F>(
  print_config: PrintConfig,
 ) -> Result<(), AnyError>
 where
- O: FnMut(T) -> F,
+ O: FnMut(T) -> Result<F, AnyError>,
  F: Future<Output = Result<(), AnyError>>,
 {
  let (watcher_sender, mut watcher_receiver) =
@@ -306,7 +306,7 @@ where
  add_paths_to_watcher(&mut watcher, &maybe_paths.unwrap());
  }
  };
- let operation_future = error_handler(operation(operation_args.clone()));
+ let operation_future = error_handler(operation(operation_args.clone())?);
 
  select! {
  _ = receiver_future => {},

cli/lsp/testing/execution.rs

@@ -282,7 +282,7 @@ impl TestRun {
  let flags = flags_from_vec(args.into_iter().map(String::from).collect())?;
  let ps = proc_state::ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
  test::check_specifiers(
  &ps,
  permissions.clone(),

cli/main.rs

@@ -472,7 +472,7 @@ async fn install_command(
  preload_flags.inspect = None;
  preload_flags.inspect_brk = None;
  let permissions =
- Permissions::from_options(&preload_flags.permissions_options());
+ Permissions::from_options(&preload_flags.permissions_options())?;
  let ps = ProcState::build(preload_flags).await?;
  let main_module = resolve_url_or_path(&install_flags.module_url)?;
  let mut worker = create_main_worker(
@@ -562,7 +562,7 @@ async fn eval_command(
  // type, and so our "fake" specifier needs to have the proper extension.
  let main_module =
  resolve_url_or_path(&format!("./$deno$eval.{}", eval_flags.ext))?;
- let permissions = Permissions::from_options(&flags.permissions_options());
+ let permissions = Permissions::from_options(&flags.permissions_options())?;
  let ps = ProcState::build(flags).await?;
  let mut worker = create_main_worker(
  &ps,
@@ -862,7 +862,7 @@ async fn repl_command(
  let mut worker = create_main_worker(
  &ps,
  main_module.clone(),
- Permissions::from_options(&ps.options.permissions_options()),
+ Permissions::from_options(&ps.options.permissions_options())?,
  vec![],
  Default::default(),
  );
@@ -883,7 +883,7 @@ async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> {
  let mut worker = create_main_worker(
  &ps.clone(),
  main_module.clone(),
- Permissions::from_options(&ps.options.permissions_options()),
+ Permissions::from_options(&ps.options.permissions_options())?,
  vec![],
  Default::default(),
  );
@@ -994,8 +994,8 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
  ModuleSpecifier,
  )| {
  let flags = flags.clone();
- let permissions = Permissions::from_options(&flags.permissions_options());
- async move {
+ let permissions = Permissions::from_options(&flags.permissions_options())?;
+ Ok(async move {
  let ps =
  ProcState::build_for_file_watcher((*flags).clone(), sender.clone())
  .await?;
@@ -1015,7 +1015,7 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
  executor.execute(&main_module).await?;
 
  Ok(())
- }
+ })
  };
 
  file_watcher::watch_func2(
@@ -1053,7 +1053,7 @@ async fn run_command(
  let main_module = resolve_url_or_path(&run_flags.script)?;
  let ps = ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
  let mut worker = create_main_worker(
  &ps,
  main_module.clone(),

cli/standalone.rs

@@ -224,7 +224,7 @@ pub async fn run(
  let flags = metadata_to_flags(&metadata);
  let main_module = &metadata.entrypoint;
  let ps = ProcState::build(flags).await?;
- let permissions = Permissions::from_options(&metadata.permissions);
+ let permissions = Permissions::from_options(&metadata.permissions)?;
  let blob_store = BlobStore::default();
  let broadcast_channel = InMemoryBroadcastChannel::default();
  let module_loader = Rc::new(EmbeddedModuleLoader {

cli/tools/bench.rs

@@ -524,7 +524,7 @@ pub async fn run_benchmarks(
 ) -> Result<(), AnyError> {
  let ps = ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
  let specifiers = collect_specifiers(
  bench_flags.include.unwrap_or_else(|| vec![".".to_string()]),
  &bench_flags.ignore.clone(),
@@ -559,7 +559,7 @@ pub async fn run_benchmarks_with_watch(
 ) -> Result<(), AnyError> {
  let ps = ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
 
  let include = bench_flags.include.unwrap_or_else(|| vec![".".to_string()]);
  let ignore = bench_flags.ignore.clone();

cli/tools/test.rs

@@ -1385,7 +1385,7 @@ pub async fn run_tests(
 ) -> Result<(), AnyError> {
  let ps = ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
  let specifiers_with_mode = fetch_specifiers_with_test_mode(
  &ps,
  test_flags.include,
@@ -1430,7 +1430,7 @@ pub async fn run_tests_with_watch(
 ) -> Result<(), AnyError> {
  let ps = ProcState::build(flags).await?;
  let permissions =
- Permissions::from_options(&ps.options.permissions_options());
+ Permissions::from_options(&ps.options.permissions_options())?;
 
  let include = test_flags.include;
  let ignore = test_flags.ignore.clone();