mirror of
https://github.com/nushell/nushell.git
synced 2025-01-11 08:48:23 +01:00
Fix insecure + max-time arguments for HTTP commands. (#8266)
# Description Follow up of https://github.com/nushell/nushell/pull/8255 Sorry about the max-time argument, I didn't pay attention to the copy-paste. Regarding the insecure argument, the problem was before I began to work on the refacto. My mistake was to not have tested this argument. # User-Facing Changes None. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
This commit is contained in:
parent
ffc3727a1e
commit
50f1e33965
@ -139,7 +139,7 @@ struct Arguments {
|
|||||||
content_type: Option<String>,
|
content_type: Option<String>,
|
||||||
content_length: Option<String>,
|
content_length: Option<String>,
|
||||||
raw: bool,
|
raw: bool,
|
||||||
insecure: Option<bool>,
|
insecure: bool,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
timeout: Option<Value>,
|
timeout: Option<Value>,
|
||||||
@ -158,11 +158,12 @@ fn run_delete(
|
|||||||
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
||||||
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
||||||
raw: call.has_flag("raw"),
|
raw: call.has_flag("raw"),
|
||||||
insecure: call.get_flag(engine_state, stack, "insecure")?,
|
insecure: call.has_flag("insecure"),
|
||||||
user: call.get_flag(engine_state, stack, "user")?,
|
user: call.get_flag(engine_state, stack, "user")?,
|
||||||
password: call.get_flag(engine_state, stack, "password")?,
|
password: call.get_flag(engine_state, stack, "password")?,
|
||||||
timeout: call.get_flag(engine_state, stack, "timeout")?,
|
timeout: call.get_flag(engine_state, stack, "max-time")?,
|
||||||
};
|
};
|
||||||
|
|
||||||
helper(engine_state, stack, call, args)
|
helper(engine_state, stack, call, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,7 +178,7 @@ fn helper(
|
|||||||
let span = args.url.span()?;
|
let span = args.url.span()?;
|
||||||
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
||||||
|
|
||||||
let client = http_client(args.insecure.is_some());
|
let client = http_client(args.insecure);
|
||||||
let mut request = client.delete(url);
|
let mut request = client.delete(url);
|
||||||
|
|
||||||
if let Some(data) = args.data {
|
if let Some(data) = args.data {
|
||||||
|
@ -106,7 +106,7 @@ impl Command for SubCommand {
|
|||||||
struct Arguments {
|
struct Arguments {
|
||||||
url: Value,
|
url: Value,
|
||||||
headers: Option<Value>,
|
headers: Option<Value>,
|
||||||
insecure: Option<bool>,
|
insecure: bool,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
timeout: Option<Value>,
|
timeout: Option<Value>,
|
||||||
@ -121,11 +121,12 @@ fn run_head(
|
|||||||
let args = Arguments {
|
let args = Arguments {
|
||||||
url: call.req(engine_state, stack, 0)?,
|
url: call.req(engine_state, stack, 0)?,
|
||||||
headers: call.get_flag(engine_state, stack, "headers")?,
|
headers: call.get_flag(engine_state, stack, "headers")?,
|
||||||
insecure: call.get_flag(engine_state, stack, "insecure")?,
|
insecure: call.has_flag("insecure"),
|
||||||
user: call.get_flag(engine_state, stack, "user")?,
|
user: call.get_flag(engine_state, stack, "user")?,
|
||||||
password: call.get_flag(engine_state, stack, "password")?,
|
password: call.get_flag(engine_state, stack, "password")?,
|
||||||
timeout: call.get_flag(engine_state, stack, "timeout")?,
|
timeout: call.get_flag(engine_state, stack, "max-time")?,
|
||||||
};
|
};
|
||||||
|
|
||||||
helper(call, args)
|
helper(call, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,7 +136,7 @@ fn helper(call: &Call, args: Arguments) -> Result<PipelineData, ShellError> {
|
|||||||
let span = args.url.span()?;
|
let span = args.url.span()?;
|
||||||
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
||||||
|
|
||||||
let client = http_client(args.insecure.is_some());
|
let client = http_client(args.insecure);
|
||||||
let mut request = client.head(url);
|
let mut request = client.head(url);
|
||||||
|
|
||||||
request = request_set_timeout(args.timeout, request)?;
|
request = request_set_timeout(args.timeout, request)?;
|
||||||
|
@ -129,7 +129,7 @@ struct Arguments {
|
|||||||
content_type: Option<String>,
|
content_type: Option<String>,
|
||||||
content_length: Option<String>,
|
content_length: Option<String>,
|
||||||
raw: bool,
|
raw: bool,
|
||||||
insecure: Option<bool>,
|
insecure: bool,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
timeout: Option<Value>,
|
timeout: Option<Value>,
|
||||||
@ -148,11 +148,12 @@ fn run_patch(
|
|||||||
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
||||||
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
||||||
raw: call.has_flag("raw"),
|
raw: call.has_flag("raw"),
|
||||||
insecure: call.get_flag(engine_state, stack, "insecure")?,
|
insecure: call.has_flag("insecure"),
|
||||||
user: call.get_flag(engine_state, stack, "user")?,
|
user: call.get_flag(engine_state, stack, "user")?,
|
||||||
password: call.get_flag(engine_state, stack, "password")?,
|
password: call.get_flag(engine_state, stack, "password")?,
|
||||||
timeout: call.get_flag(engine_state, stack, "timeout")?,
|
timeout: call.get_flag(engine_state, stack, "max-time")?,
|
||||||
};
|
};
|
||||||
|
|
||||||
helper(engine_state, stack, call, args)
|
helper(engine_state, stack, call, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,7 +168,7 @@ fn helper(
|
|||||||
let span = args.url.span()?;
|
let span = args.url.span()?;
|
||||||
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
||||||
|
|
||||||
let client = http_client(args.insecure.is_some());
|
let client = http_client(args.insecure);
|
||||||
let mut request = client.patch(url);
|
let mut request = client.patch(url);
|
||||||
|
|
||||||
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
||||||
|
@ -129,7 +129,7 @@ struct Arguments {
|
|||||||
content_type: Option<String>,
|
content_type: Option<String>,
|
||||||
content_length: Option<String>,
|
content_length: Option<String>,
|
||||||
raw: bool,
|
raw: bool,
|
||||||
insecure: Option<bool>,
|
insecure: bool,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
timeout: Option<Value>,
|
timeout: Option<Value>,
|
||||||
@ -148,11 +148,12 @@ fn run_post(
|
|||||||
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
||||||
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
||||||
raw: call.has_flag("raw"),
|
raw: call.has_flag("raw"),
|
||||||
insecure: call.get_flag(engine_state, stack, "insecure")?,
|
insecure: call.has_flag("insecure"),
|
||||||
user: call.get_flag(engine_state, stack, "user")?,
|
user: call.get_flag(engine_state, stack, "user")?,
|
||||||
password: call.get_flag(engine_state, stack, "password")?,
|
password: call.get_flag(engine_state, stack, "password")?,
|
||||||
timeout: call.get_flag(engine_state, stack, "timeout")?,
|
timeout: call.get_flag(engine_state, stack, "max-time")?,
|
||||||
};
|
};
|
||||||
|
|
||||||
helper(engine_state, stack, call, args)
|
helper(engine_state, stack, call, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,7 +168,7 @@ fn helper(
|
|||||||
let span = args.url.span()?;
|
let span = args.url.span()?;
|
||||||
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
||||||
|
|
||||||
let client = http_client(args.insecure.is_some());
|
let client = http_client(args.insecure);
|
||||||
let mut request = client.post(url);
|
let mut request = client.post(url);
|
||||||
|
|
||||||
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
||||||
|
@ -129,7 +129,7 @@ struct Arguments {
|
|||||||
content_type: Option<String>,
|
content_type: Option<String>,
|
||||||
content_length: Option<String>,
|
content_length: Option<String>,
|
||||||
raw: bool,
|
raw: bool,
|
||||||
insecure: Option<bool>,
|
insecure: bool,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
timeout: Option<Value>,
|
timeout: Option<Value>,
|
||||||
@ -148,11 +148,12 @@ fn run_put(
|
|||||||
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
content_type: call.get_flag(engine_state, stack, "content-type")?,
|
||||||
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
content_length: call.get_flag(engine_state, stack, "content-length")?,
|
||||||
raw: call.has_flag("raw"),
|
raw: call.has_flag("raw"),
|
||||||
insecure: call.get_flag(engine_state, stack, "insecure")?,
|
insecure: call.has_flag("insecure"),
|
||||||
user: call.get_flag(engine_state, stack, "user")?,
|
user: call.get_flag(engine_state, stack, "user")?,
|
||||||
password: call.get_flag(engine_state, stack, "password")?,
|
password: call.get_flag(engine_state, stack, "password")?,
|
||||||
timeout: call.get_flag(engine_state, stack, "timeout")?,
|
timeout: call.get_flag(engine_state, stack, "max-time")?,
|
||||||
};
|
};
|
||||||
|
|
||||||
helper(engine_state, stack, call, args)
|
helper(engine_state, stack, call, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,7 +168,7 @@ fn helper(
|
|||||||
let span = args.url.span()?;
|
let span = args.url.span()?;
|
||||||
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
let (requested_url, url) = http_parse_url(call, span, args.url)?;
|
||||||
|
|
||||||
let client = http_client(args.insecure.is_some());
|
let client = http_client(args.insecure);
|
||||||
let mut request = client.put(url);
|
let mut request = client.put(url);
|
||||||
|
|
||||||
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
request = request_set_body(args.content_type, args.content_length, args.data, request)?;
|
||||||
|
Loading…
Reference in New Issue
Block a user