From f547f8a24cebf0e0ca14c183e30f42bd158c7dd8 Mon Sep 17 00:00:00 2001
From: Levon Tarver <levon@oxide.computer>
Date: Wed, 15 Nov 2023 21:10:29 +0000
Subject: [PATCH] bump dendrite version

---
 nexus/db-queries/src/db/datastore/ipv4_nat_entry.rs | 10 ++++------
 package-manifest.toml                               | 12 ++++++------
 tools/dendrite_openapi_version                      |  4 ++--
 tools/dendrite_stub_checksums                       |  6 +++---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/nexus/db-queries/src/db/datastore/ipv4_nat_entry.rs b/nexus/db-queries/src/db/datastore/ipv4_nat_entry.rs
index ffaef11bde..274937b299 100644
--- a/nexus/db-queries/src/db/datastore/ipv4_nat_entry.rs
+++ b/nexus/db-queries/src/db/datastore/ipv4_nat_entry.rs
@@ -10,7 +10,6 @@ use diesel::prelude::*;
 use diesel::sql_types::BigInt;
 use nexus_db_model::ExternalIp;
 use nexus_db_model::Ipv4NatEntryView;
-use nexus_db_model::SqlU32;
 use omicron_common::api::external::CreateResult;
 use omicron_common::api::external::DeleteResult;
 use omicron_common::api::external::Error;
@@ -230,17 +229,17 @@ impl DataStore {
     pub async fn ipv4_nat_current_version(
         &self,
         opctx: &OpContext,
-    ) -> LookupResult<u32> {
+    ) -> LookupResult<i64> {
         use db::schema::ipv4_nat_version::dsl;
 
-        let latest: Option<SqlU32> = dsl::ipv4_nat_version
+        let latest: Option<i64> = dsl::ipv4_nat_version
             .select(diesel::dsl::max(dsl::last_value))
             .first_async(&*self.pool_connection_authorized(opctx).await?)
             .await
             .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
 
         match latest {
-            Some(value) => Ok(*value),
+            Some(value) => Ok(value),
             None => Err(Error::InvalidRequest {
                 message: "sequence table is empty!".to_string(),
             }),
@@ -250,11 +249,10 @@ impl DataStore {
     pub async fn ipv4_nat_cleanup(
         &self,
         opctx: &OpContext,
-        before_version: u32,
+        version: i64,
         before_timestamp: DateTime<Utc>,
     ) -> DeleteResult {
         use db::schema::ipv4_nat_entry::dsl;
-        let version: SqlU32 = before_version.into();
 
         diesel::delete(dsl::ipv4_nat_entry)
             .filter(dsl::version_removed.lt(version))
diff --git a/package-manifest.toml b/package-manifest.toml
index 5154352eb7..a1ffe91d6b 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -473,8 +473,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "dca70edb86d5418412b50e300231cf988d0dfba3"
-source.sha256 = "35cd5bac2fd3b874bd8fcbbd35d96e024f4e1b656de050ca7a0a698c83e781e1"
+source.commit = "f5d445c270a54245765c8eb06e32516f65483a8a"
+source.sha256 = "f4760f99d1eaa0c4bfd39f0dcccefd0d9d1ddd1d2f7bb893ea457fc76a0dbfb8"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -498,8 +498,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "dca70edb86d5418412b50e300231cf988d0dfba3"
-source.sha256 = "330df22119b479c7a17961eae409362716881b2235d429998dce32dd45377bd9"
+source.commit = "f5d445c270a54245765c8eb06e32516f65483a8a"
+source.sha256 = "2c0251abaa51038023f11e51b20c282dde2f92cd156da4c23fe5854bd4f6bc2a"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -516,8 +516,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "dca70edb86d5418412b50e300231cf988d0dfba3"
-source.sha256 = "d408c6f6ab71927fa3f8b911da2cd08dcfdd35e80ae1de2d0de39118c9ca8d63"
+source.commit = "f5d445c270a54245765c8eb06e32516f65483a8a"
+source.sha256 = "01d8c2f5031561223d5e1b5bd439615c283a3b004cadbc767a3a74cfba424d34"
 output.type = "zone"
 output.intermediate_only = true
 
diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version
index b4bfc2b035..2e9fb0c34f 100644
--- a/tools/dendrite_openapi_version
+++ b/tools/dendrite_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="dca70edb86d5418412b50e300231cf988d0dfba3"
-SHA2="d9117433e5b656b91eb6f6c1865467be7918f9650cbc5e0c86fa5569e3f59846"
+COMMIT="f5d445c270a54245765c8eb06e32516f65483a8a"
+SHA2="07d115bfa8498a8015ca2a8447efeeac32e24aeb25baf3d5e2313216e11293c0"
diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums
index 3a50a48f3a..e657ca8003 100644
--- a/tools/dendrite_stub_checksums
+++ b/tools/dendrite_stub_checksums
@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="35cd5bac2fd3b874bd8fcbbd35d96e024f4e1b656de050ca7a0a698c83e781e1"
-CIDL_SHA256_LINUX_DPD="25612bfbe18038920053dceb3d07cebb696ef3933c487e2fbc2f081f47a81386"
-CIDL_SHA256_LINUX_SWADM="4ab60b312114637cb9c57cf2c875b02edcc7b8c7eaa9df02cfcdedaee5caa9bf"
+CIDL_SHA256_ILLUMOS="f4760f99d1eaa0c4bfd39f0dcccefd0d9d1ddd1d2f7bb893ea457fc76a0dbfb8"
+CIDL_SHA256_LINUX_DPD="363c5b44dee3dd18fe7cad6c2d9bb46bbca5f295e5d9c1e8cd04456abb1cc2bd"
+CIDL_SHA256_LINUX_SWADM="327c13e497b4a929ef0cfe95ec96d89ff4ab5609841ae55c34778f9becbdf711"