Merge remote-tracking branch 'origin/main' into john/remove-omicron-z…

…one-config-ip
oxidecomputer · Oct 17, 2024 · 6c51121 · 6c51121
2 parents e20aab3 + 8d899ca
commit 6c51121
Show file tree

Hide file tree

Showing 55 changed files with 2,059 additions and 783 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -312,6 +312,7 @@ cargo_metadata = "0.18.1"
 chacha20poly1305 = "0.10.1"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
+chrono-tz = "0.10.0"
 ciborium = "0.2.2"
 clap = { version = "4.5", features = ["cargo", "derive", "env", "wrap_help"] }
 clickhouse-admin-api = { path = "clickhouse-admin/api" }
@@ -343,7 +344,7 @@ derive_more = "0.99.18"
 derive-where = "1.2.7"
 # Having the i-implement-... feature here makes diesel go away from the workspace-hack
 diesel = { version = "2.2.4", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
-diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", branch = "main" }
+diesel-dtrace = "0.3.0"
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
@@ -398,6 +399,7 @@ hyper-util = "0.1.9"
 hyper-rustls = "0.26.0"
 hyper-staticfile = "0.10.0"
 illumos-utils = { path = "illumos-utils" }
+iana-time-zone = "0.1.61"
 indent_write = "2.2.0"
 indexmap = "2.6.0"
 indicatif = { version = "0.17.8", features = ["rayon"] }
@@ -518,7 +520,7 @@ propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev =
 propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
 propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
 proptest = "1.5.0"
-qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" }
+qorb = "0.0.2"
 quote = "1.0"
 rand = "0.8.5"
 rand_core = "0.6.4"
@@ -611,7 +613,7 @@ tokio-util = { version = "0.7.12", features = ["io", "io-util"] }
 toml = "0.8.19"
 toml_edit = "0.22.22"
 tough = { version = "0.17.1", features = [ "http" ] }
-trybuild = "1.0.99"
+trybuild = "1.0.100"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }
 tui-tree-widget = "0.22.0"

diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
@@ -727,8 +727,15 @@ impl From<ByteCount> for i64 {
 
 /// Generation numbers stored in the database, used for optimistic concurrency
 /// control
-// Because generation numbers are stored in the database, we represent them as
-// i64.
+//
+// A generation is a value between 0 and 2**63-1, i.e. equivalent to a u63.
+// The reason is that we store it as an i64 in the database, and we want to
+// disallow negative values. (We could potentially use two's complement to
+// store values greater than that as negative values, but surely 2**63 is
+// enough.)
+//
+// TODO: This allows deserialization into a value that's out of range. That's
+// not correct. See <https://github.com/oxidecomputer/omicron/issues/6865>.
 #[derive(
     Copy,
     Clone,

diff --git a/dev-tools/openapi-manager/src/spec.rs b/dev-tools/openapi-manager/src/spec.rs
@@ -93,7 +93,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
         },
         ApiSpec {
             title: "Oxide Region API",
-            version: "20241009.0",
+            version: "20241204.0",
             description: "API for interacting with the Oxide control plane",
             boundary: ApiBoundary::External,
             api_description:

diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs
@@ -1392,15 +1392,15 @@ fn cmd_load_example(
     sim.internal_dns.insert(
         blueprint.internal_dns_version,
         DnsConfigParams {
-            generation: blueprint.internal_dns_version.into(),
+            generation: blueprint.internal_dns_version,
             time_created: Utc::now(),
             zones: vec![internal_dns],
         },
     );
     sim.external_dns.insert(
         blueprint.external_dns_version,
         DnsConfigParams {
-            generation: blueprint.external_dns_version.into(),
+            generation: blueprint.external_dns_version,
             time_created: Utc::now(),
             zones: vec![external_dns],
         },

diff --git a/dev-tools/releng/src/main.rs b/dev-tools/releng/src/main.rs
@@ -41,7 +41,7 @@ use crate::job::Jobs;
 /// to as "v8", "version 8", or "release 8" to customers). The use of semantic
 /// versioning is mostly to hedge for perhaps wanting something more granular in
 /// the future.
-const BASE_VERSION: Version = Version::new(11, 0, 0);
+const BASE_VERSION: Version = Version::new(12, 0, 0);
 
 const RETRY_ATTEMPTS: usize = 3;
 

diff --git a/dns-server/Cargo.toml b/dns-server/Cargo.toml
@@ -21,6 +21,7 @@ hickory-resolver.workspace = true
 hickory-server.workspace = true
 http.workspace = true
 internal-dns-types.workspace = true
+omicron-common.workspace = true
 pretty-hex.workspace = true
 schemars.workspace = true
 serde.workspace = true

diff --git a/dns-server/src/bin/dnsadm.rs b/dns-server/src/bin/dnsadm.rs
@@ -220,7 +220,7 @@ async fn main() -> Result<()> {
                 .collect();
 
             let new_config = DnsConfigParams {
-                generation: old_config.generation + 1,
+                generation: old_config.generation.next(),
                 time_created: chrono::Utc::now(),
                 zones,
             };
@@ -275,7 +275,7 @@ fn add_record(
     our_kv.1.push(record);
 
     Ok(DnsConfigParams {
-        generation: generation + 1,
+        generation: generation.next(),
         time_created: chrono::Utc::now(),
         zones: other_zones
             .into_iter()