From 44b2b950fd20e59fca1e6dddf522d456d2fd622f Mon Sep 17 00:00:00 2001 From: Roj Date: Thu, 8 Dec 2022 02:13:45 +0300 Subject: feat(cli): support configuring the lock file in the config file (#16781) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows the user to completely opt out from the lock file or rename it without having to use `--no-lock` and/or `--lock` in all commands. ## Don’t Use Lock File ```json { "lock": false } ``` ## Use Lock File With a Different Name ```json { "lock": "deno2.lock" } ``` The CLI args `--no-lock` and `--lock` will always override what is in the config file. Co-authored-by: David Sherret --- cli/tests/run_tests.rs | 27 ++++++++++++++++++++++ .../run/config_file_lock_boolean/deno.lock | 7 ++++++ .../run/config_file_lock_boolean/false.json | 3 +++ .../run/config_file_lock_boolean/false.main.out | 2 ++ .../testdata/run/config_file_lock_boolean/main.ts | 1 + .../run/config_file_lock_boolean/true.json | 3 +++ .../run/config_file_lock_boolean/true.main.out | 3 +++ cli/tests/testdata/run/config_file_lock_path.json | 3 +++ cli/tests/testdata/run/config_file_lock_path.out | 3 +++ 9 files changed, 52 insertions(+) create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/deno.lock create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/false.json create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/false.main.out create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/main.ts create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/true.json create mode 100644 cli/tests/testdata/run/config_file_lock_boolean/true.main.out create mode 100644 cli/tests/testdata/run/config_file_lock_path.json create mode 100644 cli/tests/testdata/run/config_file_lock_path.out (limited to 'cli/tests') diff --git a/cli/tests/run_tests.rs b/cli/tests/run_tests.rs index db6e6f685..6cae9d9e3 100644 --- a/cli/tests/run_tests.rs +++ b/cli/tests/run_tests.rs @@ -656,6 +656,19 @@ mod run { http_server: true, }); + itest!(config_file_lock_path { + args: "run --config=run/config_file_lock_path.json run/019_media_types.ts", + output: "run/config_file_lock_path.out", + exit_code: 10, + http_server: true, + }); + + itest!(lock_flag_overrides_config_file_lock_path { + args: "run --lock=run/lock_check_ok2.json --config=run/config_file_lock_path.json run/019_media_types.ts", + output: "run/019_media_types.ts.out", + http_server: true, + }); + itest!(lock_v2_check_ok { args: "run --lock=run/lock_v2_check_ok.json http://127.0.0.1:4545/run/003_relative_import.ts", @@ -3662,6 +3675,20 @@ console.log("finish"); exit_code: 0, }); + itest!(config_file_lock_false { + args: "run --config=run/config_file_lock_boolean/false.json run/config_file_lock_boolean/main.ts", + output: "run/config_file_lock_boolean/false.main.out", + http_server: true, + exit_code: 0, +}); + + itest!(config_file_lock_true { + args: "run --config=run/config_file_lock_boolean/true.json run/config_file_lock_boolean/main.ts", + output: "run/config_file_lock_boolean/true.main.out", + http_server: true, + exit_code: 10, +}); + // Check https://github.com/denoland/deno_std/issues/2882 itest!(flash_shutdown { args: "run --unstable --allow-net run/flash_shutdown/main.ts", diff --git a/cli/tests/testdata/run/config_file_lock_boolean/deno.lock b/cli/tests/testdata/run/config_file_lock_boolean/deno.lock new file mode 100644 index 000000000..059f66789 --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/deno.lock @@ -0,0 +1,7 @@ +{ + "version": "2", + "remote": { + "http://localhost:4545/subdir/mod2.ts": "cae1d3e9f3c38cd415ff52dff854be8f3d17d35f8d7b3d285e813fb0f6393a2f", + "http://localhost:4545/subdir/print_hello.ts": "foobar" + } +} diff --git a/cli/tests/testdata/run/config_file_lock_boolean/false.json b/cli/tests/testdata/run/config_file_lock_boolean/false.json new file mode 100644 index 000000000..358b7d299 --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/false.json @@ -0,0 +1,3 @@ +{ + "lock": false +} diff --git a/cli/tests/testdata/run/config_file_lock_boolean/false.main.out b/cli/tests/testdata/run/config_file_lock_boolean/false.main.out new file mode 100644 index 000000000..0d8f0a237 --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/false.main.out @@ -0,0 +1,2 @@ +Download http://localhost:4545/subdir/mod2.ts +Download http://localhost:4545/subdir/print_hello.ts diff --git a/cli/tests/testdata/run/config_file_lock_boolean/main.ts b/cli/tests/testdata/run/config_file_lock_boolean/main.ts new file mode 100644 index 000000000..baa52775d --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/main.ts @@ -0,0 +1 @@ +import "http://localhost:4545/subdir/mod2.ts"; diff --git a/cli/tests/testdata/run/config_file_lock_boolean/true.json b/cli/tests/testdata/run/config_file_lock_boolean/true.json new file mode 100644 index 000000000..090481af9 --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/true.json @@ -0,0 +1,3 @@ +{ + "lock": true +} diff --git a/cli/tests/testdata/run/config_file_lock_boolean/true.main.out b/cli/tests/testdata/run/config_file_lock_boolean/true.main.out new file mode 100644 index 000000000..313c0eb0c --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_boolean/true.main.out @@ -0,0 +1,3 @@ +[WILDCARD]The source code is invalid, as it does not match the expected hash in the lock file. + Specifier: http://localhost:4545/subdir/print_hello.ts + Lock file: [WILDCARD]deno.lock diff --git a/cli/tests/testdata/run/config_file_lock_path.json b/cli/tests/testdata/run/config_file_lock_path.json new file mode 100644 index 000000000..2c393f76e --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_path.json @@ -0,0 +1,3 @@ +{ + "lock": "./lock_check_err2.json" +} diff --git a/cli/tests/testdata/run/config_file_lock_path.out b/cli/tests/testdata/run/config_file_lock_path.out new file mode 100644 index 000000000..97d35337f --- /dev/null +++ b/cli/tests/testdata/run/config_file_lock_path.out @@ -0,0 +1,3 @@ +[WILDCARD]The source code is invalid, as it does not match the expected hash in the lock file. + Specifier: http://localhost:4545/subdir/mt_text_ecmascript.j3.js + Lock file: [WILDCARD]lock_check_err2.json -- cgit v1.2.3