From 24d93a8b058ff1eec93b6ac1da4e4daf9304907d Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Fri, 26 Jul 2024 12:52:59 -0700
Subject: [PATCH] Fix mismerge

---
 common/src/api/internal/shared.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/src/api/internal/shared.rs b/common/src/api/internal/shared.rs
index 149d6020f5..99a8037393 100644
--- a/common/src/api/internal/shared.rs
+++ b/common/src/api/internal/shared.rs
@@ -718,7 +718,8 @@ pub struct ResolvedVpcRouteSet {
 )]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum DatasetKind {
-    CockroachDb,
+    #[serde(rename = "cockroach_db")]
+    Cockroach,
     Crucible,
     Clickhouse,
     ClickhouseKeeper,
@@ -744,7 +745,7 @@ impl fmt::Display for DatasetKind {
         use DatasetKind::*;
         let s = match self {
             Crucible => "crucible",
-            CockroachDb => "cockroach_db",
+            Cockroach => "cockroach_db",
             Clickhouse => "clickhouse",
             ClickhouseKeeper => "clickhouse_keeper",
             ExternalDns => "external_dns",
@@ -767,7 +768,7 @@ impl FromStr for DatasetKind {
         use DatasetKind::*;
         let kind = match s {
             "crucible" => Crucible,
-            "cockroach" | "cockroachdb" | "cockroach_db" => CockroachDb,
+            "cockroach" | "cockroachdb" | "cockroach_db" => Cockroach,
             "clickhouse" => Clickhouse,
             "clickhouse_keeper" => ClickhouseKeeper,
             "external_dns" => ExternalDns,