From f7f62fc17b3ae4a421965f140c2b2952dc3119a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 22:51:34 +0000 Subject: [PATCH 1/2] Bump bb8 from 0.7.1 to 0.8.0 Bumps [bb8](https://github.com/djc/bb8) from 0.7.1 to 0.8.0. - [Release notes](https://github.com/djc/bb8/releases) - [Commits](https://github.com/djc/bb8/commits) --- updated-dependencies: - dependency-name: bb8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 33 +++++++++++++++++++++++---------- nexus/Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c405035e4d5..54a7ba32b2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,7 +115,7 @@ version = "0.1.0" source = "git+https://github.com/oxidecomputer/async-bb8-diesel?rev=c849b717be#c849b717be1e33528c7c3950fefcb431a65ef469" dependencies = [ "async-trait", - "bb8", + "bb8 0.7.1", "diesel", "thiserror", "tokio", @@ -203,6 +203,19 @@ dependencies = [ "tokio", ] +[[package]] +name = "bb8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1627eccf3aa91405435ba240be23513eeca466b5dc33866422672264de061582" +dependencies = [ + "async-trait", + "futures-channel", + "futures-util", + "parking_lot 0.12.0", + "tokio", +] + [[package]] name = "bincode" version = "1.3.3" @@ -2406,7 +2419,7 @@ dependencies = [ "async-bb8-diesel", "async-trait", "base64", - "bb8", + "bb8 0.8.0", "chrono", "cookie", "criterion", @@ -3251,7 +3264,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#75348207d7405db3371a98b5348bef3fbd0ef79e" +source = "git+https://github.com/oxidecomputer/progenitor#bbf81dfe7d107302241f9eb37c74556ffb2854ac" dependencies = [ "anyhow", "getopts", @@ -3266,7 +3279,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#75348207d7405db3371a98b5348bef3fbd0ef79e" +source = "git+https://github.com/oxidecomputer/progenitor#bbf81dfe7d107302241f9eb37c74556ffb2854ac" dependencies = [ "bytes", "futures-core", @@ -3279,7 +3292,7 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#75348207d7405db3371a98b5348bef3fbd0ef79e" +source = "git+https://github.com/oxidecomputer/progenitor#bbf81dfe7d107302241f9eb37c74556ffb2854ac" dependencies = [ "convert_case 0.4.0", "getopts", @@ -3301,7 +3314,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/progenitor#75348207d7405db3371a98b5348bef3fbd0ef79e" +source = "git+https://github.com/oxidecomputer/progenitor#bbf81dfe7d107302241f9eb37c74556ffb2854ac" dependencies = [ "openapiv3", "proc-macro2", @@ -4911,9 +4924,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e737a252a617bd4774649e245dbf705e207275db0893b9fa824d49f074fc1c" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if", "futures-util", @@ -4931,9 +4944,9 @@ dependencies = [ [[package]] name = "trust-dns-server" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4058838790565ba870cb800008c7b3b8a3f154afaece824ad9a91a80a4b81dfb" +checksum = "a395a2e0fd8aac9b4613767a5b4ba4b2040de1b767fa03ace8c9d6f351d60b2d" dependencies = [ "async-trait", "bytes", diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index ed70e6225d8..f9476a582ac 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0" async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" } async-trait = "0.1.53" base64 = "0.13.0" -bb8 = "0.7.1" +bb8 = "0.8.0" cookie = "0.16" crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" } # Tracking pending 2.0 version. From 87976f882f36b4b355fc89fc2c066bc44b1ab8b6 Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Wed, 6 Apr 2022 12:15:56 -0400 Subject: [PATCH 2/2] Also update async-bb8-diesel to bb8 0.8 --- Cargo.lock | 19 +++---------------- nexus/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0972727b5ef..0552ea2f4a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,10 +112,10 @@ dependencies = [ [[package]] name = "async-bb8-diesel" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/async-bb8-diesel?rev=c849b717be#c849b717be1e33528c7c3950fefcb431a65ef469" +source = "git+https://github.com/oxidecomputer/async-bb8-diesel?rev=8c6685f0b33c7bbc6418384850cb9c897896cda5#8c6685f0b33c7bbc6418384850cb9c897896cda5" dependencies = [ "async-trait", - "bb8 0.7.1", + "bb8", "diesel", "thiserror", "tokio", @@ -190,19 +190,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "bb8" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9f4fa9768efd269499d8fba693260cfc670891cf6de3adc935588447a77cc8" -dependencies = [ - "async-trait", - "futures-channel", - "futures-util", - "parking_lot 0.11.2", - "tokio", -] - [[package]] name = "bb8" version = "0.8.0" @@ -2419,7 +2406,7 @@ dependencies = [ "async-bb8-diesel", "async-trait", "base64", - "bb8 0.8.0", + "bb8", "chrono", "cookie", "criterion", diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index f9476a582ac..8a2be4ec55e 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -9,7 +9,7 @@ path = "../rpaths" [dependencies] anyhow = "1.0" -async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" } +async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "8c6685f0b33c7bbc6418384850cb9c897896cda5" } async-trait = "0.1.53" base64 = "0.13.0" bb8 = "0.8.0"