summaryrefslogtreecommitdiff
path: root/cli/tools
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools')
-rw-r--r--cli/tools/bench/mod.rs4
-rw-r--r--cli/tools/installer.rs30
-rw-r--r--cli/tools/repl/mod.rs2
-rw-r--r--cli/tools/run/mod.rs8
-rw-r--r--cli/tools/test/mod.rs4
5 files changed, 32 insertions, 16 deletions
diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs
index e2411ed12..a6fb91776 100644
--- a/cli/tools/bench/mod.rs
+++ b/cli/tools/bench/mod.rs
@@ -433,7 +433,7 @@ pub async fn run_benchmarks(
// `PermissionsContainer` - otherwise granting/revoking permissions in one
// file would have impact on other files, which is undesirable.
let permissions =
- Permissions::from_options(&cli_options.permissions_options())?;
+ Permissions::from_options(&cli_options.permissions_options()?)?;
let specifiers = collect_specifiers(
bench_options.files,
@@ -519,7 +519,7 @@ pub async fn run_benchmarks_with_watch(
// `PermissionsContainer` - otherwise granting/revoking permissions in one
// file would have impact on other files, which is undesirable.
let permissions =
- Permissions::from_options(&cli_options.permissions_options())?;
+ Permissions::from_options(&cli_options.permissions_options()?)?;
let graph = module_graph_creator
.create_graph(graph_kind, bench_modules)
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index 6d9c1294e..f3eba7b8a 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -426,7 +426,7 @@ async fn resolve_shim_data(
executable_args.push("--cached-only".to_string());
}
- if resolve_no_prompt(flags) {
+ if resolve_no_prompt(&flags.permissions) {
executable_args.push("--no-prompt".to_string());
}
@@ -527,6 +527,7 @@ fn is_in_path(dir: &Path) -> bool {
mod tests {
use super::*;
+ use crate::args::PermissionFlags;
use crate::args::UninstallFlagsGlobal;
use crate::args::UnstableConfig;
use crate::util::fs::canonicalize_path;
@@ -878,8 +879,11 @@ mod tests {
async fn install_with_flags() {
let shim_data = resolve_shim_data(
&Flags {
- allow_net: Some(vec![]),
- allow_read: Some(vec![]),
+ permissions: PermissionFlags {
+ allow_net: Some(vec![]),
+ allow_read: Some(vec![]),
+ ..Default::default()
+ },
type_check_mode: TypeCheckMode::None,
log_level: Some(Level::Error),
..Flags::default()
@@ -914,7 +918,10 @@ mod tests {
async fn install_prompt() {
let shim_data = resolve_shim_data(
&Flags {
- no_prompt: true,
+ permissions: PermissionFlags {
+ no_prompt: true,
+ ..Default::default()
+ },
..Flags::default()
},
&InstallFlagsGlobal {
@@ -943,7 +950,10 @@ mod tests {
async fn install_allow_all() {
let shim_data = resolve_shim_data(
&Flags {
- allow_all: true,
+ permissions: PermissionFlags {
+ allow_all: true,
+ ..Default::default()
+ },
..Flags::default()
},
&InstallFlagsGlobal {
@@ -973,7 +983,10 @@ mod tests {
let temp_dir = canonicalize_path(&env::temp_dir()).unwrap();
let shim_data = resolve_shim_data(
&Flags {
- allow_all: true,
+ permissions: PermissionFlags {
+ allow_all: true,
+ ..Default::default()
+ },
..Flags::default()
},
&InstallFlagsGlobal {
@@ -1006,7 +1019,10 @@ mod tests {
async fn install_npm_no_lock() {
let shim_data = resolve_shim_data(
&Flags {
- allow_all: true,
+ permissions: PermissionFlags {
+ allow_all: true,
+ ..Default::default()
+ },
no_lock: true,
..Flags::default()
},
diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs
index d1c1cab71..8847bee52 100644
--- a/cli/tools/repl/mod.rs
+++ b/cli/tools/repl/mod.rs
@@ -157,7 +157,7 @@ pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result<i32, AnyError> {
let cli_options = factory.cli_options();
let main_module = cli_options.resolve_main_module()?;
let permissions = PermissionsContainer::new(Permissions::from_options(
- &cli_options.permissions_options(),
+ &cli_options.permissions_options()?,
)?);
let npm_resolver = factory.npm_resolver().await?.clone();
let resolver = factory.resolver().await?.clone();
diff --git a/cli/tools/run/mod.rs b/cli/tools/run/mod.rs
index 9f4bfeb96..90551a85d 100644
--- a/cli/tools/run/mod.rs
+++ b/cli/tools/run/mod.rs
@@ -65,7 +65,7 @@ To grant permissions, set them before the script argument. For example:
maybe_npm_install(&factory).await?;
let permissions = PermissionsContainer::new(Permissions::from_options(
- &cli_options.permissions_options(),
+ &cli_options.permissions_options()?,
)?);
let worker_factory = factory.create_cli_main_worker_factory().await?;
let mut worker = worker_factory
@@ -86,7 +86,7 @@ pub async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> {
let file_fetcher = factory.file_fetcher()?;
let worker_factory = factory.create_cli_main_worker_factory().await?;
let permissions = PermissionsContainer::new(Permissions::from_options(
- &cli_options.permissions_options(),
+ &cli_options.permissions_options()?,
)?);
let mut source = Vec::new();
std::io::stdin().read_to_end(&mut source)?;
@@ -132,7 +132,7 @@ async fn run_with_watch(
let _ = watcher_communicator.watch_paths(cli_options.watch_paths());
let permissions = PermissionsContainer::new(Permissions::from_options(
- &cli_options.permissions_options(),
+ &cli_options.permissions_options()?,
)?);
let mut worker = factory
.create_cli_main_worker_factory()
@@ -182,7 +182,7 @@ pub async fn eval_command(
});
let permissions = PermissionsContainer::new(Permissions::from_options(
- &cli_options.permissions_options(),
+ &cli_options.permissions_options()?,
)?);
let worker_factory = factory.create_cli_main_worker_factory().await?;
let mut worker = worker_factory
diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs
index d63176d39..94541cf06 100644
--- a/cli/tools/test/mod.rs
+++ b/cli/tools/test/mod.rs
@@ -1704,7 +1704,7 @@ pub async fn run_tests(
// `PermissionsContainer` - otherwise granting/revoking permissions in one
// file would have impact on other files, which is undesirable.
let permissions =
- Permissions::from_options(&cli_options.permissions_options())?;
+ Permissions::from_options(&cli_options.permissions_options()?)?;
let log_level = cli_options.log_level();
let specifiers_with_mode = fetch_specifiers_with_test_mode(
@@ -1834,7 +1834,7 @@ pub async fn run_tests_with_watch(
}?;
let permissions =
- Permissions::from_options(&cli_options.permissions_options())?;
+ Permissions::from_options(&cli_options.permissions_options()?)?;
let graph = module_graph_creator
.create_graph(graph_kind, test_modules)
.await?;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 13:50:03 +0000