generated clients sketch

Cargo.toml

@@ -45,10 +45,19 @@ panic = "abort"
 #[patch."https://github.com/oxidecomputer/steno"]
 #steno = { path = "../steno" }
 
+#
+# Local client generation during development.
+#
+#[patch."https://github.com/oxidecomputer/progenitor"]
+#progenitor = { path = "../progenitor/progenitor" }
+#[patch."https://github.com/oxidecomputer/typify"]
+#typify = { path = "../typify/typify" }
+
 #
 # We maintain a fork of pq-sys to address upstream issues.  See the
 # README.oxide.md in the "oxide" branch of our fork for details.
 #
 [patch.crates-io.pq-sys]
 git = 'https://github.com/oxidecomputer/pq-sys'
 branch = "oxide/omicron"
+

common/Cargo.toml

@@ -23,6 +23,8 @@ tempfile = "3.0"
 thiserror = "1.0"
 toml = "0.5.6"
 walkdir = "2.3"
+progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+percent-encoding = "2.1.0"
 
 [dependencies.api_identity]
 path = "src/api/external/api_identity"

common/src/api/external/error.rs

@@ -287,6 +287,7 @@ mod test {
 
     #[test]
     fn test_bail_unless() {
+        #![allow(clippy::eq_op)]
         /* Success cases */
         let no_bail = || {
             bail_unless!(1 + 1 == 2, "wrong answer: {}", 3);

common/src/lib.rs

@@ -24,15 +24,33 @@ pub mod api;
 pub mod backoff;
 pub mod cmd;
 pub mod config;
-pub mod http_client;
 pub mod packaging;
 
-mod sled_agent_client;
+macro_rules! generate_logging_api {
+    ($path:literal) => {
+        progenitor::generate_api!(
+            $path,
+            slog::Logger,
+            |log: &slog::Logger, request: &reqwest::Request| {
+                debug!(log, "client request";
+                    "method" => %request.method(),
+                    "uri" => %request.url(),
+                    "body" => ?&request.body(),
+                );
+            },
+            |log: &slog::Logger, result: &Result<_, _>| {
+                debug!(log, "client response"; "result" => ?result);
+            },
+        );
+    };
+}
+
+pub mod sled_agent_client;
 pub use sled_agent_client::Client as SledAgentClient;
 pub use sled_agent_client::TestInterfaces as SledAgentTestInterfaces;
-mod nexus_client;
+pub mod nexus_client;
 pub use nexus_client::Client as NexusClient;
-mod oximeter_client;
+pub mod oximeter_client;
 pub use oximeter_client::Client as OximeterClient;
 
 #[macro_use]