From 1499bd808986efccf0e90d9571f3f85a82c46059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 15:59:02 +0000 Subject: [PATCH 1/3] Bump dropshot from `6ca8e21` to `1e07d6c` Bumps [dropshot](https://github.com/oxidecomputer/dropshot) from `6ca8e21` to `1e07d6c`. - [Release notes](https://github.com/oxidecomputer/dropshot/releases) - [Commits](https://github.com/oxidecomputer/dropshot/compare/6ca8e21a8b9fe1a35e6780afa1f70a5ec6a22513...1e07d6cdc7c752d43541e546b6a6a366433fd443) --- updated-dependencies: - dependency-name: dropshot dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 824a6f247ee..70f821bed1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" dependencies = [ "async-stream-impl", "futures-core", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", @@ -1006,7 +1006,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dropshot" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#6ca8e21a8b9fe1a35e6780afa1f70a5ec6a22513" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#1e07d6cdc7c752d43541e546b6a6a366433fd443" dependencies = [ "async-stream", "async-trait", @@ -1044,7 +1044,7 @@ dependencies = [ [[package]] name = "dropshot_endpoint" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#6ca8e21a8b9fe1a35e6780afa1f70a5ec6a22513" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#1e07d6cdc7c752d43541e546b6a6a366433fd443" dependencies = [ "proc-macro2", "quote", From 6bc965da5f8e8c5a999138f99f01f319863322fa Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 15 Mar 2022 16:38:55 -0700 Subject: [PATCH 2/3] update openapi-lint and progenitor as well --- Cargo.lock | 13 ++++++++----- common/Cargo.toml | 2 +- gateway-client/Cargo.toml | 2 +- nexus-client/Cargo.toml | 2 +- openapi/nexus-internal.json | 7 ++++++- openapi/nexus.json | 14 ++++++++++++-- oximeter-client/Cargo.toml | 2 +- sled-agent-client/Cargo.toml | 2 +- sled-agent/Cargo.toml | 2 +- 9 files changed, 32 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70f821bed1a..ceedeb1884e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2463,7 +2463,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openapi-lint" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#025fc867b7da62b33474d0a765823653a437f362" +source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#9e3ada82808ef882fdefe2d01a39eeeb219c8778" dependencies = [ "convert_case 0.5.0", "indexmap", @@ -3118,7 +3118,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ae7c178e21b321b0f88a9fa886a59fb98defa21a" +source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" dependencies = [ "anyhow", "getopts", @@ -3133,8 +3133,10 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ae7c178e21b321b0f88a9fa886a59fb98defa21a" +source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" dependencies = [ + "bytes", + "futures-core", "percent-encoding", "reqwest", "serde", @@ -3144,7 +3146,7 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ae7c178e21b321b0f88a9fa886a59fb98defa21a" +source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" dependencies = [ "convert_case 0.4.0", "getopts", @@ -3166,7 +3168,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ae7c178e21b321b0f88a9fa886a59fb98defa21a" +source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" dependencies = [ "openapiv3", "proc-macro2", @@ -3434,6 +3436,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", + "tokio-util 0.6.9", "url", "wasm-bindgen", "wasm-bindgen-futures", diff --git a/common/Cargo.toml b/common/Cargo.toml index 64d6bfdfe1a..eae2f6ef6c1 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -16,7 +16,7 @@ hyper = "0.14" ipnetwork = "0.18" macaddr = { version = "1.0.1", features = [ "serde_std" ] } rand = "0.8.4" -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } ring = "0.16" schemars = { version = "0.8", features = [ "chrono", "uuid" ] } serde = { version = "1.0", features = [ "derive" ] } diff --git a/gateway-client/Cargo.toml b/gateway-client/Cargo.toml index e14bb54d011..33ef421c1a7 100644 --- a/gateway-client/Cargo.toml +++ b/gateway-client/Cargo.toml @@ -6,7 +6,7 @@ license = "MPL-2.0" [dependencies] progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } serde_json = "1.0" futures = "0.3.21" diff --git a/nexus-client/Cargo.toml b/nexus-client/Cargo.toml index bbefbe8693c..858f8b58278 100644 --- a/nexus-client/Cargo.toml +++ b/nexus-client/Cargo.toml @@ -6,7 +6,7 @@ license = "MPL-2.0" [dependencies] progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } serde_json = "1.0" [dependencies.chrono] diff --git a/openapi/nexus-internal.json b/openapi/nexus-internal.json index dd9acd71c51..4cfadbdfc74 100644 --- a/openapi/nexus-internal.json +++ b/openapi/nexus-internal.json @@ -46,7 +46,12 @@ ], "responses": { "default": { - "description": "" + "description": "", + "content": { + "*/*": { + "schema": {} + } + } } } } diff --git a/openapi/nexus.json b/openapi/nexus.json index 7f792a37277..d7a05bc22d1 100644 --- a/openapi/nexus.json +++ b/openapi/nexus.json @@ -228,7 +228,12 @@ }, "responses": { "default": { - "description": "" + "description": "", + "content": { + "*/*": { + "schema": {} + } + } } } } @@ -241,7 +246,12 @@ "operationId": "logout", "responses": { "default": { - "description": "" + "description": "", + "content": { + "*/*": { + "schema": {} + } + } } } } diff --git a/oximeter-client/Cargo.toml b/oximeter-client/Cargo.toml index 23dda4a4db8..d41f84ed79d 100644 --- a/oximeter-client/Cargo.toml +++ b/oximeter-client/Cargo.toml @@ -6,7 +6,7 @@ license = "MPL-2.0" [dependencies] progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } [dependencies.chrono] version = "0.4" diff --git a/sled-agent-client/Cargo.toml b/sled-agent-client/Cargo.toml index d2730c9a5b4..d70b2f6d606 100644 --- a/sled-agent-client/Cargo.toml +++ b/sled-agent-client/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" [dependencies] async-trait = "0.1" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } [dependencies.chrono] version = "0.4" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index f7ca192ad6e..fd8582939fb 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -23,7 +23,7 @@ percent-encoding = "2.1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "0e3798510ae190131f63b9df767ec01b2beacf91" } rand = { version = "0.8.5", features = ["getrandom"] } -reqwest = "0.11.8" +reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } schemars = { version = "0.8", features = [ "chrono", "uuid" ] } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" From 296e63f7e7f55a976a0193549f7ad102982bdd5b Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Wed, 16 Mar 2022 13:53:20 -0700 Subject: [PATCH 3/3] update typify --- Cargo.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ceedeb1884e..c8e0c0bf50d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3118,7 +3118,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" +source = "git+https://github.com/oxidecomputer/progenitor#b7bbb5cdffdfc4ddf5bc7c1a45d34760130e48a0" dependencies = [ "anyhow", "getopts", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" +source = "git+https://github.com/oxidecomputer/progenitor#b7bbb5cdffdfc4ddf5bc7c1a45d34760130e48a0" dependencies = [ "bytes", "futures-core", @@ -3146,7 +3146,7 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" +source = "git+https://github.com/oxidecomputer/progenitor#b7bbb5cdffdfc4ddf5bc7c1a45d34760130e48a0" dependencies = [ "convert_case 0.4.0", "getopts", @@ -3168,7 +3168,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#ea80069ef3c87cd1eaaf9e67bfeed6d091f30e76" +source = "git+https://github.com/oxidecomputer/progenitor#b7bbb5cdffdfc4ddf5bc7c1a45d34760130e48a0" dependencies = [ "openapiv3", "proc-macro2", @@ -4764,7 +4764,7 @@ checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "typify" version = "0.0.6-dev" -source = "git+https://github.com/oxidecomputer/typify#8316b7d227eeec59d854279e947b1882ae2c635a" +source = "git+https://github.com/oxidecomputer/typify#6617df9800c81954ef2aa630f117f66e824f104d" dependencies = [ "typify-impl", "typify-macro", @@ -4773,7 +4773,7 @@ dependencies = [ [[package]] name = "typify-impl" version = "0.0.6-dev" -source = "git+https://github.com/oxidecomputer/typify#8316b7d227eeec59d854279e947b1882ae2c635a" +source = "git+https://github.com/oxidecomputer/typify#6617df9800c81954ef2aa630f117f66e824f104d" dependencies = [ "convert_case 0.4.0", "log", @@ -4790,7 +4790,7 @@ dependencies = [ [[package]] name = "typify-macro" version = "0.0.6-dev" -source = "git+https://github.com/oxidecomputer/typify#8316b7d227eeec59d854279e947b1882ae2c635a" +source = "git+https://github.com/oxidecomputer/typify#6617df9800c81954ef2aa630f117f66e824f104d" dependencies = [ "proc-macro2", "quote",