From cfb89adb199ca8d481c18364659eb2f2d4b66f4a Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 27 Feb 2024 13:03:40 -0800 Subject: [PATCH] remove progenitor override --- Cargo.lock | 135 +++++++++++++++++++++++++++++--------- Cargo.toml | 6 +- workspace-hack/Cargo.toml | 4 +- 3 files changed, 110 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3e6967985..a729db2bf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -655,7 +655,7 @@ dependencies = [ "ipnetwork", "omicron-common", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "regress", "reqwest", "schemars", @@ -1315,7 +1315,7 @@ dependencies = [ "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "reqwest", "schemars", "serde", @@ -1331,7 +1331,7 @@ dependencies = [ "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "reqwest", "schemars", "serde", @@ -1568,8 +1568,8 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "omicron-zone-package", - "progenitor", - "progenitor-client", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "quote", "reqwest", "rustfmt-wrapper", @@ -1891,7 +1891,7 @@ dependencies = [ "chrono", "http 0.2.11", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "reqwest", "schemars", "serde", @@ -1945,8 +1945,8 @@ dependencies = [ "ipnetwork", "omicron-workspace-hack", "omicron-zone-package", - "progenitor", - "progenitor-client", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "quote", "rand 0.8.5", "regress", @@ -2584,7 +2584,7 @@ dependencies = [ "chrono", "gateway-messages", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "rand 0.8.5", "reqwest", "schemars", @@ -3506,7 +3506,7 @@ version = "0.1.0" dependencies = [ "installinator-common", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "regress", "reqwest", "schemars", @@ -3586,7 +3586,7 @@ dependencies = [ "omicron-common", "omicron-test-utils", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "reqwest", "serde", "serde_json", @@ -4083,8 +4083,8 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "omicron-zone-package", - "progenitor", - "progenitor-client", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "quote", "reqwest", "rustfmt-wrapper", @@ -4305,7 +4305,7 @@ dependencies = [ "omicron-common", "omicron-passwords", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "regress", "reqwest", "schemars", @@ -4888,7 +4888,7 @@ dependencies = [ "omicron-workspace-hack", "once_cell", "parse-display", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "proptest", "rand 0.8.5", "regress", @@ -5063,7 +5063,7 @@ dependencies = [ "petgraph", "pq-sys", "pretty_assertions", - "progenitor-client", + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "propolis-client", "rand 0.8.5", "rcgen", @@ -5672,7 +5672,7 @@ dependencies = [ "http 0.2.11", "hyper 0.14.27", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "rand 0.8.5", "regress", "reqwest", @@ -5728,7 +5728,7 @@ dependencies = [ "futures", "omicron-common", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "reqwest", "serde", "slog", @@ -6541,16 +6541,29 @@ dependencies = [ [[package]] name = "progenitor" version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" dependencies = [ - "progenitor-client", - "progenitor-impl", - "progenitor-macro", + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "progenitor-macro 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "serde_json", +] + +[[package]] +name = "progenitor" +version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" +dependencies = [ + "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", + "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", + "progenitor-macro 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", "serde_json", ] [[package]] name = "progenitor-client" version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" dependencies = [ "bytes", "futures-core", @@ -6561,9 +6574,46 @@ dependencies = [ "serde_urlencoded", ] +[[package]] +name = "progenitor-client" +version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" +dependencies = [ + "bytes", + "futures-core", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", +] + +[[package]] +name = "progenitor-impl" +version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" +dependencies = [ + "getopts", + "heck 0.4.1", + "http 0.2.11", + "indexmap 2.2.3", + "openapiv3", + "proc-macro2", + "quote", + "regex", + "schemars", + "serde", + "serde_json", + "syn 2.0.51", + "thiserror", + "typify", + "unicode-ident", +] + [[package]] name = "progenitor-impl" version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" dependencies = [ "getopts", "heck 0.4.1", @@ -6585,10 +6635,28 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" dependencies = [ "openapiv3", "proc-macro2", - "progenitor-impl", + "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", + "quote", + "schemars", + "serde", + "serde_json", + "serde_tokenstream 0.2.0", + "serde_yaml", + "syn 2.0.51", +] + +[[package]] +name = "progenitor-macro" +version = "0.5.0" +source = "git+https://github.com/oxidecomputer/progenitor#08bbafc251d3d6828ca5921d1658c3d12d64fe7c" +dependencies = [ + "openapiv3", + "proc-macro2", + "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", "quote", "schemars", "serde", @@ -6606,7 +6674,7 @@ dependencies = [ "async-trait", "base64", "futures", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", "rand 0.8.5", "reqwest", "schemars", @@ -6631,7 +6699,7 @@ dependencies = [ "dropshot", "futures", "hyper 0.14.27", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", "propolis_types", "rand 0.8.5", "reqwest", @@ -7051,9 +7119,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64", "bytes", @@ -7079,6 +7147,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -8097,7 +8166,7 @@ dependencies = [ "ipnetwork", "omicron-common", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "regress", "reqwest", "schemars", @@ -8768,6 +8837,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -10198,9 +10273,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -10412,7 +10487,7 @@ dependencies = [ "installinator-common", "ipnetwork", "omicron-workspace-hack", - "progenitor", + "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "regress", "reqwest", "schemars", diff --git a/Cargo.toml b/Cargo.toml index 39738af32d..955dfb3cf1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -607,9 +607,9 @@ opt-level = 3 # # Local client generation during development. # -[patch."https://github.com/oxidecomputer/progenitor"] -progenitor = { path = "../progenitor/progenitor" } -progenitor-client = { path = "../progenitor/progenitor-client" } +#[patch."https://github.com/oxidecomputer/progenitor"] +#progenitor = { path = "../progenitor/progenitor" } +#progenitor-client = { path = "../progenitor/progenitor-client" } #[patch."https://github.com/oxidecomputer/typify"] #typify = { path = "../typify/typify" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 57b1b1dc75..e351b053e0 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -85,7 +85,7 @@ rand_chacha = { version = "0.3.1", default-features = false, features = ["std"] regex = { version = "1.10.3" } regex-automata = { version = "0.4.4", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } regex-syntax = { version = "0.8.2" } -reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", "stream"] } +reqwest = { version = "0.11.24", features = ["blocking", "json", "rustls-tls", "stream"] } ring = { version = "0.17.8", features = ["std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid1"] } semver = { version = "1.0.22", features = ["serde"] } @@ -192,7 +192,7 @@ rand_chacha = { version = "0.3.1", default-features = false, features = ["std"] regex = { version = "1.10.3" } regex-automata = { version = "0.4.4", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } regex-syntax = { version = "0.8.2" } -reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", "stream"] } +reqwest = { version = "0.11.24", features = ["blocking", "json", "rustls-tls", "stream"] } ring = { version = "0.17.8", features = ["std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid1"] } semver = { version = "1.0.22", features = ["serde"] }