Merge branch 'main' into add-router-api

Author: zephraph

Cargo.lock

@@ -2,6 +2,7 @@
 members = [
     "common",
     "nexus",
+    "nexus/src/db/db-macros",
     "rpaths",
     "sled-agent",
     "oximeter/oximeter",
@@ -15,6 +16,7 @@ members = [
 default-members = [
     "common",
     "nexus",
+    "nexus/src/db/db-macros",
     "rpaths",
     "sled-agent",
     "oximeter/oximeter",

Cargo.toml

@@ -83,7 +83,7 @@ See the note about setting RUSTDOCFLAGS at build time below.
 After doing this, you should have the `pkg-config` command on your PATH.  For
 example, on Helios, you'd want `/usr/bin` on your PATH.
 --
-. CockroachDB v20.2.5.
+. CockroachDB v21.1.10.
 +
 The test suite expects to be able to start a single-node CockroachDB cluster using the `cockroach` executable on your PATH.
 On illumos, MacOS, and Linux, you should be able to use the `tools/ci_download_cockroachdb` script to fetch the official CockroachDB binary.  It will be put into `./cockroachdb/bin/cockroach`.

README.adoc

@@ -3,21 +3,14 @@ name = "omicron-common"
 version = "0.1.0"
 edition = "2018"
 
-[build-dependencies.omicron-rpaths]
-path = "../rpaths"
-
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1.51"
-# Tracking pending 2.0 version.
-diesel = { git = "https://github.com/diesel-rs/diesel", rev = "a39dd2e", features = ["postgres", "r2d2", "chrono", "uuid"] }
 futures = "0.3.15"
 http = "0.2.5"
 hyper = "0.14"
 ipnetwork = "0.18"
 propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "bc0661e" }
-# See omicron-rpaths for more about the "pq-sys" dependency.
-pq-sys = "*"
 rayon = "1.5"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
 ring = "0.16"