From 345d26d30c03697b6e8d98e5aff81920845bb102 Mon Sep 17 00:00:00 2001
From: NathanFlurry <git@nathanflurry.com>
Date: Fri, 31 May 2024 21:58:06 +0000
Subject: [PATCH] chore: move bolt cluster subcommand to root (#803)

<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

<!-- If there are frontend changes, please include screenshots. -->
---
 lib/bolt/cli/src/commands/{admin/mod.rs => admin.rs}      | 8 --------
 .../cli/src/commands/{admin => }/cluster/datacenter.rs    | 0
 lib/bolt/cli/src/commands/{admin => }/cluster/mod.rs      | 0
 lib/bolt/cli/src/commands/mod.rs                          | 1 +
 lib/bolt/cli/src/main.rs                                  | 6 ++++++
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename lib/bolt/cli/src/commands/{admin/mod.rs => admin.rs} (80%)
 rename lib/bolt/cli/src/commands/{admin => }/cluster/datacenter.rs (100%)
 rename lib/bolt/cli/src/commands/{admin => }/cluster/mod.rs (100%)

diff --git a/lib/bolt/cli/src/commands/admin/mod.rs b/lib/bolt/cli/src/commands/admin.rs
similarity index 80%
rename from lib/bolt/cli/src/commands/admin/mod.rs
rename to lib/bolt/cli/src/commands/admin.rs
index 2adcae99e3..172077b5f9 100644
--- a/lib/bolt/cli/src/commands/admin/mod.rs
+++ b/lib/bolt/cli/src/commands/admin.rs
@@ -6,8 +6,6 @@ use bolt_core::{
 };
 use clap::Parser;
 
-mod cluster;
-
 #[derive(Parser)]
 pub enum SubCommand {
 	/// Generates a login link for the given access token. Automatically turns the existing user into an
@@ -16,11 +14,6 @@ pub enum SubCommand {
 		#[clap(default_value = "root")]
 		name: String,
 	},
-	/// Cluster related operations
-	Cluster {
-		#[clap(subcommand)]
-		command: cluster::SubCommand,
-	},
 }
 
 impl SubCommand {
@@ -38,7 +31,6 @@ impl SubCommand {
 
 				Ok(())
 			}
-			Self::Cluster { command } => command.execute(ctx).await,
 		}
 	}
 }
diff --git a/lib/bolt/cli/src/commands/admin/cluster/datacenter.rs b/lib/bolt/cli/src/commands/cluster/datacenter.rs
similarity index 100%
rename from lib/bolt/cli/src/commands/admin/cluster/datacenter.rs
rename to lib/bolt/cli/src/commands/cluster/datacenter.rs
diff --git a/lib/bolt/cli/src/commands/admin/cluster/mod.rs b/lib/bolt/cli/src/commands/cluster/mod.rs
similarity index 100%
rename from lib/bolt/cli/src/commands/admin/cluster/mod.rs
rename to lib/bolt/cli/src/commands/cluster/mod.rs
diff --git a/lib/bolt/cli/src/commands/mod.rs b/lib/bolt/cli/src/commands/mod.rs
index f9489ca4ed..a7e6587f9a 100644
--- a/lib/bolt/cli/src/commands/mod.rs
+++ b/lib/bolt/cli/src/commands/mod.rs
@@ -1,5 +1,6 @@
 pub mod admin;
 pub mod check;
+pub mod cluster;
 pub mod config;
 pub mod create;
 pub mod db;
diff --git a/lib/bolt/cli/src/main.rs b/lib/bolt/cli/src/main.rs
index f01ab50ab8..fd50d017a0 100644
--- a/lib/bolt/cli/src/main.rs
+++ b/lib/bolt/cli/src/main.rs
@@ -73,6 +73,11 @@ enum SubCommand {
 		#[clap(subcommand)]
 		command: db::SubCommand,
 	},
+	/// Cluster related operations
+	Cluster {
+		#[clap(subcommand)]
+		command: cluster::SubCommand,
+	},
 	/// Provides admin functionality.
 	Admin {
 		#[clap(subcommand)]
@@ -127,6 +132,7 @@ async fn main_inner() -> Result<std::process::ExitCode> {
 		SubCommand::Terraform { command } => command.execute(ctx).await?,
 		SubCommand::Ssh { command } => command.execute(ctx).await?,
 		SubCommand::Database { command } => command.execute(ctx).await?,
+		SubCommand::Cluster { command } => command.execute(ctx).await?,
 		SubCommand::Admin { command } => command.execute(ctx).await?,
 	}