a bunch of feature extensions - WIP

Cargo.toml

@@ -11,8 +11,9 @@ members = [
 #[patch."https://github.com/oxidecomputer/dropshot"]
 #dropshot = { path = "../dropshot/dropshot" }
 
-#[patch."https://github.com/oxidecomputer/typify"]
-#typify = { path = "../typify/typify" }
+[patch."https://github.com/oxidecomputer/typify"]
+typify = { git = "https://github.com/drahnr/typify", branch = "main" }
+# typify = { path = "../typify/typify" }
 
 #[patch.crates-io]
 #serde_tokenstream = { path = "../serde_tokenstream" }

README.md

@@ -36,7 +36,7 @@ You'll need to add the following to `Cargo.toml`:
 [dependencies]
 +futures = "0.3"
 +progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
-+reqwest = { version = "0.11", features = ["json", "stream"] }
++reqwest = { version = "0.11", features = ["json", "stream", "multipart"] }
 +serde = { version = "1.0", features = ["derive"] }
 ```
 
@@ -123,7 +123,7 @@ You'll need to add the following to `Cargo.toml`:
 [dependencies]
 +futures = "0.3"
 +progenitor-client = { git = "https://github.com/oxidecomputer/progenitor" }
-+reqwest = { version = "0.11", features = ["json", "stream"] }
++reqwest = { version = "0.11", features = ["json", "stream", "multipart"] }
 +serde = { version = "1.0", features = ["derive"] }
 
 [build-dependencies]
@@ -180,7 +180,7 @@ bytes = "1.3.0"
 chrono = { version = "0.4.23", default-features=false, features = ["serde"] }
 futures-core = "0.3.25"
 percent-encoding = "2.2.0"
-reqwest = { version = "0.11.13", default-features=false, features = ["json", "stream"] }
+reqwest = { version = "0.11.13", default-features=false, features = ["json", "stream", "multipart"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_urlencoded = "0.7.1"
 

example-build/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 progenitor-client = { path = "../progenitor-client" }
-reqwest = { version = "0.11.16", features = ["json", "stream"] }
+reqwest = { version = "0.11.16", features = ["json", "stream", "multipart"] }
 base64 = "0.21"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }

example-macro/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 progenitor = { path = "../progenitor" }
-reqwest = { version = "0.11.16", features = ["json", "stream"] }
+reqwest = { version = "0.11.16", features = ["json", "stream", "multipart"] }
 schemars = { version = "0.8.12", features = ["uuid1"] }
 serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.3", features = ["serde", "v4"] }

progenitor-client/Cargo.toml

@@ -10,7 +10,7 @@ description = "An OpenAPI client generator - client support"
 bytes = "1.4.0"
 futures-core = "0.3.27"
 percent-encoding = "2.2"
-reqwest = { version = "0.11.16", default-features = false, features = ["json", "stream"] }
+reqwest = { version = "0.11.16", default-features = false, features = ["json", "stream", "multipart"] }
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"

progenitor-client/src/progenitor_client.rs

@@ -4,11 +4,14 @@
 
 //! Support code for generated clients.
 
-use std::ops::{Deref, DerefMut};
+use std::{
+    borrow::Cow,
+    ops::{Deref, DerefMut}, fs,
+};
 
 use bytes::Bytes;
 use futures_core::Stream;
-use reqwest::RequestBuilder;
+use reqwest::{RequestBuilder, multipart};
 use serde::{de::DeserializeOwned, Serialize};
 
 type InnerByteStream =
@@ -63,10 +66,13 @@ impl<T: DeserializeOwned> ResponseValue<T> {
     ) -> Result<Self, Error<E>> {
         let status = response.status();
         let headers = response.headers().clone();
-        let inner = response
-            .json()
-            .await
-            .map_err(Error::InvalidResponsePayload)?;
+        let response = response.text().await?;
+        fs::write("responsefcuk.json", &response).unwrap();
+        let inner: T = serde_json::from_str(&response).unwrap();
+        // let inner = response
+        //     .json()
+        //     .await
+        //     .map_err(|e| Error::InvalidResponsePayload(reqwest::Error::from(e)))?;
 
         Ok(Self {
             inner,
@@ -386,11 +392,22 @@ pub fn encode_path(pc: &str) -> String {
 }
 
 #[doc(hidden)]
-pub trait RequestBuilderExt<E> {
+pub trait RequestBuilderExt<E>
+where
+    Self: Sized,
+{
     fn form_urlencoded<T: Serialize + ?Sized>(
         self,
         body: &T,
     ) -> Result<RequestBuilder, Error<E>>;
+
+    fn form_from_raw<
+        S: AsRef<str>,
+        I: Sized + IntoIterator<Item = (S, reqwest::multipart::Part)>,
+    >(
+        self,
+        iter: I,
+    ) -> Result<Self, Error<E>>;
 }
 
 impl<E> RequestBuilderExt<E> for RequestBuilder {
@@ -405,8 +422,33 @@ impl<E> RequestBuilderExt<E> for RequestBuilder {
                     "application/x-www-form-urlencoded",
                 ),
             )
-            .body(serde_urlencoded::to_string(body).map_err(|_| {
-                Error::InvalidRequest("failed to serialize body".to_string())
+            .body(serde_urlencoded::to_string(body).map_err(|e| {
+                Error::InvalidRequest(format!(
+                    "failed to serialize body: {e:?}"
+                ))
             })?))
     }
+
+    fn form_from_raw<
+        S: AsRef<str>,
+        I: Sized + IntoIterator<Item = (S, reqwest::multipart::Part)>,
+    >(
+        self,
+        mut iter: I,
+    ) -> Result<Self, Error<E>> {
+        use reqwest::multipart::{Form, Part};
+
+        let mut form = Form::new();
+        for (name, part) in iter {
+            form = form.part(
+                name.as_ref().to_owned(), part,
+            );
+        }
+
+        dbg!(&form);
+
+        Ok(self
+            .multipart(form)
+        )
+    }
 }

progenitor-impl/Cargo.toml

@@ -11,6 +11,7 @@ readme = "../README.md"
 heck = "0.4.1"
 getopts = "0.2"
 indexmap = "1.9"
+itertools = "0.10"
 openapiv3 = "1.0.0"
 proc-macro2 = "1.0"
 quote = "1.0"

progenitor-impl/src/cli.rs

@@ -7,6 +7,7 @@ use quote::{format_ident, quote};
 use typify::{TypeSpaceImpl, TypeStructPropInfo};
 
 use crate::{
+    Security,
     method::{
         OperationParameterKind, OperationParameterType, OperationResponseStatus,
     },
@@ -49,6 +50,8 @@ impl Generator {
     ) -> Result<TokenStream> {
         validate_openapi(spec)?;
 
+        let security = Security::from(spec);
+
         // Convert our components dictionary to schemars
         let schemas = spec.components.iter().flat_map(|components| {
             components.schemas.iter().map(|(name, ref_or_schema)| {
@@ -74,6 +77,7 @@ impl Generator {
                     &spec.components,
                     path,
                     method,
+                    &security,
                     path_parameters,
                 )
             })