From 651144541ac0b0c623cc676d125c874c1df8e488 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Amiel Date: Mon, 6 May 2024 16:55:05 +0200 Subject: [PATCH] Update generated files. --- bin/spec/options/option.py | 4 +++- completions/_hurl | 6 +++--- completions/_hurl.ps1 | 6 +++--- completions/hurl.fish | 6 +++--- docs/spec/options/hurl/delay.option | 2 +- docs/spec/options/hurl/follow_location_trusted.option | 2 +- docs/spec/options/hurl/ssl_no_revoke.option | 2 +- integration/hurl/tests_ok/help.out.pattern | 7 +++---- packages/hurl/src/cli/options/commands.rs | 6 +++--- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/bin/spec/options/option.py b/bin/spec/options/option.py index f9268b5cd..3d84de884 100644 --- a/bin/spec/options/option.py +++ b/bin/spec/options/option.py @@ -97,7 +97,9 @@ class Option: elif v == "false": cli_only = False else: - raise Exception(f"{name}: Expected true or false for cli attribute") + raise Exception( + f"{name}: Expected true or false for cli attribute" + ) elif key == "deprecated": if v == "true": deprecated = True diff --git a/completions/_hurl b/completions/_hurl index 5f3f638ee..4f962f175 100644 --- a/completions/_hurl +++ b/completions/_hurl @@ -26,12 +26,12 @@ _hurl() { '--continue-on-error[Continue executing requests even if an error occurs]' \ '(-b --cookie)'{-b,--cookie}'[Read cookies from FILE]: :_files' \ '(-c --cookie-jar)'{-c,--cookie-jar}'[Write cookies to FILE after running the session (only for one session)]: :_files' \ - '--delay[Sets delay before each request.]: :' \ + '--delay[Sets delay before each request]: :' \ '--error-format[Control the format of error messages]: :' \ '--fail-at-end[Fail at end]' \ '--file-root[Set root directory to import files \[default: input file directory\]]: :' \ '(-L --location)'{-L,--location}'[Follow redirects]' \ - '--location-trusted[Follow redirects but allows sending the name + password to all hosts that the site may redirect to.]' \ + '--location-trusted[Follow redirects but allows sending the name + password to all hosts that the site may redirect to]' \ '--from-entry[Execute Hurl file from ENTRY_NUMBER (starting at 1)]: :' \ '*--glob[Specify input files that match the given GLOB. Multiple glob flags may be used]: :' \ '(-0 --http1.0)'{-0,--http1.0}'[Tell Hurl to use HTTP version 1.0]' \ @@ -65,7 +65,7 @@ _hurl() { '*--resolve[Provide a custom address for a specific HOST and PORT pair]: :' \ '--retry[Maximum number of retries, 0 for no retries, -1 for unlimited retries]: :' \ '--retry-interval[Interval in milliseconds before a retry]: :' \ - '--ssl-no-revoke[(Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that.]' \ + '--ssl-no-revoke[(Windows) Tell Hurl to disable certificate revocation checks]' \ '--test[Activate test mode]' \ '--to-entry[Execute Hurl file to ENTRY_NUMBER (starting at 1)]: :' \ '--unix-socket[(HTTP) Connect through this Unix domain socket, instead of using the network]: :_files' \ diff --git a/completions/_hurl.ps1 b/completions/_hurl.ps1 index 7040cd187..dc5b68842 100644 --- a/completions/_hurl.ps1 +++ b/completions/_hurl.ps1 @@ -31,12 +31,12 @@ Register-ArgumentCompleter -Native -CommandName 'hurl' -ScriptBlock { [CompletionResult]::new('--continue-on-error', 'continue-on-error', [CompletionResultType]::ParameterName, 'Continue executing requests even if an error occurs') [CompletionResult]::new('--cookie', 'cookie', [CompletionResultType]::ParameterName, 'Read cookies from FILE') [CompletionResult]::new('--cookie-jar', 'cookie-jar', [CompletionResultType]::ParameterName, 'Write cookies to FILE after running the session (only for one session)') - [CompletionResult]::new('--delay', 'delay', [CompletionResultType]::ParameterName, 'Sets delay before each request.') + [CompletionResult]::new('--delay', 'delay', [CompletionResultType]::ParameterName, 'Sets delay before each request') [CompletionResult]::new('--error-format', 'error-format', [CompletionResultType]::ParameterName, 'Control the format of error messages') [CompletionResult]::new('--fail-at-end', 'fail-at-end', [CompletionResultType]::ParameterName, 'Fail at end') [CompletionResult]::new('--file-root', 'file-root', [CompletionResultType]::ParameterName, 'Set root directory to import files [default: input file directory]') [CompletionResult]::new('--location', 'location', [CompletionResultType]::ParameterName, 'Follow redirects') - [CompletionResult]::new('--location-trusted', 'location-trusted', [CompletionResultType]::ParameterName, 'Follow redirects but allows sending the name + password to all hosts that the site may redirect to.') + [CompletionResult]::new('--location-trusted', 'location-trusted', [CompletionResultType]::ParameterName, 'Follow redirects but allows sending the name + password to all hosts that the site may redirect to') [CompletionResult]::new('--from-entry', 'from-entry', [CompletionResultType]::ParameterName, 'Execute Hurl file from ENTRY_NUMBER (starting at 1)') [CompletionResult]::new('--glob', 'glob', [CompletionResultType]::ParameterName, 'Specify input files that match the given GLOB. Multiple glob flags may be used') [CompletionResult]::new('--http1.0', 'http1.0', [CompletionResultType]::ParameterName, 'Tell Hurl to use HTTP version 1.0') @@ -70,7 +70,7 @@ Register-ArgumentCompleter -Native -CommandName 'hurl' -ScriptBlock { [CompletionResult]::new('--resolve', 'resolve', [CompletionResultType]::ParameterName, 'Provide a custom address for a specific HOST and PORT pair') [CompletionResult]::new('--retry', 'retry', [CompletionResultType]::ParameterName, 'Maximum number of retries, 0 for no retries, -1 for unlimited retries') [CompletionResult]::new('--retry-interval', 'retry-interval', [CompletionResultType]::ParameterName, 'Interval in milliseconds before a retry') - [CompletionResult]::new('--ssl-no-revoke', 'ssl-no-revoke', [CompletionResultType]::ParameterName, '(Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that.') + [CompletionResult]::new('--ssl-no-revoke', 'ssl-no-revoke', [CompletionResultType]::ParameterName, '(Windows) Tell Hurl to disable certificate revocation checks') [CompletionResult]::new('--test', 'test', [CompletionResultType]::ParameterName, 'Activate test mode') [CompletionResult]::new('--to-entry', 'to-entry', [CompletionResultType]::ParameterName, 'Execute Hurl file to ENTRY_NUMBER (starting at 1)') [CompletionResult]::new('--unix-socket', 'unix-socket', [CompletionResultType]::ParameterName, '(HTTP) Connect through this Unix domain socket, instead of using the network') diff --git a/completions/hurl.fish b/completions/hurl.fish index 72ebb0fa6..c34fbf47d 100644 --- a/completions/hurl.fish +++ b/completions/hurl.fish @@ -9,12 +9,12 @@ complete -c hurl -l connect-to -d 'For a request to the given HOST1:PORT1 pair, complete -c hurl -l continue-on-error -d 'Continue executing requests even if an error occurs' complete -c hurl -l cookie -d 'Read cookies from FILE' complete -c hurl -l cookie-jar -d 'Write cookies to FILE after running the session (only for one session)' -complete -c hurl -l delay -d 'Sets delay before each request.' +complete -c hurl -l delay -d 'Sets delay before each request' complete -c hurl -l error-format -d 'Control the format of error messages' complete -c hurl -l fail-at-end -d 'Fail at end' complete -c hurl -l file-root -d 'Set root directory to import files [default: input file directory]' complete -c hurl -l location -d 'Follow redirects' -complete -c hurl -l location-trusted -d 'Follow redirects but allows sending the name + password to all hosts that the site may redirect to.' +complete -c hurl -l location-trusted -d 'Follow redirects but allows sending the name + password to all hosts that the site may redirect to' complete -c hurl -l from-entry -d 'Execute Hurl file from ENTRY_NUMBER (starting at 1)' complete -c hurl -l glob -d 'Specify input files that match the given GLOB. Multiple glob flags may be used' complete -c hurl -l http1.0 -d 'Tell Hurl to use HTTP version 1.0' @@ -48,7 +48,7 @@ complete -c hurl -l report-tap -d 'Write a TAP report to FILE' complete -c hurl -l resolve -d 'Provide a custom address for a specific HOST and PORT pair' complete -c hurl -l retry -d 'Maximum number of retries, 0 for no retries, -1 for unlimited retries' complete -c hurl -l retry-interval -d 'Interval in milliseconds before a retry' -complete -c hurl -l ssl-no-revoke -d '(Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that.' +complete -c hurl -l ssl-no-revoke -d '(Windows) Tell Hurl to disable certificate revocation checks' complete -c hurl -l test -d 'Activate test mode' complete -c hurl -l to-entry -d 'Execute Hurl file to ENTRY_NUMBER (starting at 1)' complete -c hurl -l unix-socket -d '(HTTP) Connect through this Unix domain socket, instead of using the network' diff --git a/docs/spec/options/hurl/delay.option b/docs/spec/options/hurl/delay.option index f9c8370bc..9e7e2ef85 100644 --- a/docs/spec/options/hurl/delay.option +++ b/docs/spec/options/hurl/delay.option @@ -3,6 +3,6 @@ long: delay value: MILLISECONDS value_default: 0 value_parser: clap::value_parser!(u64) -help: Sets delay before each request. +help: Sets delay before each request --- Sets delay before each request. diff --git a/docs/spec/options/hurl/follow_location_trusted.option b/docs/spec/options/hurl/follow_location_trusted.option index 68ad8c99c..5cf6cca1f 100644 --- a/docs/spec/options/hurl/follow_location_trusted.option +++ b/docs/spec/options/hurl/follow_location_trusted.option @@ -1,6 +1,6 @@ name: follow_location_trusted long: location-trusted -help: Follow redirects but allows sending the name + password to all hosts that the site may redirect to. +help: Follow redirects but allows sending the name + password to all hosts that the site may redirect to --- Like [`-L, --location`](#location), but allows sending the name + password to all hosts that the site may redirect to. This may or may not introduce a security breach if the site redirects you to a site to which you send your authentication info (which is plaintext in the case of HTTP Basic authentication). diff --git a/docs/spec/options/hurl/ssl_no_revoke.option b/docs/spec/options/hurl/ssl_no_revoke.option index a991de8df..7f4d57491 100644 --- a/docs/spec/options/hurl/ssl_no_revoke.option +++ b/docs/spec/options/hurl/ssl_no_revoke.option @@ -1,6 +1,6 @@ name: ssl_no_revoke long: ssl-no-revoke -help: (Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that. +help: (Windows) Tell Hurl to disable certificate revocation checks cli_only: true --- (Windows) This option tells Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that. diff --git a/integration/hurl/tests_ok/help.out.pattern b/integration/hurl/tests_ok/help.out.pattern index 4a6e77069..44d78d4f6 100644 --- a/integration/hurl/tests_ok/help.out.pattern +++ b/integration/hurl/tests_ok/help.out.pattern @@ -29,7 +29,7 @@ Options: -c, --cookie-jar Write cookies to FILE after running the session (only for one session) --delay - Sets delay before each request. [default: 0] + Sets delay before each request [default: 0] --error-format Control the format of error messages [default: short] [possible values: short, long] --file-root @@ -38,7 +38,7 @@ Options: Follow redirects --location-trusted Follow redirects but allows sending the name + password to all hosts that the site may - redirect to. + redirect to --from-entry Execute Hurl file from ENTRY_NUMBER (starting at 1) --glob @@ -108,8 +108,7 @@ Options: --retry-interval Interval in milliseconds before a retry [default: 1000] --ssl-no-revoke - (Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens - the SSL security, and by using this flag you ask for exactly that. + (Windows) Tell Hurl to disable certificate revocation checks --test Activate test mode --to-entry diff --git a/packages/hurl/src/cli/options/commands.rs b/packages/hurl/src/cli/options/commands.rs index 221d0b08e..f2c72c3f4 100644 --- a/packages/hurl/src/cli/options/commands.rs +++ b/packages/hurl/src/cli/options/commands.rs @@ -124,7 +124,7 @@ pub fn delay() -> clap::Arg { .value_name("MILLISECONDS") .default_value("0") .value_parser(clap::value_parser!(u64)) - .help("Sets delay before each request.") + .help("Sets delay before each request") .num_args(1) } @@ -165,7 +165,7 @@ pub fn follow_location() -> clap::Arg { pub fn follow_location_trusted() -> clap::Arg { clap::Arg::new("follow_location_trusted") .long("location-trusted") - .help("Follow redirects but allows sending the name + password to all hosts that the site may redirect to.") + .help("Follow redirects but allows sending the name + password to all hosts that the site may redirect to") .action(clap::ArgAction::SetTrue) } @@ -452,7 +452,7 @@ pub fn retry_interval() -> clap::Arg { pub fn ssl_no_revoke() -> clap::Arg { clap::Arg::new("ssl_no_revoke") .long("ssl-no-revoke") - .help("(Windows) Tell Hurl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask for exactly that.") + .help("(Windows) Tell Hurl to disable certificate revocation checks") .action(clap::ArgAction::SetTrue) }