Clean up

oxidecomputer · Aug 14, 2024 · f2ba87e · f2ba87e
1 parent a487b63
commit f2ba87e
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,9 +5,7 @@ members = [
     "certificates",
     "clickhouse-admin",
     "clickhouse-admin/api",
-    "clickhouse-admin/types",
     "clients/bootstrap-agent-client",
-    "clients/clickhouse-admin-client",
     "clients/cockroach-admin-client",
     "clients/ddm-admin-client",
     "clients/dns-service-client",
@@ -117,9 +115,7 @@ default-members = [
     "certificates",
     "clickhouse-admin",
     "clickhouse-admin/api",
-    "clickhouse-admin/types",
     "clients/bootstrap-agent-client",
-    "clients/clickhouse-admin-client",
     "clients/cockroach-admin-client",
     "clients/ddm-admin-client",
     "clients/dns-service-client",
@@ -301,8 +297,6 @@ chrono = { version = "0.4", features = [ "serde" ] }
 ciborium = "0.2.2"
 clap = { version = "4.5", features = ["cargo", "derive", "env", "wrap_help"] }
 clickhouse-admin-api = { path = "clickhouse-admin/api" }
-clickhouse-admin-client = { path = "clients/clickhouse-admin-client" }
-clickhouse-admin-types = { path = "clickhouse-admin/types" }
 clickward = { git = "https://github.com/oxidecomputer/clickward", rev = "ceec762e6a87d2a22bf56792a3025e145caa095e" }
 cockroach-admin-api = { path = "cockroach-admin/api" }
 cockroach-admin-client = { path = "clients/cockroach-admin-client" }

diff --git a/clickhouse-admin/Cargo.toml b/clickhouse-admin/Cargo.toml
@@ -10,7 +10,6 @@ camino.workspace = true
 chrono.workspace = true
 clap.workspace = true
 clickhouse-admin-api.workspace = true
-clickhouse-admin-types.workspace = true
 dropshot.workspace = true
 http.workspace = true
 illumos-utils.workspace = true
@@ -36,10 +35,8 @@ nexus-test-utils.workspace = true
 omicron-test-utils.workspace = true
 openapi-lint.workspace = true
 openapiv3.workspace = true
-proptest.workspace = true
 serde_json.workspace = true
 subprocess.workspace = true
-test-strategy.workspace = true
 url.workspace = true
 
 [lints]

diff --git a/clickhouse-admin/api/Cargo.toml b/clickhouse-admin/api/Cargo.toml
@@ -8,7 +8,6 @@ license = "MPL-2.0"
 workspace = true
 
 [dependencies]
-clickhouse-admin-types.workspace = true
 dropshot.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true

diff --git a/clickhouse-admin/dummy-config.toml b/clickhouse-admin/dummy-config.toml
diff --git a/clickhouse-admin/src/bin/clickhouse-admin.rs b/clickhouse-admin/src/bin/clickhouse-admin.rs
@@ -34,9 +34,6 @@ enum Args {
     },
 }
 
-// TODO: Remove this comment and move config file to smf/clickhouse-admin
-// Test with cargo run --bin=clickhouse-admin -- run -a [fd00:1122:3344:101::e]:8888 -H [::1]:8888 -c ./clickhouse-admin/dummy-config.toml
-
 #[tokio::main]
 async fn main() {
     if let Err(err) = main_impl().await {
@@ -53,9 +50,6 @@ async fn main_impl() -> Result<(), CmdError> {
                 .map_err(|err| CmdError::Failure(anyhow!(err)))?;
             config.dropshot.bind_address = SocketAddr::V6(http_address);
 
-            // TODO: Change for the actual clickhouse address
-           // let dummy_address =
-           //     SocketAddrV6::new(Ipv6Addr::LOCALHOST, 8080, 0, 0);
             let clickward = Clickward::new(clickhouse_address);
 
             let server =

diff --git a/clickhouse-admin/src/clickward.rs b/clickhouse-admin/src/clickward.rs
@@ -43,7 +43,9 @@ impl Clickward {
         Self { clickhouse_address }
     }
 
-    pub fn clickhouse_address(&self) -> Result<ClickhouseAddress, ClickwardError> {
+    pub fn clickhouse_address(
+        &self,
+    ) -> Result<ClickhouseAddress, ClickwardError> {
         Ok(ClickhouseAddress { clickhouse_address: self.clickhouse_address })
     }
 }
diff --git a/clickhouse-admin/types/Cargo.toml b/clickhouse-admin/types/Cargo.toml
diff --git a/clickhouse-admin/types/src/lib.rs b/clickhouse-admin/types/src/lib.rs
diff --git a/clients/clickhouse-admin-client/Cargo.toml b/clients/clickhouse-admin-client/Cargo.toml
diff --git a/clients/clickhouse-admin-client/src/lib.rs b/clients/clickhouse-admin-client/src/lib.rs
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
@@ -1573,17 +1573,15 @@ impl ServiceManager {
                             .add_property_group(config),
                     );
 
-                    let ch_address = SocketAddr::new(
-                        IpAddr::V6(listen_addr),
-                        CLICKHOUSE_PORT,
-                    )
-                    .to_string();
+                let ch_address =
+                    SocketAddr::new(IpAddr::V6(listen_addr), CLICKHOUSE_PORT)
+                        .to_string();
 
-                    let admin_address = SocketAddr::new(
-                        IpAddr::V6(listen_addr),
-                        CLICKHOUSE_ADMIN_PORT,
-                    )
-                    .to_string();
+                let admin_address = SocketAddr::new(
+                    IpAddr::V6(listen_addr),
+                    CLICKHOUSE_ADMIN_PORT,
+                )
+                .to_string();
 
                 let clickhouse_admin_config =
                     PropertyGroupBuilder::new("config")
@@ -1654,18 +1652,16 @@ impl ServiceManager {
                                 .add_property_group(config),
                         );
 
-                        let ch_address = SocketAddr::new(
-                            IpAddr::V6(listen_addr),
-                            CLICKHOUSE_PORT,
-                        )
-                        .to_string();
-
-                        let admin_address = SocketAddr::new(
-                            IpAddr::V6(listen_addr),
-                            CLICKHOUSE_ADMIN_PORT,
-                        )
+                let ch_address =
+                    SocketAddr::new(IpAddr::V6(listen_addr), CLICKHOUSE_PORT)
                         .to_string();
 
+                let admin_address = SocketAddr::new(
+                    IpAddr::V6(listen_addr),
+                    CLICKHOUSE_ADMIN_PORT,
+                )
+                .to_string();
+
                 let clickhouse_admin_config =
                     PropertyGroupBuilder::new("config")
                         .add_property(