chore: reorg package in prep for toolchain

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
-    "core",
-    "cli", "toolchain",
+    "rivet-toolchain-core",
+    "rivet-cli",
 ]
 
 # Config for 'cargo dist'

cli/Cargo.toml → rivet-cli/Cargo.toml

@@ -19,8 +19,7 @@ async-posthog = { git = "https://github.com/rivet-gg/posthog-rs.git", rev = "ef4
 async-stream = "0.3.3"
 chrono = "0.4.21"
 clap = { version = "3.2.16", features = ["derive", "env"] }
-cli-core = { path = "../core", package = "rivet-cli-core" }
-cli-toolchain = { path = "../core", package = "rivet-toolchain" }
+toolchain-core = { path = "../rivet-toolchain-core", package = "rivet-toolchain-core" }
 config = { git = "https://github.com/AngelOnFira/config-rs", rev = "04e61354912543e23e70b6851a3f4b03ce69471c", default-features = false, features = ["yaml", "toml", "json"] }
 console = "0.15"
 ctrlc = { version = "3.2", features = ["termination"] }

cli/src/commands/avatar.rs → rivet-cli/src/commands/avatar.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::apis;
+use toolchain_core::rivet_api::apis;
 use global_error::prelude::*;
 use tabled::Tabled;
 
@@ -12,7 +12,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::List => {
 				let custom_avatars_res = unwrap!(

cli/src/commands/backend/database.rs → rivet-cli/src/commands/backend/database.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use clap::Parser;
-use cli_core::rivet_api::apis;
+use toolchain_core::rivet_api::apis;
 use global_error::prelude::*;
 use uuid::Uuid;
 
@@ -64,7 +64,7 @@ pub struct Opts {
 }
 
 pub async fn provision_database(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	project_id: Uuid,
 	env_id: Uuid,
 ) -> GlobalResult<()> {

cli/src/commands/backend/deploy.rs → rivet-cli/src/commands/backend/deploy.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use futures_util::{StreamExt, TryStreamExt};
 use global_error::prelude::*;
 use serde::Deserialize;
@@ -28,7 +28,7 @@ pub struct Opts {
 }
 
 impl Opts {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		let project = get_or_create_project(ctx).await?;
 		let project_id_str = project.project_id.to_string();
 

cli/src/commands/backend/environment/create.rs → rivet-cli/src/commands/backend/environment/create.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use global_error::prelude::*;
 
 #[derive(Parser)]
@@ -16,7 +16,7 @@ pub struct Opts {
 }
 
 impl Opts {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		let project_res = apis::ee_cloud_games_projects_api::ee_cloud_games_projects_get(
 			&ctx.openapi_config_cloud,
 			&ctx.game_id,

cli/src/commands/backend/environment/mod.rs → rivet-cli/src/commands/backend/environment/mod.rs

@@ -9,7 +9,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::Create(opts) => opts.execute(ctx).await,
 		}

cli/src/commands/backend/mod.rs → rivet-cli/src/commands/backend/mod.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, io::Write, path::PathBuf, str::FromStr};
 
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use global_error::prelude::*;
 use tempfile::NamedTempFile;
 use tokio::process::Command;
@@ -31,7 +31,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::Deploy(opts) => opts.execute(&ctx).await,
 			SubCommand::Environment { command } => command.execute(&ctx).await,
@@ -43,7 +43,7 @@ impl SubCommand {
 * Gets or auto-creates a backend project for the game.
 */
 pub async fn get_or_create_project(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 ) -> GlobalResult<Box<models::EeBackendProject>> {
 	let project_res = apis::ee_cloud_games_projects_api::ee_cloud_games_projects_get(
 		&ctx.openapi_config_cloud,
@@ -61,7 +61,7 @@ pub async fn get_or_create_project(
 }
 
 pub async fn passthrough(
-	ctx: Option<&cli_core::Ctx>,
+	ctx: Option<&toolchain_core::Ctx>,
 	db_command: Option<database::PassthroughSubCommand>,
 ) -> GlobalResult<()> {
 	let mut opengb_env = HashMap::new();

cli/src/commands/cdn.rs → rivet-cli/src/commands/cdn.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use futures_util::{StreamExt, TryStreamExt};
 use global_error::prelude::*;
 use serde::Serialize;
@@ -33,7 +33,7 @@ pub struct PushOpts {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::Push(push_opts) => {
 				let output = push(ctx, push_opts).await?;
@@ -54,7 +54,7 @@ pub struct PushOutput {
 	pub site_id: Uuid,
 }
 
-pub async fn push(ctx: &cli_core::Ctx, push_opts: &PushOpts) -> GlobalResult<PushOutput> {
+pub async fn push(ctx: &toolchain_core::Ctx, push_opts: &PushOpts) -> GlobalResult<PushOutput> {
 	let reqwest_client = Arc::new(reqwest::Client::new());
 
 	let upload_path = env::current_dir()?.join(&push_opts.path);
@@ -205,7 +205,7 @@ pub struct BuildPushOpts {
 }
 
 pub async fn build_and_push(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	push_opts: &BuildPushOpts,
 ) -> GlobalResult<PushOutput> {
 	eprintln!();

cli/src/commands/ci.rs → rivet-cli/src/commands/ci.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::models;
+use toolchain_core::rivet_api::models;
 use global_error::prelude::*;
 use std::collections::HashMap;
 use tokio::fs;
@@ -16,7 +16,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::Generate { command } => command.execute(ctx).await,
 		}
@@ -30,7 +30,7 @@ pub enum GenerateOpts {
 }
 
 impl GenerateOpts {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			GenerateOpts::GitHub(opts) => gen_github(ctx, opts).await,
 		}
@@ -47,7 +47,7 @@ pub struct GenerateGitHubOpts {
 	allow_idle_lobbies: bool,
 }
 
-async fn gen_github(ctx: &cli_core::Ctx, opts: &GenerateGitHubOpts) -> GlobalResult<()> {
+async fn gen_github(ctx: &toolchain_core::Ctx, opts: &GenerateGitHubOpts) -> GlobalResult<()> {
 	let relative_path = opts
 		.path
 		.clone()
@@ -71,7 +71,7 @@ async fn gen_github(ctx: &cli_core::Ctx, opts: &GenerateGitHubOpts) -> GlobalRes
 
 // TODO: Strings in this workflow are not appropriately escaped
 async fn gen_github_workflow(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	opts: &GenerateGitHubOpts,
 ) -> GlobalResult<String> {
 	let mut version = config::read_config(Vec::new(), None).await?;
@@ -163,7 +163,7 @@ async fn gen_github_workflow(
 	Ok(workflow)
 }
 
-fn common_substitute(ctx: &cli_core::Ctx, input: &str) -> String {
+fn common_substitute(ctx: &toolchain_core::Ctx, input: &str) -> String {
 	input
 		.replace(
 			"__RIVET_CLI_VERSION__",
@@ -187,7 +187,7 @@ fn validate_idle_lobbies(
 }
 
 fn append_dockerfile(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	workflow: &mut String,
 	needs_jobs: &mut Vec<String>,
 	overrides: &mut Vec<String>,

cli/src/commands/config.rs → rivet-cli/src/commands/config.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use global_error::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
@@ -13,7 +13,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::Validate(opts) => {
 				let errors = opts.execute(ctx).await?;
@@ -48,7 +48,7 @@ pub struct ValidateOpts {
 }
 
 impl ValidateOpts {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<Vec<models::ValidationError>> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<Vec<models::ValidationError>> {
 		let overrides = parse_config_override_args(&self.overrides)?;
 		let mut rivet_config =
 			read_config(overrides, self.namespace.as_ref().map(String::as_str)).await?;

cli/src/commands/deploy.rs → rivet-cli/src/commands/deploy.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use cli_core::rivet_api::{apis, models};
+use toolchain_core::rivet_api::{apis, models};
 use global_error::prelude::*;
 use serde::Serialize;
 use serde_json::json;
@@ -67,7 +67,7 @@ pub struct Opts {
 }
 
 impl Opts {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		// Derive namespace
 		let namespace = match (
 			self.namespace.as_ref().or(self.namespace_flag.as_ref()),
@@ -133,7 +133,7 @@ impl Opts {
 /// Developers should override config properties instead. For example: `rivet deploy -o matchmaker.docker.image_id=xxxx -o
 /// cdn.path=xxxx`
 pub async fn build_and_push_compat(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	overrides: &mut Vec<(String, serde_json::Value)>,
 	build_tag: &Option<String>,
 	build_name: &Option<String>,
@@ -195,7 +195,7 @@ pub struct DeployOutput {
 
 /// Deploys a new Rivet version.
 pub async fn deploy(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	display_name: Option<&str>,
 	overrides: Vec<(String, serde_json::Value)>,
 	namespace_name_id: Option<&str>,
@@ -312,7 +312,7 @@ pub async fn deploy(
 
 /// Builds the Docker image and CDN site if needed.
 pub async fn build_config_dependencies(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	namespace: Option<&str>,
 	version: &mut models::CloudVersionConfig,
 	display_name: &str,
@@ -368,7 +368,7 @@ pub async fn build_config_dependencies(
 ///
 /// If none are true, `None` is returned.
 pub async fn build_and_push_image(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	display_name: &str,
 	docker: &mut Box<models::CloudVersionMatchmakerGameModeRuntimeDocker>,
 	format: Option<&struct_fmt::Format>,
@@ -417,7 +417,7 @@ pub async fn build_and_push_image(
 	}
 }
 pub async fn build_and_push_site(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	namespace: Option<&str>,
 	display_name: &str,
 	cdn: &mut Box<models::CloudVersionCdnConfig>,

cli/src/commands/dev.rs → rivet-cli/src/commands/dev.rs

@@ -9,7 +9,7 @@ pub enum SubCommand {
 }
 
 impl SubCommand {
-	pub async fn execute(&self, ctx: &cli_core::Ctx) -> GlobalResult<()> {
+	pub async fn execute(&self, ctx: &toolchain_core::Ctx) -> GlobalResult<()> {
 		match self {
 			SubCommand::CreateDevToken(opts) => {
 				rivet_term::status::warn(

cli/src/commands/docker/build.rs → rivet-cli/src/commands/docker/build.rs

@@ -53,7 +53,7 @@ pub struct BuildImageOutput {
 
 /// Builds an image and archives it to a path.
 pub async fn build_image(
-	ctx: &cli_core::Ctx,
+	ctx: &toolchain_core::Ctx,
 	dockerfile: &Path,
 	build_kind: super::BuildKind,
 	build_compression: super::BuildCompression,