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

allow request mutation and async code in prehooks (#457)

This commit is contained in:
Joshua M. Clulow 2024-02-04 11:19:07 -08:00 committed by GitHub
parent a58f336c25
commit 3ff2ec1d5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 1412 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
example-macro/src/main.rs
View File

@ -8,10 +8,27 @@ generate_api!(
pre_hook = (|_, request| {
println!("doing this {:?}", request);
}),
pre_hook_async = crate::add_auth_headers,
post_hook = crate::all_done,
derives = [schemars::JsonSchema],
);
async fn add_auth_headers(
_: &(),
req: &mut reqwest::Request,
) -> Result<(), reqwest::header::InvalidHeaderValue> {
// You can perform asynchronous, fallible work in a request hook, then
// modify the request right before it is transmitted to the server; e.g.,
// for generating an authenticaiton signature based on the complete set of
// request header values:
req.headers_mut().insert(
reqwest::header::AUTHORIZATION,
reqwest::header::HeaderValue::from_str("legitimate")?,
);
Ok(())
}
fn all_done(_: &(), _result: &reqwest::Result<reqwest::Response>) {}
mod buildomat {

8
progenitor-client/src/progenitor_client.rs
View File

@ -249,6 +249,9 @@ pub enum Error<E = ()> {
/// A response not listed in the API description. This may represent a
/// success or failure response; check `status().is_success()`.
UnexpectedResponse(reqwest::Response),
/// An error occurred in the processing of a request pre-hook.
PreHookError(String),
}
impl<E> Error<E> {
@ -256,6 +259,7 @@ impl<E> Error<E> {
pub fn status(&self) -> Option<reqwest::StatusCode> {
match self {
Error::InvalidRequest(_) => None,
Error::PreHookError(_) => None,
Error::CommunicationError(e) => e.status(),
Error::ErrorResponse(rv) => Some(rv.status()),
Error::InvalidUpgrade(e) => e.status(),
@ -272,6 +276,7 @@ impl<E> Error<E> {
pub fn into_untyped(self) -> Error {
match self {
Error::InvalidRequest(s) => Error::InvalidRequest(s),
Error::PreHookError(s) => Error::PreHookError(s),
Error::CommunicationError(e) => Error::CommunicationError(e),
Error::ErrorResponse(ResponseValue {
inner: _,
@ -332,6 +337,9 @@ where
Error::UnexpectedResponse(r) => {
write!(f, "Unexpected Response: {:?}", r)
}
Error::PreHookError(s) => {
write!(f, "Pre-hook Error: {}", s)
}
}
}
}

7
progenitor-impl/src/lib.rs
View File

@ -60,6 +60,7 @@ pub struct GenerationSettings {
tag: TagStyle,
inner_type: Option<TokenStream>,
pre_hook: Option<TokenStream>,
pre_hook_async: Option<TokenStream>,
post_hook: Option<TokenStream>,
extra_derives: Vec<String>,
@ -128,6 +129,12 @@ impl GenerationSettings {
self
}
/// Hook invoked before issuing the HTTP request.
pub fn with_pre_hook_async(&mut self, pre_hook: TokenStream) -> &mut Self {
self.pre_hook_async = Some(pre_hook);
self
}
/// Hook invoked prior to receiving the HTTP response.
pub fn with_post_hook(&mut self, post_hook: TokenStream) -> &mut Self {
self.post_hook = Some(post_hook);

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

@ -1141,6 +1141,14 @@ impl Generator {
(#hook)(&#client.inner, &#request_ident);
}
});
let pre_hook_async = self.settings.pre_hook_async.as_ref().map(|hook| {
quote! {
match (#hook)(&#client.inner, &mut #request_ident).await {
Ok(_) => (),
Err(e) => return Err(Error::PreHookError(e.to_string())),
}
}
});
let post_hook = self.settings.post_hook.as_ref().map(|hook| {
quote! {
(#hook)(&#client.inner, &#result_ident);
@ -1155,7 +1163,8 @@ impl Generator {
#headers_build
let #request_ident = #client.client
#[allow(unused_mut)]
let mut #request_ident = #client.client
. #method_func (#url_ident)
#accept_header
#(#body_func)*
@ -1165,6 +1174,7 @@ impl Generator {
.build()?;
#pre_hook
#pre_hook_async
let #result_ident = #client.client
.execute(#request_ident)
.await;

57
progenitor-impl/tests/output/src/buildomat_builder.rs
View File

@ -2404,7 +2404,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/control/hold", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2438,7 +2439,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/control/resume", client.baseurl,);
let request = client.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -2484,7 +2486,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2518,7 +2521,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<Vec<types::Task>>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/tasks", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2579,7 +2583,8 @@ pub mod builder {
.and_then(|v| types::TaskSubmit::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/tasks", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2655,7 +2660,8 @@ pub mod builder {
if let Some(v) = &minseq {
query.push(("minseq", v.to_string()));
}
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2709,7 +2715,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2780,7 +2787,8 @@ pub mod builder {
encode_path(&task.to_string()),
encode_path(&output.to_string()),
);
let request = client.client.get(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.get(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -2834,7 +2842,8 @@ pub mod builder {
.and_then(|v| types::UserCreate::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/users", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2869,7 +2878,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WhoamiResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/whoami", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2919,7 +2929,8 @@ pub mod builder {
let Self { client, body } = self;
let body = body.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/whoami/name", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -2981,7 +2992,8 @@ pub mod builder {
.and_then(|v| types::WorkerBootstrap::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/worker/bootstrap", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3016,7 +3028,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkerPingResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/worker/ping", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3096,7 +3109,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3155,7 +3169,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3240,7 +3255,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3311,7 +3327,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3338,7 +3355,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkersResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/workers", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3372,7 +3390,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/workers/recycle", client.baseurl,);
let request = client.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

57
progenitor-impl/tests/output/src/buildomat_builder_tagged.rs
View File

@ -2404,7 +2404,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/control/hold", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2438,7 +2439,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/control/resume", client.baseurl,);
let request = client.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -2484,7 +2486,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2518,7 +2521,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<Vec<types::Task>>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/tasks", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2579,7 +2583,8 @@ pub mod builder {
.and_then(|v| types::TaskSubmit::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/tasks", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2655,7 +2660,8 @@ pub mod builder {
if let Some(v) = &minseq {
query.push(("minseq", v.to_string()));
}
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2709,7 +2715,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2780,7 +2787,8 @@ pub mod builder {
encode_path(&task.to_string()),
encode_path(&output.to_string()),
);
let request = client.client.get(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.get(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -2834,7 +2842,8 @@ pub mod builder {
.and_then(|v| types::UserCreate::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/users", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -2869,7 +2878,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WhoamiResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/whoami", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -2919,7 +2929,8 @@ pub mod builder {
let Self { client, body } = self;
let body = body.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/whoami/name", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -2981,7 +2992,8 @@ pub mod builder {
.and_then(|v| types::WorkerBootstrap::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/v1/worker/bootstrap", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3016,7 +3028,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkerPingResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/worker/ping", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3096,7 +3109,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3155,7 +3169,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3240,7 +3255,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3311,7 +3327,8 @@ pub mod builder {
client.baseurl,
encode_path(&task.to_string()),
);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -3338,7 +3355,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<types::WorkersResult>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/workers", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3372,7 +3390,8 @@ pub mod builder {
pub async fn send(self) -> Result<ResponseValue<()>, Error<()>> {
let Self { client } = self;
let url = format!("{}/v1/workers/recycle", client.baseurl,);
let request = client.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

57
progenitor-impl/tests/output/src/buildomat_positional.rs
View File

@ -827,7 +827,8 @@ impl Client {
///Sends a `POST` request to `/v1/control/hold`
pub async fn control_hold<'a>(&'a self) -> Result<ResponseValue<()>, Error<()>> {
let url = format!("{}/v1/control/hold", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -846,7 +847,8 @@ impl Client {
///Sends a `POST` request to `/v1/control/resume`
pub async fn control_resume<'a>(&'a self) -> Result<ResponseValue<()>, Error<()>> {
let url = format!("{}/v1/control/resume", self.baseurl,);
let request = self.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -865,7 +867,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -884,7 +887,8 @@ impl Client {
///Sends a `GET` request to `/v1/tasks`
pub async fn tasks_get<'a>(&'a self) -> Result<ResponseValue<Vec<types::Task>>, Error<()>> {
let url = format!("{}/v1/tasks", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -906,7 +910,8 @@ impl Client {
body: &'a types::TaskSubmit,
) -> Result<ResponseValue<types::TaskSubmitResult>, Error<()>> {
let url = format!("{}/v1/tasks", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -939,7 +944,8 @@ impl Client {
query.push(("minseq", v.to_string()));
}
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -966,7 +972,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -994,7 +1001,8 @@ impl Client {
encode_path(&task.to_string()),
encode_path(&output.to_string()),
);
let request = self.client.get(url).build()?;
#[allow(unused_mut)]
let mut request = self.client.get(url).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -1009,7 +1017,8 @@ impl Client {
body: &'a types::UserCreate,
) -> Result<ResponseValue<types::UserCreateResult>, Error<()>> {
let url = format!("{}/v1/users", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -1029,7 +1038,8 @@ impl Client {
///Sends a `GET` request to `/v1/whoami`
pub async fn whoami<'a>(&'a self) -> Result<ResponseValue<types::WhoamiResult>, Error<()>> {
let url = format!("{}/v1/whoami", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -1051,7 +1061,8 @@ impl Client {
body: String,
) -> Result<ResponseValue<()>, Error<()>> {
let url = format!("{}/v1/whoami/name", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.put(url)
.header(
@ -1074,7 +1085,8 @@ impl Client {
body: &'a types::WorkerBootstrap,
) -> Result<ResponseValue<types::WorkerBootstrapResult>, Error<()>> {
let url = format!("{}/v1/worker/bootstrap", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -1096,7 +1108,8 @@ impl Client {
&'a self,
) -> Result<ResponseValue<types::WorkerPingResult>, Error<()>> {
let url = format!("{}/v1/worker/ping", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -1123,7 +1136,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).json(&body).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -1143,7 +1157,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -1175,7 +1190,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).json(&body).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -1195,7 +1211,8 @@ impl Client {
self.baseurl,
encode_path(&task.to_string()),
);
let request = self.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).json(&body).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {
@ -1209,7 +1226,8 @@ impl Client {
&'a self,
) -> Result<ResponseValue<types::WorkersResult>, Error<()>> {
let url = format!("{}/v1/workers", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -1228,7 +1246,8 @@ impl Client {
///Sends a `POST` request to `/v1/workers/recycle`
pub async fn workers_recycle<'a>(&'a self) -> Result<ResponseValue<()>, Error<()>> {
let url = format!("{}/v1/workers/recycle", self.baseurl,);
let request = self.client.post(url).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

18
progenitor-impl/tests/output/src/keeper_builder.rs
View File

@ -1436,7 +1436,8 @@ pub mod builder {
let url = format!("{}/enrol", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.json(&body)
@ -1488,7 +1489,8 @@ pub mod builder {
let url = format!("{}/global/jobs", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -1543,7 +1545,8 @@ pub mod builder {
let url = format!("{}/ping", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -1626,7 +1629,8 @@ pub mod builder {
let url = format!("{}/report/finish", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -1710,7 +1714,8 @@ pub mod builder {
let url = format!("{}/report/output", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -1792,7 +1797,8 @@ pub mod builder {
let url = format!("{}/report/start", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(

18
progenitor-impl/tests/output/src/keeper_builder_tagged.rs
View File

@ -1436,7 +1436,8 @@ pub mod builder {
let url = format!("{}/enrol", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.json(&body)
@ -1488,7 +1489,8 @@ pub mod builder {
let url = format!("{}/global/jobs", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -1543,7 +1545,8 @@ pub mod builder {
let url = format!("{}/ping", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -1626,7 +1629,8 @@ pub mod builder {
let url = format!("{}/report/finish", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -1710,7 +1714,8 @@ pub mod builder {
let url = format!("{}/report/output", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -1792,7 +1797,8 @@ pub mod builder {
let url = format!("{}/report/start", client.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(

18
progenitor-impl/tests/output/src/keeper_positional.rs
View File

@ -524,7 +524,8 @@ impl Client {
let url = format!("{}/enrol", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.json(&body)
@ -549,7 +550,8 @@ impl Client {
let url = format!("{}/global/jobs", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -577,7 +579,8 @@ impl Client {
let url = format!("{}/ping", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -607,7 +610,8 @@ impl Client {
let url = format!("{}/report/finish", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -638,7 +642,8 @@ impl Client {
let url = format!("{}/report/output", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -669,7 +674,8 @@ impl Client {
let url = format!("{}/report/start", self.baseurl,);
let mut header_map = HeaderMap::with_capacity(1usize);
header_map.append("Authorization", HeaderValue::try_from(authorization)?);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(

576
progenitor-impl/tests/output/src/nexus_builder.rs
View File

File diff suppressed because it is too large Load Diff

576
progenitor-impl/tests/output/src/nexus_builder_tagged.rs
View File

File diff suppressed because it is too large Load Diff

576
progenitor-impl/tests/output/src/nexus_positional.rs
View File

File diff suppressed because it is too large Load Diff

3
progenitor-impl/tests/output/src/param_collision_builder.rs
View File

@ -253,7 +253,8 @@ pub mod builder {
_query.push(("response", response.to_string()));
_query.push(("result", result.to_string()));
_query.push(("url", url.to_string()));
let _request = _client.client.get(_url).query(&_query).build()?;
#[allow(unused_mut)]
let mut _request = _client.client.get(_url).query(&_query).build()?;
let _result = _client.client.execute(_request).await;
let _response = _result?;
match _response.status().as_u16() {

3
progenitor-impl/tests/output/src/param_collision_builder_tagged.rs
View File

@ -253,7 +253,8 @@ pub mod builder {
_query.push(("response", response.to_string()));
_query.push(("result", result.to_string()));
_query.push(("url", url.to_string()));
let _request = _client.client.get(_url).query(&_query).build()?;
#[allow(unused_mut)]
let mut _request = _client.client.get(_url).query(&_query).build()?;
let _result = _client.client.execute(_request).await;
let _response = _result?;
match _response.status().as_u16() {

3
progenitor-impl/tests/output/src/param_collision_positional.rs
View File

@ -131,7 +131,8 @@ impl Client {
_query.push(("response", response.to_string()));
_query.push(("result", result.to_string()));
_query.push(("url", url.to_string()));
let _request = self.client.get(_url).query(&_query).build()?;
#[allow(unused_mut)]
let mut _request = self.client.get(_url).query(&_query).build()?;
let _result = self.client.execute(_request).await;
let _response = _result?;
match _response.status().as_u16() {

3
progenitor-impl/tests/output/src/param_overrides_builder.rs
View File

@ -190,7 +190,8 @@ pub mod builder {
if let Some(v) = &unique_key {
query.push(("uniqueKey", v.to_string()));
}
let request = client.client.get(url).query(&query).build()?;
#[allow(unused_mut)]
let mut request = client.client.get(url).query(&query).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

3
progenitor-impl/tests/output/src/param_overrides_builder_tagged.rs
View File

@ -190,7 +190,8 @@ pub mod builder {
if let Some(v) = &unique_key {
query.push(("uniqueKey", v.to_string()));
}
let request = client.client.get(url).query(&query).build()?;
#[allow(unused_mut)]
let mut request = client.client.get(url).query(&query).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

3
progenitor-impl/tests/output/src/param_overrides_positional.rs
View File

@ -128,7 +128,8 @@ impl Client {
query.push(("uniqueKey", v.to_string()));
}
let request = self.client.get(url).query(&query).build()?;
#[allow(unused_mut)]
let mut request = self.client.get(url).query(&query).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

21
progenitor-impl/tests/output/src/propolis_server_builder.rs
View File

@ -3002,7 +3002,8 @@ pub mod builder {
) -> Result<ResponseValue<types::InstanceGetResponse>, Error<types::Error>> {
let Self { client } = self;
let url = format!("{}/instance", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3075,7 +3076,8 @@ pub mod builder {
.and_then(|v| types::InstanceEnsureRequest::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -3154,7 +3156,8 @@ pub mod builder {
encode_path(&id.to_string()),
encode_path(&snapshot_id.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3231,7 +3234,8 @@ pub mod builder {
})
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/migrate/status", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3274,7 +3278,8 @@ pub mod builder {
) -> Result<ResponseValue<reqwest::Upgraded>, Error<reqwest::Upgraded>> {
let Self { client } = self;
let url = format!("{}/instance/serial", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(reqwest::header::CONNECTION, "Upgrade")
@ -3330,7 +3335,8 @@ pub mod builder {
let Self { client, body } = self;
let body = body.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -3408,7 +3414,8 @@ pub mod builder {
})
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state-monitor", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(

21
progenitor-impl/tests/output/src/propolis_server_builder_tagged.rs
View File

@ -2966,7 +2966,8 @@ pub mod builder {
) -> Result<ResponseValue<types::InstanceGetResponse>, Error<types::Error>> {
let Self { client } = self;
let url = format!("{}/instance", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3039,7 +3040,8 @@ pub mod builder {
.and_then(|v| types::InstanceEnsureRequest::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -3118,7 +3120,8 @@ pub mod builder {
encode_path(&id.to_string()),
encode_path(&snapshot_id.to_string()),
);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.post(url)
.header(
@ -3195,7 +3198,8 @@ pub mod builder {
})
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/migrate/status", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(
@ -3238,7 +3242,8 @@ pub mod builder {
) -> Result<ResponseValue<reqwest::Upgraded>, Error<reqwest::Upgraded>> {
let Self { client } = self;
let url = format!("{}/instance/serial", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(reqwest::header::CONNECTION, "Upgrade")
@ -3294,7 +3299,8 @@ pub mod builder {
let Self { client, body } = self;
let body = body.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.put(url)
.header(
@ -3372,7 +3378,8 @@ pub mod builder {
})
.map_err(Error::InvalidRequest)?;
let url = format!("{}/instance/state-monitor", client.baseurl,);
let request = client
#[allow(unused_mut)]
let mut request = client
.client
.get(url)
.header(

21
progenitor-impl/tests/output/src/propolis_server_positional.rs
View File

@ -1491,7 +1491,8 @@ impl Client {
&'a self,
) -> Result<ResponseValue<types::InstanceGetResponse>, Error<types::Error>> {
let url = format!("{}/instance", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -1519,7 +1520,8 @@ impl Client {
body: &'a types::InstanceEnsureRequest,
) -> Result<ResponseValue<types::InstanceEnsureResponse>, Error<types::Error>> {
let url = format!("{}/instance", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.put(url)
.header(
@ -1556,7 +1558,8 @@ impl Client {
encode_path(&id.to_string()),
encode_path(&snapshot_id.to_string()),
);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.post(url)
.header(
@ -1584,7 +1587,8 @@ impl Client {
body: &'a types::InstanceMigrateStatusRequest,
) -> Result<ResponseValue<types::InstanceMigrateStatusResponse>, Error<types::Error>> {
let url = format!("{}/instance/migrate/status", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(
@ -1612,7 +1616,8 @@ impl Client {
&'a self,
) -> Result<ResponseValue<reqwest::Upgraded>, Error<reqwest::Upgraded>> {
let url = format!("{}/instance/serial", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(reqwest::header::CONNECTION, "Upgrade")
@ -1641,7 +1646,8 @@ impl Client {
body: types::InstanceStateRequested,
) -> Result<ResponseValue<()>, Error<types::Error>> {
let url = format!("{}/instance/state", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.put(url)
.header(
@ -1670,7 +1676,8 @@ impl Client {
body: &'a types::InstanceStateMonitorRequest,
) -> Result<ResponseValue<types::InstanceStateMonitorResponse>, Error<types::Error>> {
let url = format!("{}/instance/state-monitor", self.baseurl,);
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(

3
progenitor-impl/tests/output/src/test_default_params_builder.rs
View File

@ -446,7 +446,8 @@ pub mod builder {
.and_then(|v| types::BodyWithDefaults::try_from(v).map_err(|e| e.to_string()))
.map_err(Error::InvalidRequest)?;
let url = format!("{}/", client.baseurl,);
let request = client.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = client.client.post(url).json(&body).build()?;
let result = client.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

3
progenitor-impl/tests/output/src/test_default_params_positional.rs
View File

@ -215,7 +215,8 @@ impl Client {
body: &'a types::BodyWithDefaults,
) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let url = format!("{}/", self.baseurl,);
let request = self.client.post(url).json(&body).build()?;
#[allow(unused_mut)]
let mut request = self.client.post(url).json(&body).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

3
progenitor-impl/tests/output/src/test_freeform_response.rs
View File

@ -147,7 +147,8 @@ impl Client {
&'a self,
) -> Result<ResponseValue<ByteStream>, Error<ByteStream>> {
let url = format!("{}/", self.baseurl,);
let request = self.client.get(url).build()?;
#[allow(unused_mut)]
let mut request = self.client.get(url).build()?;
let result = self.client.execute(request).await;
let response = result?;
match response.status().as_u16() {

3
progenitor-impl/tests/output/src/test_renamed_parameters.rs
View File

@ -163,7 +163,8 @@ impl Client {
query.push(("if", if_.to_string()));
query.push(("in", in_.to_string()));
query.push(("use", use_.to_string()));
let request = self
#[allow(unused_mut)]
let mut request = self
.client
.get(url)
.header(

5
progenitor-macro/src/lib.rs
View File

@ -91,6 +91,7 @@ struct MacroSettings {
inner_type: Option<ParseWrapper<syn::Type>>,
pre_hook: Option<ParseWrapper<ClosureOrPath>>,
pre_hook_async: Option<ParseWrapper<ClosureOrPath>>,
post_hook: Option<ParseWrapper<ClosureOrPath>>,
#[serde(default)]
@ -193,6 +194,7 @@ fn do_generate_api(item: TokenStream) -> Result<TokenStream, syn::Error> {
tags,
inner_type,
pre_hook,
pre_hook_async,
post_hook,
derives,
patch,
@ -207,6 +209,9 @@ fn do_generate_api(item: TokenStream) -> Result<TokenStream, syn::Error> {
});
pre_hook
.map(|pre_hook| settings.with_pre_hook(pre_hook.into_inner().0));
pre_hook_async.map(|pre_hook_async| {
settings.with_pre_hook_async(pre_hook_async.into_inner().0)
});
post_hook
.map(|post_hook| settings.with_post_hook(post_hook.into_inner().0));