From 7f0546a6b736430e6c39c55cfa77f39e70ffc9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 11 Nov 2022 17:04:57 +0100 Subject: fix(npm): remove forgotten unstable check (#16598) --- cli/tests/integration/run_tests.rs | 10 ++-------- cli/tests/testdata/run/node_env_var_allowlist.ts.out | 5 +++++ .../run/node_env_var_allowlist_with_unstable_flag.ts.out | 5 ----- .../run/node_env_var_allowlist_without_unstable_flag.ts.out | 4 ---- runtime/ops/os/mod.rs | 4 +--- 5 files changed, 8 insertions(+), 20 deletions(-) create mode 100644 cli/tests/testdata/run/node_env_var_allowlist.ts.out delete mode 100644 cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out delete mode 100644 cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs index 09fc7b426..fd60e85b7 100644 --- a/cli/tests/integration/run_tests.rs +++ b/cli/tests/integration/run_tests.rs @@ -2918,15 +2918,9 @@ itest!(nested_error { exit_code: 1, }); -itest!(node_env_var_allowlist_with_unstable_flag { +itest!(node_env_var_allowlist { args: "run --unstable --no-prompt run/node_env_var_allowlist.ts", - output: "run/node_env_var_allowlist_with_unstable_flag.ts.out", - exit_code: 1, -}); - -itest!(node_env_var_allowlist_without_unstable_flag { - args: "run --no-prompt run/node_env_var_allowlist.ts", - output: "run/node_env_var_allowlist_without_unstable_flag.ts.out", + output: "run/node_env_var_allowlist.ts.out", exit_code: 1, }); diff --git a/cli/tests/testdata/run/node_env_var_allowlist.ts.out b/cli/tests/testdata/run/node_env_var_allowlist.ts.out new file mode 100644 index 000000000..62f335c0f --- /dev/null +++ b/cli/tests/testdata/run/node_env_var_allowlist.ts.out @@ -0,0 +1,5 @@ +ok +[WILDCARD]error: Uncaught PermissionDenied: Requires env access to "NOT_NODE_DEBUG", run again with the --allow-env flag +Deno.env.get("NOT_NODE_DEBUG"); + ^ + at [WILDCARD] diff --git a/cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out b/cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out deleted file mode 100644 index 62f335c0f..000000000 --- a/cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out +++ /dev/null @@ -1,5 +0,0 @@ -ok -[WILDCARD]error: Uncaught PermissionDenied: Requires env access to "NOT_NODE_DEBUG", run again with the --allow-env flag -Deno.env.get("NOT_NODE_DEBUG"); - ^ - at [WILDCARD] diff --git a/cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out b/cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out deleted file mode 100644 index ac92cdb6b..000000000 --- a/cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out +++ /dev/null @@ -1,4 +0,0 @@ -[WILDCARD]error: Uncaught PermissionDenied: Requires env access to "NODE_DEBUG", run again with the --allow-env flag -console.log(Deno.env.get("NODE_DEBUG") ?? "ok"); - ^ - at [WILDCARD] diff --git a/runtime/ops/os/mod.rs b/runtime/ops/os/mod.rs index a46f5740a..b93935955 100644 --- a/runtime/ops/os/mod.rs +++ b/runtime/ops/os/mod.rs @@ -112,9 +112,7 @@ fn op_get_env( state: &mut OpState, key: String, ) -> Result, AnyError> { - let skip_permission_check = - state.borrow::().unstable - && NODE_ENV_VAR_ALLOWLIST.contains(&key); + let skip_permission_check = NODE_ENV_VAR_ALLOWLIST.contains(&key); if !skip_permission_check { state.borrow_mut::().env.check(&key)?; -- cgit v1.2.3