foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 04:48:52 -05:00
Code Issues Packages 1 Wiki Activity

feat: permission prompt by default (#13650)

Browse source
This commit is contained in:
Ryan Dahl 2022-02-12 22:13:21 -05:00 committed by GitHub
parent 911ddbc733
commit a5d204d425
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cli/flags.rs
View file

@ -245,7 +245,7 @@ pub struct Flags {
/// If true, a list of Node built-in modules will be injected into /// If true, a list of Node built-in modules will be injected into
/// the import map. /// the import map.
pub compat: bool, pub compat: bool,
pub prompt: bool, pub no_prompt: bool,
pub reload: bool, pub reload: bool,
pub repl: bool, pub repl: bool,
pub seed: Option<u64>, pub seed: Option<u64>,
@ -394,7 +394,7 @@ impl Flags {
allow_read: self.allow_read.clone(), allow_read: self.allow_read.clone(),
allow_run: self.allow_run.clone(), allow_run: self.allow_run.clone(),
allow_write: self.allow_write.clone(), allow_write: self.allow_write.clone(),
prompt: self.prompt, prompt: !self.no_prompt,
} }
} }
} }
@ -1489,10 +1489,13 @@ fn permission_args(app: App) -> App {
.long("allow-all") .long("allow-all")
.help("Allow all permissions"), .help("Allow all permissions"),
) )
.arg(Arg::new("prompt").long("prompt").help(
"deprecated: Fallback to prompt if required permission wasn't passed",
))
.arg( .arg(
Arg::new("prompt") Arg::new("no-prompt")
.long("prompt") .long("no-prompt")
.help("Fallback to prompt if required permission wasn't passed"), .help("Always throw if required permission wasn't passed"),
) )
} }
@ -2287,8 +2290,8 @@ fn permission_args_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
flags.allow_ffi = Some(vec![]); flags.allow_ffi = Some(vec![]);
flags.allow_hrtime = true; flags.allow_hrtime = true;
} }
if matches.is_present("prompt") { if matches.is_present("no-prompt") {
flags.prompt = true; flags.no_prompt = true;
} }
} }
fn unsafely_ignore_certificate_errors_parse( fn unsafely_ignore_certificate_errors_parse(

1
cli/tests/integration/mod.rs
View file

@ -1140,6 +1140,7 @@ fn js_unit_tests() {
.arg("test") .arg("test")
.arg("--unstable") .arg("--unstable")
.arg("--location=http://js-unit-tests/foo/bar") .arg("--location=http://js-unit-tests/foo/bar")
.arg("--no-prompt")
.arg("-A") .arg("-A")
.arg(util::tests_path().join("unit")) .arg(util::tests_path().join("unit"))
.spawn() .spawn()

8
cli/tools/installer.rs
View file

@ -328,8 +328,8 @@ fn resolve_shim_data(
executable_args.push("--cached-only".to_string()); executable_args.push("--cached-only".to_string());
} }
if flags.prompt { if flags.no_prompt {
executable_args.push("--prompt".to_string()); executable_args.push("--no-prompt".to_string());
} }
if !flags.v8_flags.is_empty() { if !flags.v8_flags.is_empty() {
@ -714,7 +714,7 @@ mod tests {
fn install_prompt() { fn install_prompt() {
let shim_data = resolve_shim_data( let shim_data = resolve_shim_data(
&Flags { &Flags {
prompt: true, no_prompt: true,
..Flags::default() ..Flags::default()
}, },
&InstallFlags { &InstallFlags {
@ -729,7 +729,7 @@ mod tests {
assert_eq!( assert_eq!(
shim_data.args, shim_data.args,
vec!["run", "--prompt", "http://localhost:4545/echo_server.ts",] vec!["run", "--no-prompt", "http://localhost:4545/echo_server.ts",]
); );
} }

2
cli/tools/standalone.rs
View file

@ -241,7 +241,7 @@ pub fn compile_to_runtime_flags(
.unsafely_ignore_certificate_errors .unsafely_ignore_certificate_errors
.clone(), .clone(),
no_remote: false, no_remote: false,
prompt: flags.prompt, no_prompt: flags.no_prompt,
reload: false, reload: false,
repl: false, repl: false,
seed: flags.seed, seed: flags.seed,