add a json-body option to specify the full body (#458)

This commit is contained in:
Adam Leventhal 2023-05-07 20:43:45 -07:00 committed by GitHub
parent 1121d5948c
commit db1826841e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 2782 additions and 1389 deletions

View File

@ -177,18 +177,19 @@ impl Generator {
&mut self,
method: &crate::method::OperationMethod,
) -> CliOperation {
let maybe_body_arg = method.params.iter().find(|param| {
matches!(&param.kind, OperationParameterKind::Body(_))
// TODO not sure how to deal with raw bodies right now
&& matches!(&param.typ, OperationParameterType::Type(_))
});
let mut full_body = true;
// Preprocess the body parameter (if there is one) to create an
// iterator of top-level properties that can be represented as scalar
// values. We use these to create `clap::Arg` structures and then to
// build up the body parameter in the actual API call.
let body_params = method
.params
.iter()
.find(|param| {
matches!(&param.kind, OperationParameterKind::Body(_))
// TODO not sure how to deal with raw bodies right now
&& matches!(&param.typ, OperationParameterType::Type(_))
})
let body_params = maybe_body_arg
.into_iter()
.flat_map(|param| {
let OperationParameterType::Type(type_id) = &param.typ else {
@ -251,6 +252,14 @@ impl Generator {
prop_type.has_impl(TypeSpaceImpl::FromStr);
let prop_name = prop_name.to_kebab_case();
// If there's a required property that we can't
// represent as a scalar (and therefore as a
// CLI parameter), the user will be unable to
// specify the full body without a json file.
if required && !scalar {
full_body = false;
}
// println!(
// "{}::{}: {}; scalar: {}; required: {}",
// body_args.name(),
@ -289,9 +298,15 @@ impl Generator {
let arg_name = param.name.to_kebab_case();
let required = match &param.kind {
OperationParameterKind::Path => true,
OperationParameterKind::Query(required) => *required,
OperationParameterKind::Header(required) => *required,
OperationParameterKind::Path => Volitionality::Required,
OperationParameterKind::Query(true)
| OperationParameterKind::Header(true) => {
Volitionality::Required
}
OperationParameterKind::Query(false)
| OperationParameterKind::Header(false) => {
Volitionality::Optional
}
OperationParameterKind::Body(_) => unreachable!(),
};
@ -306,7 +321,12 @@ impl Generator {
let body_args = body_params.iter().map(
|(prop_name, required, description, prop_type)| {
clap_arg(prop_name, *required, description, prop_type)
let volitionality = if *required {
Volitionality::RequiredIfNoBody
} else {
Volitionality::Optional
};
clap_arg(prop_name, volitionality, description, prop_type)
},
);
@ -314,6 +334,30 @@ impl Generator {
// TODO parameter to output a body template (--body-template?)
// TODO deal with all parameters?
let body_json_args = maybe_body_arg.map(|_| {
let help = "Path to a file that contains the full json body.";
let required = !full_body;
quote! {
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
// Required if we can't turn the body into individual
// parameters.
.required(#required)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help(#help)
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX")
)
}
});
let about = method.summary.as_ref().map(|summary| {
quote! {
.about(#summary)
@ -336,6 +380,7 @@ impl Generator {
#(
.arg(#body_args)
)*
#body_json_args
#about
#long_about
}
@ -463,15 +508,39 @@ impl Generator {
}
};
let body_json_args = maybe_body_arg.map(|body_param| {
let OperationParameterType::Type(body_type_id) = &body_param.typ
else {
unreachable!();
};
let body_type = self.type_space.get_type(body_type_id).unwrap();
let body_type_ident = body_type.ident();
quote! {
if let Some(value) =
matches.get_one::<std::path::PathBuf>("json-body")
{
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value =
serde_json::from_str::<#body_type_ident>(
&body_txt,
)
.unwrap();
request = request.body(body_value);
}
}
});
let execute_fn = quote! {
pub async fn #fn_name(&self, matches: &clap::ArgMatches)
// ->
// Result<ResponseValue<#success_type>, Error<#error_type>>
{
let mut request = self.client.#op_name();
#body_json_args
#( #args )*
#( #body_args )*
// Call the override function.
// TODO don't want to unwrap.
self.over
.#fn_name(matches, &mut request)
@ -503,9 +572,15 @@ impl Generator {
}
}
enum Volitionality {
Optional,
Required,
RequiredIfNoBody,
}
fn clap_arg(
arg_name: &str,
required: bool,
volitionality: Volitionality,
description: &Option<String>,
arg_type: &Type,
) -> TokenStream {
@ -559,11 +634,19 @@ fn clap_arg(
}
};
let required = match volitionality {
Volitionality::Optional => quote! { .required(false) },
Volitionality::Required => quote! { .required(true) },
Volitionality::RequiredIfNoBody => {
quote! { .required_unless_present("json-body") }
}
};
quote! {
clap::Arg::new(#arg_name)
.long(#arg_name)
.required(#required)
.value_parser(#value_parser)
#required
#help
}
}

View File

@ -729,9 +729,8 @@ impl Generator {
let page = page.into_inner();
// Create a stream from the items of the first page.
let first = futures::stream::iter(
page.items.into_iter().map(Ok)
);
let first =
futures::stream::iter(page.items).map(Ok);
// We unfold subsequent pages using page.next_page
// as the seed value. Each iteration returns its
@ -756,11 +755,8 @@ impl Generator {
let page = page.into_inner();
Some((
futures::stream::iter(
page
.items
.into_iter()
.map(Ok),
),
page.items
).map(Ok),
page.next_page,
))
})
@ -1725,9 +1721,8 @@ impl Generator {
let page = page.into_inner();
// Create a stream from the first page of items.
let first = futures::stream::iter(
page.items.into_iter().map(Ok)
);
let first =
futures::stream::iter(page.items).map(Ok);
// We unfold subsequent pages using page.next_page
// as the seed value. Each iteration returns its
@ -1753,11 +1748,8 @@ impl Generator {
let page = page.into_inner();
Some((
futures::stream::iter(
page
.items
.into_iter()
.map(Ok),
),
page.items
).map(Ok),
(page.next_page, next),
))
})

View File

@ -43,8 +43,8 @@ impl Cli {
clap::Command::new("").arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
}
@ -57,14 +57,28 @@ impl Cli {
.arg(
clap::Arg::new("name")
.long("name")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("script")
.long("script")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -73,14 +87,14 @@ impl Cli {
.arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
.arg(
clap::Arg::new("minseq")
.long("minseq")
.required(false)
.value_parser(clap::value_parser!(u32)),
.value_parser(clap::value_parser!(u32))
.required(false),
)
}
@ -88,8 +102,8 @@ impl Cli {
clap::Command::new("").arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
}
@ -98,23 +112,38 @@ impl Cli {
.arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
.arg(
clap::Arg::new("output")
.long("output")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
}
pub fn cli_user_create() -> clap::Command {
clap::Command::new("").arg(
clap::Command::new("")
.arg(
clap::Arg::new("name")
.long("name")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -127,14 +156,28 @@ impl Cli {
.arg(
clap::Arg::new("bootstrap")
.long("bootstrap")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("token")
.long("token")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -147,26 +190,40 @@ impl Cli {
.arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
.arg(
clap::Arg::new("payload")
.long("payload")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("stream")
.long("stream")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("time")
.long("time")
.required(true)
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>)),
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -174,8 +231,8 @@ impl Cli {
clap::Command::new("").arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
}
@ -184,14 +241,28 @@ impl Cli {
.arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
.arg(
clap::Arg::new("failed")
.long("failed")
.required(true)
.value_parser(clap::value_parser!(bool)),
.value_parser(clap::value_parser!(bool))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -200,20 +271,34 @@ impl Cli {
.arg(
clap::Arg::new("task")
.long("task")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(true),
)
.arg(
clap::Arg::new("path")
.long("path")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("size")
.long("size")
.value_parser(clap::value_parser!(i64))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(true)
.value_parser(clap::value_parser!(i64)),
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -356,6 +441,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_task_submit(&self, matches: &clap::ArgMatches) {
let mut request = self.client.task_submit();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::TaskSubmit>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("name") {
request = request.body_map(|body| body.name(value.clone()))
}
@ -448,6 +539,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_user_create(&self, matches: &clap::ArgMatches) {
let mut request = self.client.user_create();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::UserCreate>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("name") {
request = request.body_map(|body| body.name(value.clone()))
}
@ -482,6 +579,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_worker_bootstrap(&self, matches: &clap::ArgMatches) {
let mut request = self.client.worker_bootstrap();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::WorkerBootstrap>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("bootstrap") {
request = request.body_map(|body| body.bootstrap(value.clone()))
}
@ -522,6 +625,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_worker_task_append(&self, matches: &clap::ArgMatches) {
let mut request = self.client.worker_task_append();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::WorkerAppendTask>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("task") {
request = request.task(value.clone());
}
@ -574,6 +683,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_worker_task_complete(&self, matches: &clap::ArgMatches) {
let mut request = self.client.worker_task_complete();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::WorkerCompleteTask>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("task") {
request = request.task(value.clone());
}
@ -598,6 +713,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_worker_task_add_output(&self, matches: &clap::ArgMatches) {
let mut request = self.client.worker_task_add_output();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::WorkerAddOutput>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("task") {
request = request.task(value.clone());
}

View File

@ -24,21 +24,35 @@ impl Cli {
.arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
.arg(
clap::Arg::new("host")
.long("host")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("key")
.long("key")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -46,8 +60,8 @@ impl Cli {
clap::Command::new("").arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
}
@ -56,8 +70,8 @@ impl Cli {
clap::Command::new("").arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
}
@ -67,38 +81,67 @@ impl Cli {
.arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
.arg(
clap::Arg::new("duration-millis")
.long("duration-millis")
.required(true)
.value_parser(clap::value_parser!(i32)),
.value_parser(clap::value_parser!(i32))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("end-time")
.long("end-time")
.required(true)
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>)),
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("exit-status")
.long("exit-status")
.value_parser(clap::value_parser!(i32))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(true)
.value_parser(clap::value_parser!(i32)),
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
pub fn cli_report_output() -> clap::Command {
clap::Command::new("").arg(
clap::Command::new("")
.arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(true)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
pub fn cli_report_start() -> clap::Command {
@ -106,21 +149,35 @@ impl Cli {
.arg(
clap::Arg::new("authorization")
.long("authorization")
.required(true)
.value_parser(clap::value_parser!(String))
.required(true)
.help("Authorization header (bearer token)"),
)
.arg(
clap::Arg::new("script")
.long("script")
.required(true)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("start-time")
.long("start-time")
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(true)
.value_parser(clap::value_parser!(chrono::DateTime<chrono::offset::Utc>)),
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
}
@ -155,6 +212,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_enrol(&self, matches: &clap::ArgMatches) {
let mut request = self.client.enrol();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::EnrolBody>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("authorization") {
request = request.authorization(value.clone());
}
@ -219,6 +282,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_report_finish(&self, matches: &clap::ArgMatches) {
let mut request = self.client.report_finish();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::ReportFinishBody>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("authorization") {
request = request.authorization(value.clone());
}
@ -251,6 +320,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_report_output(&self, matches: &clap::ArgMatches) {
let mut request = self.client.report_output();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::ReportOutputBody>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("authorization") {
request = request.authorization(value.clone());
}
@ -271,6 +346,12 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_report_start(&self, matches: &clap::ArgMatches) {
let mut request = self.client.report_start();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value = serde_json::from_str::<types::ReportStartBody>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("authorization") {
request = request.authorization(value.clone());
}

View File

@ -21982,7 +21982,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -21997,7 +21997,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -22489,7 +22489,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -22504,7 +22504,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -23105,7 +23105,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -23120,7 +23120,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -23646,7 +23646,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -23661,7 +23661,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -24182,7 +24182,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -24197,7 +24197,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -24374,7 +24374,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -24389,7 +24389,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -24860,7 +24860,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -24875,7 +24875,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -25362,7 +25362,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -25377,7 +25377,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -26028,7 +26028,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -26043,7 +26043,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -27424,7 +27424,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -27439,7 +27439,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -27909,7 +27909,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -27924,7 +27924,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -28749,7 +28749,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -28764,7 +28764,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -29446,7 +29446,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -29461,7 +29461,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -30192,7 +30192,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -30207,7 +30207,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -30890,7 +30890,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -30905,7 +30905,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31139,7 +31139,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31154,7 +31154,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31395,7 +31395,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31410,7 +31410,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31552,7 +31552,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31567,7 +31567,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32077,7 +32077,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32092,7 +32092,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32427,7 +32427,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32442,7 +32442,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32584,7 +32584,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32599,7 +32599,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32800,7 +32800,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32815,7 +32815,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33034,7 +33034,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33049,7 +33049,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33191,7 +33191,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33206,7 +33206,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33535,7 +33535,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33550,7 +33550,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33964,7 +33964,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33979,7 +33979,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -34297,7 +34297,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -34312,7 +34312,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -34830,7 +34830,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -34845,7 +34845,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -35046,7 +35046,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -35061,7 +35061,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -35409,7 +35409,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -35424,7 +35424,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36168,7 +36168,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36183,7 +36183,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36403,7 +36403,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36418,7 +36418,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36601,7 +36601,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36616,7 +36616,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36758,7 +36758,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36773,7 +36773,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36953,7 +36953,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36968,7 +36968,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -37453,7 +37453,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -37468,7 +37468,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -37971,7 +37971,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -37986,7 +37986,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -39066,7 +39066,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -39081,7 +39081,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -39681,7 +39681,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -39696,7 +39696,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40395,7 +40395,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40410,7 +40410,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40553,7 +40553,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40568,7 +40568,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40922,7 +40922,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40937,7 +40937,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})

View File

@ -21776,7 +21776,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -21791,7 +21791,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -22283,7 +22283,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -22298,7 +22298,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -22899,7 +22899,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -22914,7 +22914,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -23440,7 +23440,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -23455,7 +23455,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -23976,7 +23976,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -23991,7 +23991,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -24168,7 +24168,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -24183,7 +24183,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -24654,7 +24654,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -24669,7 +24669,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -25156,7 +25156,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -25171,7 +25171,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -25822,7 +25822,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -25837,7 +25837,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -27218,7 +27218,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -27233,7 +27233,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -27703,7 +27703,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -27718,7 +27718,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -28543,7 +28543,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -28558,7 +28558,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -29240,7 +29240,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -29255,7 +29255,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -29986,7 +29986,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -30001,7 +30001,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -30684,7 +30684,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -30699,7 +30699,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -30933,7 +30933,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -30948,7 +30948,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31189,7 +31189,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31204,7 +31204,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31346,7 +31346,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31361,7 +31361,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -31871,7 +31871,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -31886,7 +31886,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32221,7 +32221,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32236,7 +32236,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32378,7 +32378,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32393,7 +32393,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32594,7 +32594,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32609,7 +32609,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32828,7 +32828,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -32843,7 +32843,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -32985,7 +32985,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33000,7 +33000,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33329,7 +33329,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33344,7 +33344,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -33758,7 +33758,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -33773,7 +33773,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -34091,7 +34091,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -34106,7 +34106,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -34624,7 +34624,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -34639,7 +34639,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -34840,7 +34840,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -34855,7 +34855,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -35203,7 +35203,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -35218,7 +35218,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -35962,7 +35962,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -35977,7 +35977,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36197,7 +36197,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36212,7 +36212,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36395,7 +36395,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36410,7 +36410,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36552,7 +36552,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36567,7 +36567,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -36747,7 +36747,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -36762,7 +36762,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -37247,7 +37247,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -37262,7 +37262,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -37765,7 +37765,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -37780,7 +37780,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -38860,7 +38860,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -38875,7 +38875,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -39475,7 +39475,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -39490,7 +39490,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40189,7 +40189,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40204,7 +40204,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40347,7 +40347,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40362,7 +40362,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})
@ -40716,7 +40716,7 @@ pub mod builder {
self.send()
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(
(page.next_page, next),
|(next_page, next)| async {
@ -40731,7 +40731,7 @@ pub mod builder {
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
futures::stream::iter(page.items).map(Ok),
(page.next_page, next),
))
})

File diff suppressed because it is too large Load Diff

View File

@ -6481,7 +6481,7 @@ impl Client {
self.group_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -6489,10 +6489,7 @@ impl Client {
self.group_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -6738,7 +6735,7 @@ impl Client {
self.organization_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -6746,10 +6743,7 @@ impl Client {
self.organization_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -7085,7 +7079,7 @@ impl Client {
self.project_list(organization_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -7093,10 +7087,7 @@ impl Client {
self.project_list(organization_name, None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -7378,7 +7369,7 @@ impl Client {
self.disk_list(organization_name, project_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -7392,10 +7383,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -7654,7 +7642,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -7671,10 +7659,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -7784,7 +7769,7 @@ impl Client {
self.image_list(organization_name, project_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -7798,10 +7783,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -8038,7 +8020,7 @@ impl Client {
self.instance_list(organization_name, project_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -8052,10 +8034,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -8304,7 +8283,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -8319,10 +8298,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -8612,7 +8588,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -8627,10 +8603,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -9241,7 +9214,7 @@ impl Client {
self.snapshot_list(organization_name, project_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -9255,10 +9228,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -9488,7 +9458,7 @@ impl Client {
self.vpc_list(organization_name, project_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -9502,10 +9472,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -9871,7 +9838,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -9886,10 +9853,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -10188,7 +10152,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -10204,10 +10168,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -10503,7 +10464,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -10518,10 +10479,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -10816,7 +10774,7 @@ impl Client {
)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -10832,10 +10790,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -10976,7 +10931,7 @@ impl Client {
self.role_list(limit, None)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -10984,10 +10939,7 @@ impl Client {
self.role_list(None, state.as_deref())
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -11142,7 +11094,7 @@ impl Client {
self.session_me_groups(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -11150,10 +11102,7 @@ impl Client {
self.session_me_groups(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -11246,7 +11195,7 @@ impl Client {
self.session_sshkey_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -11254,10 +11203,7 @@ impl Client {
self.session_sshkey_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -11564,7 +11510,7 @@ impl Client {
self.certificate_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -11572,10 +11518,7 @@ impl Client {
self.certificate_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -11771,7 +11714,7 @@ impl Client {
self.physical_disk_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -11779,10 +11722,7 @@ impl Client {
self.physical_disk_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -11871,7 +11811,7 @@ impl Client {
self.rack_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -11879,10 +11819,7 @@ impl Client {
self.rack_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12008,7 +11945,7 @@ impl Client {
self.sled_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12016,10 +11953,7 @@ impl Client {
self.sled_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12155,7 +12089,7 @@ impl Client {
self.sled_physical_disk_list(sled_id, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12163,10 +12097,7 @@ impl Client {
self.sled_physical_disk_list(sled_id, None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12264,7 +12195,7 @@ impl Client {
self.system_image_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12272,10 +12203,7 @@ impl Client {
self.system_image_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12472,7 +12400,7 @@ impl Client {
self.ip_pool_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12480,10 +12408,7 @@ impl Client {
self.ip_pool_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12712,7 +12637,7 @@ impl Client {
self.ip_pool_range_list(pool_name, limit, None)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12720,10 +12645,7 @@ impl Client {
self.ip_pool_range_list(pool_name, None, state.as_deref())
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -12910,7 +12832,7 @@ impl Client {
self.ip_pool_service_range_list(limit, None)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -12918,10 +12840,7 @@ impl Client {
self.ip_pool_service_range_list(None, state.as_deref())
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -13199,7 +13118,7 @@ impl Client {
self.saga_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -13207,10 +13126,7 @@ impl Client {
self.saga_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -13337,7 +13253,7 @@ impl Client {
self.silo_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -13345,10 +13261,7 @@ impl Client {
self.silo_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -13556,7 +13469,7 @@ impl Client {
self.silo_identity_provider_list(silo_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -13564,10 +13477,7 @@ impl Client {
self.silo_identity_provider_list(silo_name, None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -13957,7 +13867,7 @@ impl Client {
self.silo_users_list(silo_name, limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -13965,10 +13875,7 @@ impl Client {
self.silo_users_list(silo_name, None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14098,7 +14005,7 @@ impl Client {
self.system_user_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14106,10 +14013,7 @@ impl Client {
self.system_user_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14228,7 +14132,7 @@ impl Client {
self.timeseries_schema_get(limit, None)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14236,10 +14140,7 @@ impl Client {
self.timeseries_schema_get(None, state.as_deref())
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14328,7 +14229,7 @@ impl Client {
self.user_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14336,10 +14237,7 @@ impl Client {
self.user_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14444,7 +14342,7 @@ impl Client {
self.disk_list_v1(limit, organization, None, project, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14452,10 +14350,7 @@ impl Client {
self.disk_list_v1(None, None, state.as_deref(), None, None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14693,7 +14588,7 @@ impl Client {
self.instance_list_v1(limit, organization, None, project, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14701,10 +14596,7 @@ impl Client {
self.instance_list_v1(None, None, state.as_deref(), None, None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -14949,7 +14841,7 @@ impl Client {
self.instance_disk_list_v1(instance, limit, organization, None, project, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -14964,10 +14856,7 @@ impl Client {
)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -15464,7 +15353,7 @@ impl Client {
self.organization_list_v1(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -15472,10 +15361,7 @@ impl Client {
self.organization_list_v1(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -15777,7 +15663,7 @@ impl Client {
self.project_list_v1(limit, organization, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -15785,10 +15671,7 @@ impl Client {
self.project_list_v1(None, None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -16122,7 +16005,7 @@ impl Client {
self.system_component_version_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -16130,10 +16013,7 @@ impl Client {
self.system_component_version_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -16223,7 +16103,7 @@ impl Client {
self.update_deployments_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -16231,10 +16111,7 @@ impl Client {
self.update_deployments_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}
@ -16449,7 +16326,7 @@ impl Client {
self.system_update_list(limit, None, sort_by)
.map_ok(move |page| {
let page = page.into_inner();
let first = futures::stream::iter(page.items.into_iter().map(Ok));
let first = futures::stream::iter(page.items).map(Ok);
let rest = futures::stream::try_unfold(page.next_page, move |state| async move {
if state.is_none() {
Ok(None)
@ -16457,10 +16334,7 @@ impl Client {
self.system_update_list(None, state.as_deref(), None)
.map_ok(|page| {
let page = page.into_inner();
Some((
futures::stream::iter(page.items.into_iter().map(Ok)),
page.next_page,
))
Some((futures::stream::iter(page.items).map(Ok), page.next_page))
})
.await
}

View File

@ -19,15 +19,15 @@ impl Cli {
.arg(
clap::Arg::new("key")
.long("key")
.required(false)
.value_parser(clap::value_parser!(bool))
.required(false)
.help("The same key parameter that overlaps with the path level parameter"),
)
.arg(
clap::Arg::new("unique-key")
.long("unique-key")
.required(false)
.value_parser(clap::value_parser!(String))
.required(false)
.help("A key parameter that will not be overridden by the path spec"),
)
.long_about("Gets a key")

View File

@ -27,11 +27,26 @@ impl Cli {
}
pub fn cli_instance_ensure() -> clap::Command {
clap::Command::new("").arg(
clap::Command::new("")
.arg(
clap::Arg::new("cloud-init-bytes")
.long("cloud-init-bytes")
.required(false)
.value_parser(clap::value_parser!(String)),
.value_parser(clap::value_parser!(String))
.required(false),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(true)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -40,24 +55,39 @@ impl Cli {
.arg(
clap::Arg::new("id")
.long("id")
.required(true)
.value_parser(clap::value_parser!(uuid::Uuid)),
.value_parser(clap::value_parser!(uuid::Uuid))
.required(true),
)
.arg(
clap::Arg::new("snapshot-id")
.long("snapshot-id")
.required(true)
.value_parser(clap::value_parser!(uuid::Uuid)),
.value_parser(clap::value_parser!(uuid::Uuid))
.required(true),
)
.about("Issue a snapshot request to a crucible backend")
}
pub fn cli_instance_migrate_status() -> clap::Command {
clap::Command::new("").arg(
clap::Command::new("")
.arg(
clap::Arg::new("migration-id")
.long("migration-id")
.required(true)
.value_parser(clap::value_parser!(uuid::Uuid)),
.value_parser(clap::value_parser!(uuid::Uuid))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
@ -67,14 +97,43 @@ impl Cli {
pub fn cli_instance_state_put() -> clap::Command {
clap::Command::new("")
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
pub fn cli_instance_state_monitor() -> clap::Command {
clap::Command::new("").arg(
clap::Command::new("")
.arg(
clap::Arg::new("gen")
.long("gen")
.required(true)
.value_parser(clap::value_parser!(u64)),
.value_parser(clap::value_parser!(u64))
.required_unless_present("json-body"),
)
.arg(
clap::Arg::new("json-body")
.long("json-body")
.value_name("JSON-FILE")
.required(false)
.value_parser(clap::value_parser!(std::path::PathBuf))
.help("Path to a file that contains the full json body."),
)
.arg(
clap::Arg::new("json-body-template")
.long("json-body-template")
.action(clap::ArgAction::SetTrue)
.help("XXX"),
)
}
}
@ -129,6 +188,13 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_instance_ensure(&self, matches: &clap::ArgMatches) {
let mut request = self.client.instance_ensure();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value =
serde_json::from_str::<types::InstanceEnsureRequest>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<String>("cloud-init-bytes") {
request = request.body_map(|body| body.cloud_init_bytes(value.clone()))
}
@ -176,6 +242,13 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_instance_migrate_status(&self, matches: &clap::ArgMatches) {
let mut request = self.client.instance_migrate_status();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value =
serde_json::from_str::<types::InstanceMigrateStatusRequest>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<uuid::Uuid>("migration-id") {
request = request.body_map(|body| body.migration_id(value.clone()))
}
@ -212,6 +285,13 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_instance_state_put(&self, matches: &clap::ArgMatches) {
let mut request = self.client.instance_state_put();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value =
serde_json::from_str::<types::InstanceStateRequested>(&body_txt).unwrap();
request = request.body(body_value);
}
self.over
.execute_instance_state_put(matches, &mut request)
.unwrap();
@ -228,6 +308,13 @@ impl<T: CliOverride> Cli<T> {
pub async fn execute_instance_state_monitor(&self, matches: &clap::ArgMatches) {
let mut request = self.client.instance_state_monitor();
if let Some(value) = matches.get_one::<std::path::PathBuf>("json-body") {
let body_txt = std::fs::read_to_string(value).unwrap();
let body_value =
serde_json::from_str::<types::InstanceStateMonitorRequest>(&body_txt).unwrap();
request = request.body(body_value);
}
if let Some(value) = matches.get_one::<u64>("gen") {
request = request.body_map(|body| body.gen(value.clone()))
}