move to published dropshot crate (#983)

ahl · web-flow · commit 7cbb3d95d1f6 · 2024-11-25T10:47:18.000-08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ built = { version = "0.7.5", features = ["cargo-lock", "git2"] }
 bytes = "1.8.0"
 chrono = { version = "0.4.0", default-features = false, features = ["serde"] }
 clap = { version = "4.5.21", default-features = false, features = ["derive", "std"] }
-dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false }
+dropshot = { version = "0.13.0", default-features = false }
 env_logger = "0.10.2"
 expectorate = "1.1.0"
 futures = "0.3.31"
@@ -44,6 +44,7 @@ regress = "0.10.1"
 reqwest = { version = "0.12.4", default-features = false, features = ["json", "stream"] }
 rustfmt-wrapper = "0.2.1"
 schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
+semver = "1.0.23"
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 serde_urlencoded = "0.7.1"
@@ -57,9 +58,6 @@ typify = { git = "https://github.com/oxidecomputer/typify" }
 unicode-ident = "1.0.14"
 uuid = { version = "1.11.0", features = ["serde", "v4"] }
 
-#[patch."https://github.com/oxidecomputer/dropshot"]
-#dropshot = { path = "../dropshot/dropshot" }
-
 #[patch."https://github.com/oxidecomputer/typify"]
 #typify = { path = "../typify/typify" }
 
diff --git a/example-wasm/tests/client.rs b/example-wasm/tests/client.rs
@@ -1,10 +1,11 @@
-use wasm_bindgen_test::*;
+// Copyright 2024 Oxide Computer Company
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 
 include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
 
-#[wasm_bindgen_test]
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen_test::wasm_bindgen_test]
 fn test_client_new() {
     let client = Client::new("http://foo/bar");
     assert!(client.baseurl == "http://foo/bar");
diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml
@@ -31,6 +31,7 @@ http = { workspace = true }
 hyper = { workspace = true }
 reqwest = { workspace = true }
 rustfmt-wrapper = { workspace = true }
+semver = { workspace = true }
 serde_yaml = { workspace = true }
 tokio = { workspace = true }
 
diff --git a/progenitor-impl/tests/output/src/test_default_params_builder.rs b/progenitor-impl/tests/output/src/test_default_params_builder.rs
@@ -319,7 +319,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for pagination-demo
 ///
-///Version: 9000
+///Version: 9000.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -372,7 +372,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "9000"
+        "9000.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/output/src/test_default_params_positional.rs b/progenitor-impl/tests/output/src/test_default_params_positional.rs
@@ -148,7 +148,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for pagination-demo
 ///
-///Version: 9000
+///Version: 9000.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -201,7 +201,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "9000"
+        "9000.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/output/src/test_freeform_response.rs b/progenitor-impl/tests/output/src/test_freeform_response.rs
@@ -81,7 +81,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for pagination-demo
 ///
-///Version: 9000
+///Version: 9000.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -134,7 +134,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "9000"
+        "9000.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/output/src/test_renamed_parameters.rs b/progenitor-impl/tests/output/src/test_renamed_parameters.rs
@@ -81,7 +81,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for pagination-demo
 ///
-///Version: 9000
+///Version: 9000.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -134,7 +134,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "9000"
+        "9000.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/output/src/test_stream_pagination_builder.rs b/progenitor-impl/tests/output/src/test_stream_pagination_builder.rs
@@ -272,7 +272,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for test_stream_pagination
 ///
-///Version: 1
+///Version: 1.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -325,7 +325,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "1"
+        "1.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/output/src/test_stream_pagination_positional.rs b/progenitor-impl/tests/output/src/test_stream_pagination_positional.rs
@@ -129,7 +129,7 @@ pub mod types {
 #[derive(Clone, Debug)]
 ///Client for test_stream_pagination
 ///
-///Version: 1
+///Version: 1.0.0
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -182,7 +182,7 @@ impl Client {
     /// This string is pulled directly from the source OpenAPI
     /// document and may be in any format the API selects.
     pub fn api_version(&self) -> &'static str {
-        "1"
+        "1.0.0"
     }
 }
 
diff --git a/progenitor-impl/tests/test_specific.rs b/progenitor-impl/tests/test_specific.rs
@@ -76,7 +76,7 @@ fn test_renamed_parameters() {
 
     let mut out = Vec::new();
 
-    api.openapi("pagination-demo", "9000")
+    api.openapi("pagination-demo", semver::Version::new(9000, 0, 0))
         .write(&mut out)
         .unwrap();
 
@@ -110,7 +110,7 @@ fn test_freeform_response() {
 
     let mut out = Vec::new();
 
-    api.openapi("pagination-demo", "9000")
+    api.openapi("pagination-demo", semver::Version::new(9000, 0, 0))
         .write(&mut out)
         .unwrap();
 
@@ -164,7 +164,7 @@ fn test_default_params() {
 
     let mut out = Vec::new();
 
-    api.openapi("pagination-demo", "9000")
+    api.openapi("pagination-demo", semver::Version::new(9000, 0, 0))
         .write(&mut out)
         .unwrap();
 
@@ -237,7 +237,9 @@ async fn test_stream_pagination() {
 
     let mut out = Vec::new();
 
-    api.openapi(TEST_NAME, "1").write(&mut out).unwrap();
+    api.openapi(TEST_NAME, semver::Version::new(1, 0, 0))
+        .write(&mut out)
+        .unwrap();
 
     let out = from_utf8(&out).unwrap();
     let spec = serde_json::from_str::<OpenAPI>(out).unwrap();
