ryan
/
progenitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builds can fail if TryFrom is not imported... sufficiently (#393)

This commit is contained in:
Adam Leventhal 2023-03-27 10:45:25 -07:00 committed by GitHub
parent 0685922adc
commit 297a0c2f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 135 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
progenitor-impl/src/method.rs
View File

@ -1416,10 +1416,12 @@ impl Generator {
.map(|param| match &param.typ { .map(|param| match &param.typ {
OperationParameterType::Type(type_id) => { OperationParameterType::Type(type_id) => {
let ty = self.type_space.get_type(type_id)?; let ty = self.type_space.get_type(type_id)?;
if let Some(_) = ty.builder() { if ty.builder().is_some() {
let type_name = ty.ident(); let type_name = ty.ident();
Ok(quote! { Ok(quote! {
.and_then(#type_name :: try_from) .and_then(
std::convert::TryInto::<#type_name>::try_into
)
}) })
} else { } else {
Ok(quote! {}) Ok(quote! {})

12
progenitor-impl/tests/output/buildomat-builder-tagged.out
View File

@ -2012,7 +2012,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::TaskSubmitResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::TaskSubmitResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::TaskSubmit::try_from) .and_then(std::convert::TryInto::<types::TaskSubmit>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/tasks", client.baseurl,); let url = format!("{}/v1/tasks", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2243,7 +2243,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::UserCreateResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::UserCreateResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::UserCreate::try_from) .and_then(std::convert::TryInto::<types::UserCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/users", client.baseurl,); let url = format!("{}/v1/users", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2323,7 +2323,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkerBootstrapResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::WorkerBootstrapResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::WorkerBootstrap::try_from) .and_then(std::convert::TryInto::<types::WorkerBootstrap>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/worker/bootstrap", client.baseurl,); let url = format!("{}/v1/worker/bootstrap", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2418,7 +2418,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerAppendTask::try_from) .and_then(std::convert::TryInto::<types::WorkerAppendTask>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/append", "{}/v1/worker/task/{}/append",
@ -2557,7 +2557,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerCompleteTask::try_from) .and_then(std::convert::TryInto::<types::WorkerCompleteTask>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/complete", "{}/v1/worker/task/{}/complete",
@ -2627,7 +2627,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerAddOutput::try_from) .and_then(std::convert::TryInto::<types::WorkerAddOutput>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/output", "{}/v1/worker/task/{}/output",

12
progenitor-impl/tests/output/buildomat-builder.out
View File

@ -2012,7 +2012,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::TaskSubmitResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::TaskSubmitResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::TaskSubmit::try_from) .and_then(std::convert::TryInto::<types::TaskSubmit>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/tasks", client.baseurl,); let url = format!("{}/v1/tasks", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2243,7 +2243,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::UserCreateResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::UserCreateResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::UserCreate::try_from) .and_then(std::convert::TryInto::<types::UserCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/users", client.baseurl,); let url = format!("{}/v1/users", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2323,7 +2323,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkerBootstrapResult>, Error<()>> { pub async fn send(self) -> Result<ResponseValue<types::WorkerBootstrapResult>, Error<()>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::WorkerBootstrap::try_from) .and_then(std::convert::TryInto::<types::WorkerBootstrap>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/worker/bootstrap", client.baseurl,); let url = format!("{}/v1/worker/bootstrap", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -2418,7 +2418,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerAppendTask::try_from) .and_then(std::convert::TryInto::<types::WorkerAppendTask>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/append", "{}/v1/worker/task/{}/append",
@ -2557,7 +2557,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerCompleteTask::try_from) .and_then(std::convert::TryInto::<types::WorkerCompleteTask>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/complete", "{}/v1/worker/task/{}/complete",
@ -2627,7 +2627,7 @@ pub mod builder {
let Self { client, task, body } = self; let Self { client, task, body } = self;
let task = task.map_err(Error::InvalidRequest)?; let task = task.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::WorkerAddOutput::try_from) .and_then(std::convert::TryInto::<types::WorkerAddOutput>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/worker/task/{}/output", "{}/v1/worker/task/{}/output",

8
progenitor-impl/tests/output/keeper-builder-tagged.out
View File

@ -1104,7 +1104,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::EnrolBody::try_from) .and_then(std::convert::TryInto::<types::EnrolBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/enrol", client.baseurl,); let url = format!("{}/enrol", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1277,7 +1277,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportFinishBody::try_from) .and_then(std::convert::TryInto::<types::ReportFinishBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/finish", client.baseurl,); let url = format!("{}/report/finish", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1356,7 +1356,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportOutputBody::try_from) .and_then(std::convert::TryInto::<types::ReportOutputBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/output", client.baseurl,); let url = format!("{}/report/output", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1433,7 +1433,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportStartBody::try_from) .and_then(std::convert::TryInto::<types::ReportStartBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/start", client.baseurl,); let url = format!("{}/report/start", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);

8
progenitor-impl/tests/output/keeper-builder.out
View File

@ -1104,7 +1104,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::EnrolBody::try_from) .and_then(std::convert::TryInto::<types::EnrolBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/enrol", client.baseurl,); let url = format!("{}/enrol", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1277,7 +1277,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportFinishBody::try_from) .and_then(std::convert::TryInto::<types::ReportFinishBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/finish", client.baseurl,); let url = format!("{}/report/finish", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1356,7 +1356,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportOutputBody::try_from) .and_then(std::convert::TryInto::<types::ReportOutputBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/output", client.baseurl,); let url = format!("{}/report/output", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);
@ -1433,7 +1433,7 @@ pub mod builder {
} = self; } = self;
let authorization = authorization.map_err(Error::InvalidRequest)?; let authorization = authorization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ReportStartBody::try_from) .and_then(std::convert::TryInto::<types::ReportStartBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/report/start", client.baseurl,); let url = format!("{}/report/start", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize); let mut header_map = HeaderMap::with_capacity(1usize);

104
progenitor-impl/tests/output/nexus-builder-tagged.out
View File

@ -21604,7 +21604,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> { pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAuthRequest::try_from) .and_then(std::convert::TryInto::<types::DeviceAuthRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/auth", client.baseurl,); let url = format!("{}/device/auth", client.baseurl,);
let request = client.client.post(url).form_urlencoded(&body)?.build()?; let request = client.client.post(url).form_urlencoded(&body)?.build()?;
@ -21659,7 +21659,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAuthVerify::try_from) .and_then(std::convert::TryInto::<types::DeviceAuthVerify>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/confirm", client.baseurl,); let url = format!("{}/device/confirm", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -21719,7 +21719,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> { pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAccessTokenRequest::try_from) .and_then(std::convert::TryInto::<types::DeviceAccessTokenRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/token", client.baseurl,); let url = format!("{}/device/token", client.baseurl,);
let request = client.client.post(url).form_urlencoded(&body)?.build()?; let request = client.client.post(url).form_urlencoded(&body)?.build()?;
@ -21912,7 +21912,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SpoofLoginBody::try_from) .and_then(std::convert::TryInto::<types::SpoofLoginBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/login", client.baseurl,); let url = format!("{}/login", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -21989,7 +21989,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::UsernamePasswordCredentials::try_from) .and_then(std::convert::TryInto::<types::UsernamePasswordCredentials>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/login/{}/local", "{}/login/{}/local",
@ -22389,7 +22389,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::OrganizationCreate::try_from) .and_then(std::convert::TryInto::<types::OrganizationCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/organizations", client.baseurl,); let url = format!("{}/organizations", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -22522,7 +22522,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationUpdate::try_from) .and_then(std::convert::TryInto::<types::OrganizationUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}", "{}/organizations/{}",
@ -22718,7 +22718,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationRolePolicy::try_from) .and_then(std::convert::TryInto::<types::OrganizationRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/policy", "{}/organizations/{}/policy",
@ -22959,7 +22959,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectCreate::try_from) .and_then(std::convert::TryInto::<types::ProjectCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects", "{}/organizations/{}/projects",
@ -23125,7 +23125,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectUpdate::try_from) .and_then(std::convert::TryInto::<types::ProjectUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}", "{}/organizations/{}/projects/{}",
@ -23467,7 +23467,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskCreate::try_from) .and_then(std::convert::TryInto::<types::DiskCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/disks", "{}/organizations/{}/projects/{}/disks",
@ -24132,7 +24132,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ImageCreate::try_from) .and_then(std::convert::TryInto::<types::ImageCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/images", "{}/organizations/{}/projects/{}/images",
@ -24580,7 +24580,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceCreate::try_from) .and_then(std::convert::TryInto::<types::InstanceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances", "{}/organizations/{}/projects/{}/instances",
@ -25057,7 +25057,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskIdentifier::try_from) .and_then(std::convert::TryInto::<types::DiskIdentifier>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/disks/attach", "{}/organizations/{}/projects/{}/instances/{}/disks/attach",
@ -25169,7 +25169,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskIdentifier::try_from) .and_then(std::convert::TryInto::<types::DiskIdentifier>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/disks/detach", "{}/organizations/{}/projects/{}/instances/{}/disks/detach",
@ -25370,7 +25370,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceMigrate::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/migrate", "{}/organizations/{}/projects/{}/instances/{}/migrate",
@ -25679,7 +25679,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::NetworkInterfaceCreate::try_from) .and_then(std::convert::TryInto::<types::NetworkInterfaceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/network-interfaces", "{}/organizations/{}/projects/{}/instances/{}/network-interfaces",
@ -25913,7 +25913,7 @@ pub mod builder {
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let interface_name = interface_name.map_err(Error::InvalidRequest)?; let interface_name = interface_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::NetworkInterfaceUpdate::try_from) .and_then(std::convert::TryInto::<types::NetworkInterfaceUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/network-interfaces/{}", "{}/organizations/{}/projects/{}/instances/{}/network-interfaces/{}",
@ -26692,7 +26692,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectRolePolicy::try_from) .and_then(std::convert::TryInto::<types::ProjectRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/policy", "{}/organizations/{}/projects/{}/policy",
@ -26966,7 +26966,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SnapshotCreate::try_from) .and_then(std::convert::TryInto::<types::SnapshotCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/snapshots", "{}/organizations/{}/projects/{}/snapshots",
@ -27411,7 +27411,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcCreate::try_from) .and_then(std::convert::TryInto::<types::VpcCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs", "{}/organizations/{}/projects/{}/vpcs",
@ -27609,7 +27609,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}", "{}/organizations/{}/projects/{}/vpcs/{}",
@ -27900,7 +27900,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcFirewallRuleUpdateParams::try_from) .and_then(std::convert::TryInto::<types::VpcFirewallRuleUpdateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/firewall/rules", "{}/organizations/{}/projects/{}/vpcs/{}/firewall/rules",
@ -28204,7 +28204,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcRouterCreate::try_from) .and_then(std::convert::TryInto::<types::VpcRouterCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers", "{}/organizations/{}/projects/{}/vpcs/{}/routers",
@ -28432,7 +28432,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcRouterUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcRouterUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}",
@ -28870,7 +28870,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::RouterRouteCreateParams::try_from) .and_then(std::convert::TryInto::<types::RouterRouteCreateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes",
@ -29130,7 +29130,7 @@ pub mod builder {
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let route_name = route_name.map_err(Error::InvalidRequest)?; let route_name = route_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::RouterRouteUpdateParams::try_from) .and_then(std::convert::TryInto::<types::RouterRouteUpdateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes/{}", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes/{}",
@ -29553,7 +29553,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcSubnetCreate::try_from) .and_then(std::convert::TryInto::<types::VpcSubnetCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/subnets", "{}/organizations/{}/projects/{}/vpcs/{}/subnets",
@ -29781,7 +29781,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let subnet_name = subnet_name.map_err(Error::InvalidRequest)?; let subnet_name = subnet_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcSubnetUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcSubnetUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/subnets/{}", "{}/organizations/{}/projects/{}/vpcs/{}/subnets/{}",
@ -30194,7 +30194,7 @@ pub mod builder {
) -> Result<ResponseValue<types::SiloRolePolicy>, Error<types::Error>> { ) -> Result<ResponseValue<types::SiloRolePolicy>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SiloRolePolicy::try_from) .and_then(std::convert::TryInto::<types::SiloRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/policy", client.baseurl,); let url = format!("{}/policy", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -30739,7 +30739,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::SshKey>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::SshKey>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SshKeyCreate::try_from) .and_then(std::convert::TryInto::<types::SshKeyCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/session/me/sshkeys", client.baseurl,); let url = format!("{}/session/me/sshkeys", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -31206,7 +31206,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Certificate>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Certificate>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::CertificateCreate::try_from) .and_then(std::convert::TryInto::<types::CertificateCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/certificates", client.baseurl,); let url = format!("{}/system/certificates", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -32199,7 +32199,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::GlobalImage>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::GlobalImage>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::GlobalImageCreate::try_from) .and_then(std::convert::TryInto::<types::GlobalImageCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/images", client.baseurl,); let url = format!("{}/system/images", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -32502,7 +32502,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::IpPool>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::IpPool>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::IpPoolCreate::try_from) .and_then(std::convert::TryInto::<types::IpPoolCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/ip-pools", client.baseurl,); let url = format!("{}/system/ip-pools", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -32630,7 +32630,7 @@ pub mod builder {
} = self; } = self;
let pool_name = pool_name.map_err(Error::InvalidRequest)?; let pool_name = pool_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::IpPoolUpdate::try_from) .and_then(std::convert::TryInto::<types::IpPoolUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/ip-pools/{}", "{}/system/ip-pools/{}",
@ -33448,7 +33448,7 @@ pub mod builder {
) -> Result<ResponseValue<types::FleetRolePolicy>, Error<types::Error>> { ) -> Result<ResponseValue<types::FleetRolePolicy>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::FleetRolePolicy::try_from) .and_then(std::convert::TryInto::<types::FleetRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/policy", client.baseurl,); let url = format!("{}/system/policy", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -33839,7 +33839,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Silo>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Silo>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SiloCreate::try_from) .and_then(std::convert::TryInto::<types::SiloCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/silos", client.baseurl,); let url = format!("{}/system/silos", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -34181,7 +34181,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::UserCreate::try_from) .and_then(std::convert::TryInto::<types::UserCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/identity-providers/local/users", "{}/system/silos/{}/identity-providers/local/users",
@ -34422,7 +34422,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SamlIdentityProviderCreate::try_from) .and_then(std::convert::TryInto::<types::SamlIdentityProviderCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/identity-providers/saml", "{}/system/silos/{}/identity-providers/saml",
@ -34631,7 +34631,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SiloRolePolicy::try_from) .and_then(std::convert::TryInto::<types::SiloRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/policy", "{}/system/silos/{}/policy",
@ -35587,7 +35587,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskCreate::try_from) .and_then(std::convert::TryInto::<types::DiskCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/disks", client.baseurl,); let url = format!("{}/v1/disks", client.baseurl,);
let mut query = Vec::with_capacity(2usize); let mut query = Vec::with_capacity(2usize);
@ -36045,7 +36045,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceCreate::try_from) .and_then(std::convert::TryInto::<types::InstanceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/instances", client.baseurl,); let url = format!("{}/v1/instances", client.baseurl,);
let mut query = Vec::with_capacity(2usize); let mut query = Vec::with_capacity(2usize);
@ -36536,7 +36536,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskPath::try_from) .and_then(std::convert::TryInto::<types::DiskPath>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/disks/attach", "{}/v1/instances/{}/disks/attach",
@ -36653,7 +36653,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskPath::try_from) .and_then(std::convert::TryInto::<types::DiskPath>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/disks/detach", "{}/v1/instances/{}/disks/detach",
@ -36770,7 +36770,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceMigrate::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/migrate", "{}/v1/instances/{}/migrate",
@ -37510,7 +37510,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::OrganizationCreate::try_from) .and_then(std::convert::TryInto::<types::OrganizationCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/organizations", client.baseurl,); let url = format!("{}/v1/organizations", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -37643,7 +37643,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationUpdate::try_from) .and_then(std::convert::TryInto::<types::OrganizationUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/organizations/{}", "{}/v1/organizations/{}",
@ -37839,7 +37839,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationRolePolicy::try_from) .and_then(std::convert::TryInto::<types::OrganizationRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/organizations/{}/policy", "{}/v1/organizations/{}/policy",
@ -38078,7 +38078,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectCreate::try_from) .and_then(std::convert::TryInto::<types::ProjectCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/projects", client.baseurl,); let url = format!("{}/v1/projects", client.baseurl,);
let mut query = Vec::with_capacity(1usize); let mut query = Vec::with_capacity(1usize);
@ -38245,7 +38245,7 @@ pub mod builder {
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectUpdate::try_from) .and_then(std::convert::TryInto::<types::ProjectUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/projects/{}", "{}/v1/projects/{}",
@ -38498,7 +38498,7 @@ pub mod builder {
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectRolePolicy::try_from) .and_then(std::convert::TryInto::<types::ProjectRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/projects/{}/policy", "{}/v1/projects/{}/policy",
@ -38939,7 +38939,7 @@ pub mod builder {
) -> Result<ResponseValue<types::UpdateDeployment>, Error<types::Error>> { ) -> Result<ResponseValue<types::UpdateDeployment>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SystemUpdateStart::try_from) .and_then(std::convert::TryInto::<types::SystemUpdateStart>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/system/update/start", client.baseurl,); let url = format!("{}/v1/system/update/start", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;

104
progenitor-impl/tests/output/nexus-builder.out
View File

@ -21396,7 +21396,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> { pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAuthRequest::try_from) .and_then(std::convert::TryInto::<types::DeviceAuthRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/auth", client.baseurl,); let url = format!("{}/device/auth", client.baseurl,);
let request = client.client.post(url).form_urlencoded(&body)?.build()?; let request = client.client.post(url).form_urlencoded(&body)?.build()?;
@ -21451,7 +21451,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAuthVerify::try_from) .and_then(std::convert::TryInto::<types::DeviceAuthVerify>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/confirm", client.baseurl,); let url = format!("{}/device/confirm", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -21511,7 +21511,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> { pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::DeviceAccessTokenRequest::try_from) .and_then(std::convert::TryInto::<types::DeviceAccessTokenRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/device/token", client.baseurl,); let url = format!("{}/device/token", client.baseurl,);
let request = client.client.post(url).form_urlencoded(&body)?.build()?; let request = client.client.post(url).form_urlencoded(&body)?.build()?;
@ -21704,7 +21704,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<()>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SpoofLoginBody::try_from) .and_then(std::convert::TryInto::<types::SpoofLoginBody>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/login", client.baseurl,); let url = format!("{}/login", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -21781,7 +21781,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::UsernamePasswordCredentials::try_from) .and_then(std::convert::TryInto::<types::UsernamePasswordCredentials>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/login/{}/local", "{}/login/{}/local",
@ -22181,7 +22181,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::OrganizationCreate::try_from) .and_then(std::convert::TryInto::<types::OrganizationCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/organizations", client.baseurl,); let url = format!("{}/organizations", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -22314,7 +22314,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationUpdate::try_from) .and_then(std::convert::TryInto::<types::OrganizationUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}", "{}/organizations/{}",
@ -22510,7 +22510,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationRolePolicy::try_from) .and_then(std::convert::TryInto::<types::OrganizationRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/policy", "{}/organizations/{}/policy",
@ -22751,7 +22751,7 @@ pub mod builder {
} = self; } = self;
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectCreate::try_from) .and_then(std::convert::TryInto::<types::ProjectCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects", "{}/organizations/{}/projects",
@ -22917,7 +22917,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectUpdate::try_from) .and_then(std::convert::TryInto::<types::ProjectUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}", "{}/organizations/{}/projects/{}",
@ -23259,7 +23259,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskCreate::try_from) .and_then(std::convert::TryInto::<types::DiskCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/disks", "{}/organizations/{}/projects/{}/disks",
@ -23924,7 +23924,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ImageCreate::try_from) .and_then(std::convert::TryInto::<types::ImageCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/images", "{}/organizations/{}/projects/{}/images",
@ -24372,7 +24372,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceCreate::try_from) .and_then(std::convert::TryInto::<types::InstanceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances", "{}/organizations/{}/projects/{}/instances",
@ -24849,7 +24849,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskIdentifier::try_from) .and_then(std::convert::TryInto::<types::DiskIdentifier>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/disks/attach", "{}/organizations/{}/projects/{}/instances/{}/disks/attach",
@ -24961,7 +24961,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskIdentifier::try_from) .and_then(std::convert::TryInto::<types::DiskIdentifier>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/disks/detach", "{}/organizations/{}/projects/{}/instances/{}/disks/detach",
@ -25162,7 +25162,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceMigrate::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/migrate", "{}/organizations/{}/projects/{}/instances/{}/migrate",
@ -25471,7 +25471,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::NetworkInterfaceCreate::try_from) .and_then(std::convert::TryInto::<types::NetworkInterfaceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/network-interfaces", "{}/organizations/{}/projects/{}/instances/{}/network-interfaces",
@ -25705,7 +25705,7 @@ pub mod builder {
let instance_name = instance_name.map_err(Error::InvalidRequest)?; let instance_name = instance_name.map_err(Error::InvalidRequest)?;
let interface_name = interface_name.map_err(Error::InvalidRequest)?; let interface_name = interface_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::NetworkInterfaceUpdate::try_from) .and_then(std::convert::TryInto::<types::NetworkInterfaceUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/instances/{}/network-interfaces/{}", "{}/organizations/{}/projects/{}/instances/{}/network-interfaces/{}",
@ -26484,7 +26484,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectRolePolicy::try_from) .and_then(std::convert::TryInto::<types::ProjectRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/policy", "{}/organizations/{}/projects/{}/policy",
@ -26758,7 +26758,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SnapshotCreate::try_from) .and_then(std::convert::TryInto::<types::SnapshotCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/snapshots", "{}/organizations/{}/projects/{}/snapshots",
@ -27203,7 +27203,7 @@ pub mod builder {
let organization_name = organization_name.map_err(Error::InvalidRequest)?; let organization_name = organization_name.map_err(Error::InvalidRequest)?;
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcCreate::try_from) .and_then(std::convert::TryInto::<types::VpcCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs", "{}/organizations/{}/projects/{}/vpcs",
@ -27401,7 +27401,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}", "{}/organizations/{}/projects/{}/vpcs/{}",
@ -27692,7 +27692,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcFirewallRuleUpdateParams::try_from) .and_then(std::convert::TryInto::<types::VpcFirewallRuleUpdateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/firewall/rules", "{}/organizations/{}/projects/{}/vpcs/{}/firewall/rules",
@ -27996,7 +27996,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcRouterCreate::try_from) .and_then(std::convert::TryInto::<types::VpcRouterCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers", "{}/organizations/{}/projects/{}/vpcs/{}/routers",
@ -28224,7 +28224,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcRouterUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcRouterUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}",
@ -28662,7 +28662,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::RouterRouteCreateParams::try_from) .and_then(std::convert::TryInto::<types::RouterRouteCreateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes",
@ -28922,7 +28922,7 @@ pub mod builder {
let router_name = router_name.map_err(Error::InvalidRequest)?; let router_name = router_name.map_err(Error::InvalidRequest)?;
let route_name = route_name.map_err(Error::InvalidRequest)?; let route_name = route_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::RouterRouteUpdateParams::try_from) .and_then(std::convert::TryInto::<types::RouterRouteUpdateParams>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes/{}", "{}/organizations/{}/projects/{}/vpcs/{}/routers/{}/routes/{}",
@ -29345,7 +29345,7 @@ pub mod builder {
let project_name = project_name.map_err(Error::InvalidRequest)?; let project_name = project_name.map_err(Error::InvalidRequest)?;
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcSubnetCreate::try_from) .and_then(std::convert::TryInto::<types::VpcSubnetCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/subnets", "{}/organizations/{}/projects/{}/vpcs/{}/subnets",
@ -29573,7 +29573,7 @@ pub mod builder {
let vpc_name = vpc_name.map_err(Error::InvalidRequest)?; let vpc_name = vpc_name.map_err(Error::InvalidRequest)?;
let subnet_name = subnet_name.map_err(Error::InvalidRequest)?; let subnet_name = subnet_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::VpcSubnetUpdate::try_from) .and_then(std::convert::TryInto::<types::VpcSubnetUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/organizations/{}/projects/{}/vpcs/{}/subnets/{}", "{}/organizations/{}/projects/{}/vpcs/{}/subnets/{}",
@ -29986,7 +29986,7 @@ pub mod builder {
) -> Result<ResponseValue<types::SiloRolePolicy>, Error<types::Error>> { ) -> Result<ResponseValue<types::SiloRolePolicy>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SiloRolePolicy::try_from) .and_then(std::convert::TryInto::<types::SiloRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/policy", client.baseurl,); let url = format!("{}/policy", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -30531,7 +30531,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::SshKey>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::SshKey>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SshKeyCreate::try_from) .and_then(std::convert::TryInto::<types::SshKeyCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/session/me/sshkeys", client.baseurl,); let url = format!("{}/session/me/sshkeys", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -30998,7 +30998,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Certificate>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Certificate>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::CertificateCreate::try_from) .and_then(std::convert::TryInto::<types::CertificateCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/certificates", client.baseurl,); let url = format!("{}/system/certificates", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -31991,7 +31991,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::GlobalImage>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::GlobalImage>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::GlobalImageCreate::try_from) .and_then(std::convert::TryInto::<types::GlobalImageCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/images", client.baseurl,); let url = format!("{}/system/images", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -32294,7 +32294,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::IpPool>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::IpPool>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::IpPoolCreate::try_from) .and_then(std::convert::TryInto::<types::IpPoolCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/ip-pools", client.baseurl,); let url = format!("{}/system/ip-pools", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -32422,7 +32422,7 @@ pub mod builder {
} = self; } = self;
let pool_name = pool_name.map_err(Error::InvalidRequest)?; let pool_name = pool_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::IpPoolUpdate::try_from) .and_then(std::convert::TryInto::<types::IpPoolUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/ip-pools/{}", "{}/system/ip-pools/{}",
@ -33240,7 +33240,7 @@ pub mod builder {
) -> Result<ResponseValue<types::FleetRolePolicy>, Error<types::Error>> { ) -> Result<ResponseValue<types::FleetRolePolicy>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::FleetRolePolicy::try_from) .and_then(std::convert::TryInto::<types::FleetRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/policy", client.baseurl,); let url = format!("{}/system/policy", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -33631,7 +33631,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Silo>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Silo>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SiloCreate::try_from) .and_then(std::convert::TryInto::<types::SiloCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/system/silos", client.baseurl,); let url = format!("{}/system/silos", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -33973,7 +33973,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::UserCreate::try_from) .and_then(std::convert::TryInto::<types::UserCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/identity-providers/local/users", "{}/system/silos/{}/identity-providers/local/users",
@ -34214,7 +34214,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SamlIdentityProviderCreate::try_from) .and_then(std::convert::TryInto::<types::SamlIdentityProviderCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/identity-providers/saml", "{}/system/silos/{}/identity-providers/saml",
@ -34423,7 +34423,7 @@ pub mod builder {
} = self; } = self;
let silo_name = silo_name.map_err(Error::InvalidRequest)?; let silo_name = silo_name.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::SiloRolePolicy::try_from) .and_then(std::convert::TryInto::<types::SiloRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/system/silos/{}/policy", "{}/system/silos/{}/policy",
@ -35379,7 +35379,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskCreate::try_from) .and_then(std::convert::TryInto::<types::DiskCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/disks", client.baseurl,); let url = format!("{}/v1/disks", client.baseurl,);
let mut query = Vec::with_capacity(2usize); let mut query = Vec::with_capacity(2usize);
@ -35837,7 +35837,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceCreate::try_from) .and_then(std::convert::TryInto::<types::InstanceCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/instances", client.baseurl,); let url = format!("{}/v1/instances", client.baseurl,);
let mut query = Vec::with_capacity(2usize); let mut query = Vec::with_capacity(2usize);
@ -36328,7 +36328,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskPath::try_from) .and_then(std::convert::TryInto::<types::DiskPath>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/disks/attach", "{}/v1/instances/{}/disks/attach",
@ -36445,7 +36445,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::DiskPath::try_from) .and_then(std::convert::TryInto::<types::DiskPath>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/disks/detach", "{}/v1/instances/{}/disks/detach",
@ -36562,7 +36562,7 @@ pub mod builder {
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::InstanceMigrate::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/instances/{}/migrate", "{}/v1/instances/{}/migrate",
@ -37302,7 +37302,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> { pub async fn send(self) -> Result<ResponseValue<types::Organization>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::OrganizationCreate::try_from) .and_then(std::convert::TryInto::<types::OrganizationCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/organizations", client.baseurl,); let url = format!("{}/v1/organizations", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;
@ -37435,7 +37435,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationUpdate::try_from) .and_then(std::convert::TryInto::<types::OrganizationUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/organizations/{}", "{}/v1/organizations/{}",
@ -37631,7 +37631,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::OrganizationRolePolicy::try_from) .and_then(std::convert::TryInto::<types::OrganizationRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/organizations/{}/policy", "{}/v1/organizations/{}/policy",
@ -37870,7 +37870,7 @@ pub mod builder {
} = self; } = self;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectCreate::try_from) .and_then(std::convert::TryInto::<types::ProjectCreate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/projects", client.baseurl,); let url = format!("{}/v1/projects", client.baseurl,);
let mut query = Vec::with_capacity(1usize); let mut query = Vec::with_capacity(1usize);
@ -38037,7 +38037,7 @@ pub mod builder {
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectUpdate::try_from) .and_then(std::convert::TryInto::<types::ProjectUpdate>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/projects/{}", "{}/v1/projects/{}",
@ -38290,7 +38290,7 @@ pub mod builder {
let project = project.map_err(Error::InvalidRequest)?; let project = project.map_err(Error::InvalidRequest)?;
let organization = organization.map_err(Error::InvalidRequest)?; let organization = organization.map_err(Error::InvalidRequest)?;
let body = body let body = body
.and_then(types::ProjectRolePolicy::try_from) .and_then(std::convert::TryInto::<types::ProjectRolePolicy>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!( let url = format!(
"{}/v1/projects/{}/policy", "{}/v1/projects/{}/policy",
@ -38731,7 +38731,7 @@ pub mod builder {
) -> Result<ResponseValue<types::UpdateDeployment>, Error<types::Error>> { ) -> Result<ResponseValue<types::UpdateDeployment>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::SystemUpdateStart::try_from) .and_then(std::convert::TryInto::<types::SystemUpdateStart>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/system/update/start", client.baseurl,); let url = format!("{}/v1/system/update/start", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;

6
progenitor-impl/tests/output/propolis-server-builder-tagged.out
View File

@ -2174,7 +2174,7 @@ pub mod builder {
) -> Result<ResponseValue<types::InstanceEnsureResponse>, Error<types::Error>> { ) -> Result<ResponseValue<types::InstanceEnsureResponse>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceEnsureRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceEnsureRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance", client.baseurl,); let url = format!("{}/instance", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -2308,7 +2308,7 @@ pub mod builder {
{ {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceMigrateStatusRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrateStatusRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/migrate/status", client.baseurl,); let url = format!("{}/instance/migrate/status", client.baseurl,);
let request = client.client.get(url).json(&body).build()?; let request = client.client.get(url).json(&body).build()?;
@ -2462,7 +2462,7 @@ pub mod builder {
{ {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceStateMonitorRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceStateMonitorRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state-monitor", client.baseurl,); let url = format!("{}/instance/state-monitor", client.baseurl,);
let request = client.client.get(url).json(&body).build()?; let request = client.client.get(url).json(&body).build()?;

6
progenitor-impl/tests/output/propolis-server-builder.out
View File

@ -2180,7 +2180,7 @@ pub mod builder {
) -> Result<ResponseValue<types::InstanceEnsureResponse>, Error<types::Error>> { ) -> Result<ResponseValue<types::InstanceEnsureResponse>, Error<types::Error>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceEnsureRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceEnsureRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance", client.baseurl,); let url = format!("{}/instance", client.baseurl,);
let request = client.client.put(url).json(&body).build()?; let request = client.client.put(url).json(&body).build()?;
@ -2314,7 +2314,7 @@ pub mod builder {
{ {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceMigrateStatusRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceMigrateStatusRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/migrate/status", client.baseurl,); let url = format!("{}/instance/migrate/status", client.baseurl,);
let request = client.client.get(url).json(&body).build()?; let request = client.client.get(url).json(&body).build()?;
@ -2468,7 +2468,7 @@ pub mod builder {
{ {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::InstanceStateMonitorRequest::try_from) .and_then(std::convert::TryInto::<types::InstanceStateMonitorRequest>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state-monitor", client.baseurl,); let url = format!("{}/instance/state-monitor", client.baseurl,);
let request = client.client.get(url).json(&body).build()?; let request = client.client.get(url).json(&body).build()?;

2
progenitor-impl/tests/output/test_default_params_builder.out
View File

@ -333,7 +333,7 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> { pub async fn send(self) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let Self { client, body } = self; let Self { client, body } = self;
let body = body let body = body
.and_then(types::BodyWithDefaults::try_from) .and_then(std::convert::TryInto::<types::BodyWithDefaults>::try_into)
.map_err(Error::InvalidRequest)?; .map_err(Error::InvalidRequest)?;
let url = format!("{}/", client.baseurl,); let url = format!("{}/", client.baseurl,);
let request = client.client.post(url).json(&body).build()?; let request = client.client.post(url).json(&body).build()?;