diff --git a/packages/toolchain/toolchain/src/config/build/docker.rs b/packages/toolchain/toolchain/src/config/build/docker.rs index 214bc7ffba..4d7a9e7088 100644 --- a/packages/toolchain/toolchain/src/config/build/docker.rs +++ b/packages/toolchain/toolchain/src/config/build/docker.rs @@ -6,10 +6,10 @@ use serde::{Deserialize, Serialize}; use super::Compression; #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case", deny_unknown_fields)] +#[serde(rename_all = "camelCase", deny_unknown_fields)] pub struct Build { /// Directory to build the Docker image from. - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip_serializing_if = "Option::is_none", alias = "build_path")] pub build_path: Option, /// Existing image tag to upload. #[serde(skip_serializing_if = "Option::is_none")] @@ -18,10 +18,10 @@ pub struct Build { #[serde(skip_serializing_if = "Option::is_none")] pub dockerfile: Option, /// Build target to upload. - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip_serializing_if = "Option::is_none", alias = "build_target")] pub build_target: Option, /// Build arguments to pass to the build. - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip_serializing_if = "Option::is_none", alias = "build_args")] pub build_args: Option>, /// Unstable features. #[serde(skip_serializing_if = "Option::is_none")] @@ -35,9 +35,11 @@ impl Build { } #[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case", deny_unknown_fields)] +#[serde(rename_all = "camelCase", deny_unknown_fields)] pub struct Unstable { + #[serde(alias = "allow_root")] pub allow_root: Option, + #[serde(alias = "build_method")] pub build_method: Option, pub bundle: Option, pub compression: Option, @@ -58,7 +60,7 @@ impl Unstable { } #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, JsonSchema, clap::ValueEnum)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub enum BuildMethod { /// Use the native Docker build command. Only used if Buildx is not available. Buildx, @@ -73,7 +75,7 @@ pub enum BuildMethod { #[derive( Debug, Copy, Clone, Serialize, Deserialize, strum::AsRefStr, JsonSchema, clap::ValueEnum, )] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub enum BundleKind { /// Legacy option. Docker image archive output from `docker save`. Slower lobby start /// times. diff --git a/packages/toolchain/toolchain/src/config/build/javascript.rs b/packages/toolchain/toolchain/src/config/build/javascript.rs index e7d459f0c4..2d6bd5958b 100644 --- a/packages/toolchain/toolchain/src/config/build/javascript.rs +++ b/packages/toolchain/toolchain/src/config/build/javascript.rs @@ -5,7 +5,7 @@ use super::Compression; // TODO: Add back `deny_unknown_fields` after https://github.com/serde-rs/serde/issues/1600 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct Build { pub script: String, #[serde(default)] @@ -13,13 +13,17 @@ pub struct Build { } #[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case", deny_unknown_fields)] +#[serde(rename_all = "camelCase", deny_unknown_fields)] pub struct Unstable { pub minify: Option, + #[serde(alias = "analyze_result")] pub analyze_result: Option, + #[serde(alias = "esbuild_log_level")] pub esbuild_log_level: Option, pub compression: Option, + #[serde(alias = "dump_build")] pub dump_build: Option, + #[serde(alias = "no_bundler")] pub no_bundler: Option, } diff --git a/packages/toolchain/toolchain/src/config/build/mod.rs b/packages/toolchain/toolchain/src/config/build/mod.rs index b3d3e4cb21..7ab60a35bc 100644 --- a/packages/toolchain/toolchain/src/config/build/mod.rs +++ b/packages/toolchain/toolchain/src/config/build/mod.rs @@ -5,7 +5,7 @@ pub mod docker; pub mod javascript; #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case", untagged)] +#[serde(rename_all = "camelCase", untagged)] pub enum Runtime { Docker(docker::Build), #[serde(rename = "javascript")] @@ -15,7 +15,7 @@ pub enum Runtime { #[derive( Debug, Copy, Clone, Serialize, Deserialize, strum::AsRefStr, JsonSchema, clap::ValueEnum, )] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub enum Compression { /// No compression. #[strum(serialize = "none")] diff --git a/packages/toolchain/toolchain/src/config/mod.rs b/packages/toolchain/toolchain/src/config/mod.rs index 7ed362b249..f9b1828577 100644 --- a/packages/toolchain/toolchain/src/config/mod.rs +++ b/packages/toolchain/toolchain/src/config/mod.rs @@ -55,7 +55,7 @@ impl Deref for Config { } #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case", deny_unknown_fields)] +#[serde(rename_all = "camelCase", deny_unknown_fields)] pub struct Root { #[serde(default, alias = "builds")] pub actors: HashMap, @@ -67,25 +67,26 @@ pub struct Root { #[serde(default)] pub functions: HashMap, - #[serde(default)] + #[serde(default, alias = "rivetkit")] pub rivetkit: Option, } #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct Actor { #[serde(flatten)] pub build: Build, } #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct Function { #[serde(flatten)] pub build: Build, pub path: Option, + #[serde(alias = "route_subpaths")] pub route_subpaths: Option, - #[serde(default)] + #[serde(default, alias = "strip_prefix")] pub strip_prefix: Option, #[serde(default)] pub networking: FunctionNetworking, @@ -117,8 +118,9 @@ impl Function { } #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Default)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct FunctionNetworking { + #[serde(alias = "internal_port")] pub internal_port: Option, } @@ -129,13 +131,13 @@ impl FunctionNetworking { } #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Default)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct FunctionRuntime { pub environment: Option>, } #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct RivetKit { // TEMPORARY: We need to auto-generate a worker file using isoaltes, so we need to know the // path to the registry @@ -148,7 +150,7 @@ pub struct RivetKit { } #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct Resources { pub cpu: u64, pub memory: u64, @@ -156,7 +158,7 @@ pub struct Resources { // TODO: Add back `deny_unknown_fields` after https://github.com/serde-rs/serde/issues/1600 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)] -#[serde(rename_all = "snake_case")] +#[serde(rename_all = "camelCase")] pub struct Build { pub tags: Option>, #[serde(flatten)]