From 1ac88fcd5dccab96869b4b9e3af4d6e2b5dad8dc Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Wed, 18 Dec 2024 07:47:04 -0800
Subject: [PATCH] don't depend on progenitor-client from github (or
 progenitor-macro)

---
 Cargo.lock       | 68 ++++++------------------------------------------
 Cargo.toml       |  2 +-
 xtask/Cargo.toml |  2 +-
 3 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 949912ae..9da8b1ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2354,7 +2354,7 @@ dependencies = [
  "clap",
  "dirs",
  "futures",
- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "progenitor-client",
  "rand",
  "regress",
  "reqwest",
@@ -2684,11 +2684,9 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67"
+source = "git+https://github.com/oxidecomputer/progenitor#e65651f06c16674a68aae64c5143e36b8b7efeaf"
 dependencies = [
- "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor)",
  "progenitor-impl",
- "progenitor-macro",
 ]
 
 [[package]]
@@ -2706,24 +2704,10 @@ dependencies = [
  "serde_urlencoded",
 ]
 
-[[package]]
-name = "progenitor-client"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67"
-dependencies = [
- "bytes",
- "futures-core",
- "percent-encoding",
- "reqwest",
- "serde",
- "serde_json",
- "serde_urlencoded",
-]
-
 [[package]]
 name = "progenitor-impl"
 version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67"
+source = "git+https://github.com/oxidecomputer/progenitor#e65651f06c16674a68aae64c5143e36b8b7efeaf"
 dependencies = [
  "heck",
  "http 1.1.0",
@@ -2741,23 +2725,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "progenitor-macro"
-version = "0.8.0"
-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67"
-dependencies = [
- "openapiv3",
- "proc-macro2",
- "progenitor-impl",
- "quote",
- "schemars",
- "serde",
- "serde_json",
- "serde_tokenstream",
- "serde_yaml",
- "syn",
-]
-
 [[package]]
 name = "quinn"
 version = "0.11.5"
@@ -3210,9 +3177,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
  "serde",
 ]
@@ -3313,19 +3280,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -4069,7 +4023,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "typify"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde"
+source = "git+https://github.com/oxidecomputer/typify#9065106fc0bf1c0611dd7a5aea0c7366b7f00135"
 dependencies = [
  "typify-impl",
  "typify-macro",
@@ -4078,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "typify-impl"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde"
+source = "git+https://github.com/oxidecomputer/typify#9065106fc0bf1c0611dd7a5aea0c7366b7f00135"
 dependencies = [
  "heck",
  "log",
@@ -4097,7 +4051,7 @@ dependencies = [
 [[package]]
 name = "typify-macro"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde"
+source = "git+https://github.com/oxidecomputer/typify#9065106fc0bf1c0611dd7a5aea0c7366b7f00135"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4151,12 +4105,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
diff --git a/Cargo.toml b/Cargo.toml
index 09b59b2d..ffbcd2e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ oxide-httpmock = { path = "sdk-httpmock", version = "0.9.0" }
 oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
 predicates = "3.1.2"
 pretty_assertions = "1.4.1"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", default-features = false }
 progenitor-client = "0.8.0"
 rand = "0.8.5"
 ratatui = "0.26.3"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 92f5ee64..75d246ac 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 clap = { workspace = true }
 newline-converter = { workspace = true }
-progenitor = { workspace = true }
+progenitor = { workspace = true, default-features = false }
 regex = { workspace = true }
 rustfmt-wrapper = { workspace = true }
 serde_json = { workspace = true }