don't rely on dependency information from built (#838)

Cargo.toml

@@ -22,7 +22,7 @@ anyhow = "1.0.86"
 base64 = "0.22.1"
 built = { version = "0.7.3", features = ["cargo-lock", "git2"] }
 bytes = "1.6.0"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.0", features = ["serde"] }
 clap = { version = "4.5.7", features = ["derive"] }
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false }
 env_logger = "0.10.2"
@@ -34,7 +34,7 @@ http = "0.2.9"
 hyper = "0.14.27"
 indexmap = "2.2.6"
 openapiv3 = "2.0.0"
-percent-encoding = "2.3"
+percent-encoding = "2.3.0"
 proc-macro2 = "1.0.86"
 project-root = "0.2.2"
 quote = "1.0.36"

cargo-progenitor/src/main.rs

@@ -1,7 +1,6 @@
-// Copyright 2023 Oxide Computer Company
+// Copyright 2024 Oxide Computer Company
 
 use std::{
-    collections::HashMap,
     fs::{File, OpenOptions},
     io::Write,
     path::{Path, PathBuf},
@@ -146,15 +145,11 @@ fn main() -> Result<()> {
             let name = &args.name;
             let version = &args.version;
 
-            /*
+            // Create the top-level crate directory:
-             * Create the top-level crate directory:
-             */
             let root = PathBuf::from(&args.output);
             std::fs::create_dir_all(&root)?;
 
-            /*
+            // Write the Cargo.toml file:
-             * Write the Cargo.toml file:
-             */
             let mut toml = root.clone();
             toml.push("Cargo.toml");
 
@@ -184,16 +179,12 @@ fn main() -> Result<()> {
 
             save(&toml, tomlout.as_str())?;
 
-            /*
+            // Create the src/ directory:
-             * Create the src/ directory:
-             */
             let mut src = root;
             src.push("src");
             std::fs::create_dir_all(&src)?;
 
-            /*
+            // Create the Rust source file containing the generated client:
-             * Create the Rust source file containing the generated client:
-             */
             let lib_code = if args.include_client {
                 format!("mod progenitor_client;\n\n{}", api_code)
             } else {
@@ -205,9 +196,7 @@ fn main() -> Result<()> {
             librs.push("lib.rs");
             save(librs, lib_code.as_str())?;
 
-            /*
+            // Create the Rust source file containing the support code:
-             * Create the Rust source file containing the support code:
-             */
             if args.include_client {
                 let progenitor_client_code = progenitor_client::code();
                 let mut clientrs = src;
@@ -225,76 +214,90 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-pub fn dependencies(builder: Generator, include_client: bool) -> Vec<String> {
+// Indirect dependencies may or may not be preserved in built's output so we
-    let dependency_versions: HashMap<String, String> = built_info::DEPENDENCIES
+// manually encode the versions. We need to take care to update this
-        .iter()
+// particularly when generated code depends on particular dependency versions.
-        .map(|(name, version)| (name.to_string(), version.to_string()))
+struct Dependencies {
-        .collect();
+    base64: &'static str,
+    bytes: &'static str,
+    chrono: &'static str,
+    futures: &'static str,
+    percent_encoding: &'static str,
+    rand: &'static str,
+    regress: &'static str,
+    reqwest: &'static str,
+    serde: &'static str,
+    serde_json: &'static str,
+    serde_urlencoded: &'static str,
+    uuid: &'static str,
+}
 
+const DEPENDENCIES: Dependencies = Dependencies {
+    base64: "0.22",
+    bytes: "1.0",
+    chrono: "0.4",
+    futures: "0.3",
+    percent_encoding: "2.3",
+    rand: "0.8",
+    regress: "0.10",
+    reqwest: "0.11",
+    serde: "1.0",
+    serde_json: "1.0",
+    serde_urlencoded: "0.7",
+    uuid: "1.0",
+};
+
+pub fn dependencies(builder: Generator, include_client: bool) -> Vec<String> {
     let mut deps = vec![
-        format!("bytes = \"{}\"", dependency_versions.get("bytes").unwrap()),
+        format!("bytes = \"{}\"", DEPENDENCIES.bytes),
-        format!("futures-core = \"{}\"", dependency_versions.get("futures-core").unwrap()),
+        format!("futures-core = \"{}\"", DEPENDENCIES.futures),
-        format!("reqwest = {{ version = \"{}\", default-features=false, features = [\"json\", \"stream\"] }}", dependency_versions.get("reqwest").unwrap()),
+        format!("reqwest = {{ version = \"{}\", default-features=false, features = [\"json\", \"stream\"] }}", DEPENDENCIES.reqwest),
-        format!("serde = {{ version = \"{}\", features = [\"derive\"] }}", dependency_versions.get("serde").unwrap()),
+        format!("serde = {{ version = \"{}\", features = [\"derive\"] }}", DEPENDENCIES.serde),
-        format!("serde_urlencoded = \"{}\"", dependency_versions.get("serde_urlencoded").unwrap()),
+        format!("serde_urlencoded = \"{}\"", DEPENDENCIES.serde_urlencoded),
     ];
 
     let type_space = builder.get_type_space();
+    let mut needs_serde_json = false;
 
-    let client_version_dep: String;
     if include_client {
         // code included from progenitor-client needs extra dependencies
         deps.push(format!(
             "percent-encoding = \"{}\"",
-            dependency_versions.get("percent-encoding").unwrap()
+            DEPENDENCIES.percent_encoding
         ));
+        needs_serde_json = true;
     } else {
         let crate_version = if release_is_unstable() {
             "*"
         } else {
             built_info::PKG_VERSION
         };
-        client_version_dep =
+        let client_version_dep =
             format!("progenitor-client = \"{}\"", crate_version);
         deps.push(client_version_dep);
     }
 
     if type_space.uses_regress() {
-        deps.push(format!(
+        deps.push(format!("regress = \"{}\"", DEPENDENCIES.regress));
-            "regress = \"{}\"",
-            dependency_versions.get("regress").unwrap()
-        ));
     }
     if type_space.uses_uuid() {
         deps.push(format!(
             "uuid = {{ version = \"{}\", features = [\"serde\", \"v4\"] }}",
-            dependency_versions.get("uuid").unwrap()
+            DEPENDENCIES.uuid
         ));
     }
     if type_space.uses_chrono() {
-        deps.push(format!("chrono = {{ version = \"{}\", default-features=false, features = [\"serde\"] }}", dependency_versions.get("chrono").unwrap()))
+        deps.push(format!("chrono = {{ version = \"{}\", default-features=false, features = [\"serde\"] }}", DEPENDENCIES.chrono));
     }
     if builder.uses_futures() {
-        deps.push(format!(
+        deps.push(format!("futures = \"{}\"", DEPENDENCIES.futures));
-            "futures = \"{}\"",
-            dependency_versions.get("futures").unwrap()
-        ));
     }
     if builder.uses_websockets() {
-        deps.push(format!(
+        deps.push(format!("base64 = \"{}\"", DEPENDENCIES.base64));
-            "base64 = \"{}\"",
+        deps.push(format!("rand = \"{}\"", DEPENDENCIES.rand));
-            dependency_versions.get("base64").unwrap()
-        ));
-        deps.push(format!(
-            "rand = \"{}\"",
-            dependency_versions.get("rand").unwrap()
-        ));
     }
-    if type_space.uses_serde_json() {
+    if type_space.uses_serde_json() || needs_serde_json {
-        deps.push(format!(
+        deps.push(format!("serde_json = \"{}\"", DEPENDENCIES.serde_json));
-            "serde_json = \"{}\"",
-            dependency_versions.get("serde_json").unwrap()
-        ));
     }
     deps.sort_unstable();
     deps