Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into rebase/feat/domains

core/startos/src/action.rs

@@ -26,7 +26,7 @@ pub struct ActionResultV0 {
 }
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum DockerStatus {
     Running,
     Stopped,
@@ -48,7 +48,7 @@ pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionR
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ActionParams {
     #[arg(id = "id")]

core/startos/src/auth.rs

@@ -127,7 +127,7 @@ fn gen_pwd() {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliLoginParams {
     password: Option<PasswordType>,
@@ -179,7 +179,7 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LoginParams {
     password: Option<PasswordType>,
@@ -220,7 +220,7 @@ pub async fn login_impl(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogoutParams {
     session: InternedString,
@@ -236,7 +236,7 @@ pub async fn logout(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Session {
     pub logged_in: DateTime<Utc>,
     pub last_active: DateTime<Utc>,
@@ -245,7 +245,7 @@ pub struct Session {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SessionList {
     current: InternedString,
     sessions: Sessions,
@@ -305,7 +305,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
     #[arg(skip)]
@@ -340,7 +340,7 @@ impl AsLogoutSessionId for KillSessionId {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct KillParams {
     ids: Vec<String>,
@@ -353,12 +353,10 @@ pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(),
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetPasswordParams {
-    #[arg(name = "old-password")]
     old_password: Option<PasswordType>,
-    #[arg(name = "new-password")]
     new_password: Option<PasswordType>,
 }
 

core/startos/src/backup/backup_bulk.rs

@@ -30,7 +30,7 @@ use crate::util::serde::IoFormat;
 use crate::version::VersionT;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct BackupParams {
     target_id: BackupTargetId,

core/startos/src/backup/restore.rs

@@ -25,7 +25,7 @@ use crate::service::service_map::DownloadInstallFuture;
 use crate::util::serde::IoFormat;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RestorePackageParams {
     pub ids: Vec<PackageId>,

core/startos/src/backup/target/cifs.rs

@@ -36,7 +36,7 @@ impl Map for CifsTargets {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct CifsBackupTarget {
     hostname: String,
     path: PathBuf,
@@ -68,7 +68,7 @@ pub fn cifs() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     pub hostname: String,
@@ -122,7 +122,7 @@ pub async fn add(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateParams {
     pub id: BackupTargetId,
@@ -186,7 +186,7 @@ pub async fn update(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RemoveParams {
     pub id: BackupTargetId,

core/startos/src/backup/target/mod.rs

@@ -34,9 +34,9 @@ pub mod cifs;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum BackupTarget {
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Disk {
         vendor: Option<String>,
         model: Option<String>,
@@ -109,7 +109,7 @@ impl Serialize for BackupTargetId {
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum BackupTargetFS {
     Disk(BlockDev<PathBuf>),
     Cifs(Cifs),
@@ -190,7 +190,7 @@ pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarg
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct BackupInfo {
     pub version: Version,
     pub timestamp: Option<DateTime<Utc>>,
@@ -198,7 +198,7 @@ pub struct BackupInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PackageBackupInfo {
     pub title: String,
     pub version: Version,
@@ -243,7 +243,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InfoParams {
     target_id: BackupTargetId,
@@ -277,7 +277,7 @@ lazy_static::lazy_static! {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct MountParams {
     target_id: BackupTargetId,
@@ -312,7 +312,7 @@ pub async fn mount(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UmountParams {
     target_id: Option<BackupTargetId>,

core/startos/src/config/action.rs

@@ -9,14 +9,14 @@ use crate::prelude::*;
 use crate::status::health_check::HealthCheckId;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConfigRes {
     pub config: Option<Config>,
     pub spec: ConfigSpec,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetResult {
     pub depends_on: BTreeMap<PackageId, BTreeSet<HealthCheckId>>,
 }

core/startos/src/config/mod.rs

@@ -126,7 +126,7 @@ pub enum MatchError {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ConfigParams {
     pub id: PackageId,
@@ -157,7 +157,7 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes,
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetParams {
     #[arg(long = "timeout")]
     pub timeout: Option<crate::util::serde::Duration>,

core/startos/src/context/setup.rs

@@ -28,7 +28,7 @@ lazy_static::lazy_static! {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetupResult {
     pub tor_address: String,
     pub lan_address: String,

core/startos/src/control.rs

@@ -10,7 +10,7 @@ use crate::prelude::*;
 use crate::Error;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ControlParams {
     pub id: PackageId,

core/startos/src/db/mod.rs

@@ -183,7 +183,7 @@ pub enum RevisionsRes {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
     #[arg(long = "include-private", short = 'p')]
@@ -216,7 +216,7 @@ async fn cli_dump(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DumpParams {
     #[arg(long = "include-private", short = 'p')]
@@ -272,7 +272,7 @@ async fn cli_apply(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
     expr: String,
@@ -310,7 +310,7 @@ pub fn put() -> ParentHandler {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UiParams {
     pointer: JsonPointer,

core/startos/src/db/model/mod.rs

@@ -20,7 +20,7 @@ pub mod private;
 pub mod public;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Database {
     pub public: Public,

core/startos/src/db/model/package.rs

@@ -35,7 +35,7 @@ pub enum ManifestPreference {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "state")]
 #[model = "Model<Self>"]
 pub enum PackageState {
@@ -257,14 +257,14 @@ impl Model<PackageState> {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstallingState {
     pub installing_info: InstallingInfo,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct UpdatingState {
     pub manifest: Manifest,
@@ -272,14 +272,14 @@ pub struct UpdatingState {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstalledState {
     pub manifest: Manifest,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstallingInfo {
     pub new_manifest: Manifest,
@@ -287,7 +287,7 @@ pub struct InstallingInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct PackageDataEntry {
     pub state_info: PackageState,
@@ -405,7 +405,7 @@ impl Map for CurrentDependencies {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct StaticDependencyInfo {
     pub title: String,
@@ -413,11 +413,11 @@ pub struct StaticDependencyInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
 pub enum CurrentDependencyInfo {
     Exists,
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Running {
         #[serde(default)]
         health_checks: BTreeSet<HealthCheckId>,
@@ -438,7 +438,7 @@ impl Map for InterfaceAddressMap {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InterfaceAddresses {
     pub tor_address: Option<String>,

core/startos/src/db/model/private.rs

@@ -14,7 +14,7 @@ use crate::ssh::SshKeys;
 use crate::util::serde::Pem;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Private {
     pub key_store: KeyStore,

core/startos/src/db/model/public.rs

@@ -24,7 +24,7 @@ use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 // #[macro_debug]
 pub struct Public {
@@ -102,7 +102,7 @@ fn get_platform() -> InternedString {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ServerInfo {
     #[serde(default = "get_arch")]
@@ -137,7 +137,7 @@ pub struct ServerInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct IpInfo {
     pub ipv4_range: Option<Ipv4Net>,
@@ -165,7 +165,7 @@ pub struct BackupProgress {
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
@@ -178,7 +178,7 @@ pub struct ServerStatus {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct UpdateProgress {
     pub size: Option<u64>,
@@ -186,7 +186,7 @@ pub struct UpdateProgress {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct WifiInfo {
     pub ssids: Vec<String>,
@@ -195,7 +195,7 @@ pub struct WifiInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ServerSpecs {
     pub cpu: String,
     pub disk: String,
@@ -203,7 +203,7 @@ pub struct ServerSpecs {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConnectionAddresses {
     pub tor: Vec<String>,
     pub clearnet: Vec<String>,

core/startos/src/dependencies.rs

@@ -36,7 +36,7 @@ impl Map for Dependencies {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "type")]
 pub enum DependencyRequirement {
     OptIn { how: String },
@@ -50,7 +50,7 @@ impl DependencyRequirement {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct DepInfo {
     pub version: VersionRange,
@@ -61,12 +61,10 @@ pub struct DepInfo {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ConfigureParams {
-    #[arg(name = "dependent-id")]
     dependent_id: PackageId,
-    #[arg(name = "dependency-id")]
     dependency_id: PackageId,
 }
 pub fn configure() -> ParentHandler<ConfigureParams> {
@@ -111,7 +109,7 @@ pub async fn configure_impl(
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConfigDryRes {
     pub old_config: Config,
     pub new_config: Config,

core/startos/src/diagnostic.rs

@@ -41,7 +41,7 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     limit: Option<usize>,

core/startos/src/disk/mod.rs

@@ -17,7 +17,7 @@ pub const BOOT_RW_PATH: &str = "/media/boot-rw";
 pub const REPAIR_DISK_PATH: &str = "/media/embassy/config/repair-disk";
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct OsPartitionInfo {
     pub efi: Option<PathBuf>,
     pub bios: Option<PathBuf>,

core/startos/src/disk/mount/filesystem/block_dev.rs

@@ -10,7 +10,7 @@ use super::FileSystem;
 use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct BlockDev<LogicalName: AsRef<Path>> {
     logicalname: LogicalName,
 }

core/startos/src/disk/mount/filesystem/cifs.rs

@@ -63,7 +63,7 @@ pub async fn mount_cifs(
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Cifs {
     pub hostname: String,
     pub path: PathBuf,

core/startos/src/disk/mount/filesystem/httpdirfs.rs

@@ -22,7 +22,7 @@ pub async fn mount_httpdirfs(url: &Url, mountpoint: impl AsRef<Path>) -> Result<
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct HttpDirFS {
     url: Url,
 }

core/startos/src/disk/mount/filesystem/idmapped.rs

@@ -14,7 +14,7 @@ use crate::prelude::*;
 use crate::util::Invoke;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct IdMapped<Fs: FileSystem> {
     filesystem: Fs,
     from_id: u32,

core/startos/src/disk/mount/filesystem/loop_dev.rs

@@ -12,7 +12,7 @@ use super::FileSystem;
 use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LoopDev<LogicalName: AsRef<Path>> {
     logicalname: LogicalName,
     offset: u64,

core/startos/src/disk/util.rs

@@ -24,14 +24,14 @@ use crate::util::{Invoke, Version};
 use crate::{Error, ResultExt as _};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum PartitionTable {
     Mbr,
     Gpt,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct DiskInfo {
     pub logicalname: PathBuf,
     pub partition_table: Option<PartitionTable>,
@@ -43,7 +43,7 @@ pub struct DiskInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PartitionInfo {
     pub logicalname: PathBuf,
     pub label: Option<String>,
@@ -54,7 +54,7 @@ pub struct PartitionInfo {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct EmbassyOsRecoveryInfo {
     pub version: Version,
     pub full: bool,

core/startos/src/firmware.rs

@@ -14,7 +14,7 @@ use crate::PLATFORM;
 
 /// Part of the Firmware, look there for more about
 #[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct VersionMatcher {
     /// Strip this prefix on the version matcher
     semver_prefix: Option<String>,
@@ -28,7 +28,7 @@ pub struct VersionMatcher {
 /// wanted a structure that could help decide what to do
 /// for each of the firmware versions
 #[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Firmware {
     id: String,
     /// This is the platform(s) the firmware was built for

core/startos/src/inspect.rs

@@ -24,7 +24,7 @@ pub fn inspect() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct HashParams {
     path: PathBuf,
@@ -39,11 +39,11 @@ pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<Stri
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ManifestParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 
@@ -57,11 +57,11 @@ pub async fn manifest(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InspectParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 
@@ -89,11 +89,11 @@ pub async fn icon(
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InstructionParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 

core/startos/src/install/mod.rs

@@ -64,7 +64,7 @@ pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
 }
 
 #[derive(Debug, Clone, Copy, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum MinMax {
     Min,
     Max,
@@ -103,7 +103,7 @@ impl std::fmt::Display for MinMax {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InstallParams {
     id: PackageId,
@@ -165,7 +165,7 @@ pub async fn install(
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SideloadResponse {
     pub upload: RequestGuid,
     pub progress: RequestGuid,
@@ -275,7 +275,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum CliInstallParams {
     Marketplace(InstallParams),
     Sideload(PathBuf),
@@ -392,7 +392,7 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UninstallParams {
     id: PackageId,

core/startos/src/lib.rs

@@ -80,7 +80,7 @@ use crate::context::CliContext;
 use crate::util::serde::HandlerExtSerde;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct EchoParams {
     message: String,

core/startos/src/logs.rs

@@ -102,14 +102,14 @@ async fn ws_handler(
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LogResponse {
     entries: Reversible<LogEntry>,
     start_cursor: Option<String>,
     end_cursor: Option<String>,
 }
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LogFollowResponse {
     start_cursor: Option<String>,
     guid: RequestGuid,
@@ -211,7 +211,7 @@ pub enum LogSource {
 pub const SYSTEM_UNIT: &str = "startd";
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParam {
     id: PackageId,

core/startos/src/middleware/auth.rs

@@ -26,7 +26,7 @@ use crate::prelude::*;
 pub const LOCAL_AUTH_COOKIE_PATH: &str = "/run/embassy/rpc.authcookie";
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LoginRes {
     pub session: InternedString,
 }
@@ -245,7 +245,7 @@ impl Borrow<str> for HashSessionToken {
 }
 
 #[derive(Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default = "const_true")]
     authenticated: bool,

core/startos/src/middleware/db.rs

@@ -7,7 +7,7 @@ use serde::Deserialize;
 use crate::context::RpcContext;
 
 #[derive(Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default)]
     sync_db: bool,

core/startos/src/net/dhcp.rs

@@ -61,7 +61,7 @@ pub fn dhcp() -> ParentHandler {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateParams {
     interface: String,

core/startos/src/net/ssl.rs

@@ -29,7 +29,7 @@ use crate::SOURCE_DATE;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
 #[model = "Model<Self>"]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct CertStore {
     pub root_key: Pem<PKey<Private>>,
     pub root_cert: Pem<X509>,

core/startos/src/net/tor.rs

@@ -105,7 +105,7 @@ pub fn tor() -> ParentHandler {
         )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetParams {
     #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
@@ -143,7 +143,7 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddress
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]

core/startos/src/net/wifi.rs

@@ -88,7 +88,7 @@ pub fn country() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     ssid: String,
@@ -139,7 +139,7 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SsidParams {
     ssid: String,
@@ -217,7 +217,7 @@ pub async fn delete(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
     Ok(())
 }
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WiFiInfo {
     ssids: HashMap<Ssid, SignalStrength>,
     connected: Option<Ssid>,
@@ -226,13 +226,13 @@ pub struct WiFiInfo {
     available_wifi: Vec<WifiListOut>,
 }
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WifiListInfo {
     strength: SignalStrength,
     security: Vec<String>,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WifiListOut {
     ssid: Ssid,
     strength: SignalStrength,
@@ -403,7 +403,7 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SetCountryParams {
     #[arg(value_parser = CountryCodeParser)]

core/startos/src/notifications.rs

@@ -49,7 +49,7 @@ pub fn notification() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
     before: Option<u32>,
@@ -111,7 +111,7 @@ pub async fn list(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
     id: u32,
@@ -126,7 +126,7 @@ pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Resul
         .await
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteBeforeParams {
     before: u32,
@@ -149,7 +149,7 @@ pub async fn delete_before(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CreateParams {
     package: Option<PackageId>,
@@ -173,7 +173,7 @@ pub async fn create(
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum NotificationLevel {
     Success,
     Info,
@@ -225,7 +225,7 @@ impl fmt::Display for InvalidNotificationLevel {
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Notifications(pub BTreeMap<u32, Notification>);
 impl Notifications {
     pub fn new() -> Self {
@@ -244,7 +244,7 @@ impl Map for Notifications {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Notification {
     package_id: Option<PackageId>,
     created_at: DateTime<Utc>,
@@ -256,7 +256,7 @@ pub struct Notification {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct NotificationWithId {
     id: u32,
     #[serde(flatten)]

core/startos/src/os_install/mod.rs

@@ -24,7 +24,7 @@ mod gpt;
 mod mbr;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PostInstallConfig {
     os_partitions: OsPartitionInfo,
     ethernet_interface: String,
@@ -120,7 +120,7 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionIn
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ExecuteParams {
     logicalname: PathBuf,

core/startos/src/properties.rs

@@ -6,10 +6,10 @@ use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
-use crate::db::model::package::ExposedUI;
+use crate::context::RpcContext;
+use crate::db::model::package::{ExposedUI, StoreExposedUI};
 use crate::prelude::*;
 use crate::Error;
-use crate::{context::RpcContext, db::model::package::StoreExposedUI};
 
 pub fn display_properties(response: Value) {
     println!("{}", response);
@@ -58,7 +58,7 @@ impl IntoProperties for StoreExposedUI {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PropertiesParam {
     id: PackageId,

core/startos/src/registry/admin.rs

@@ -91,7 +91,7 @@ async fn do_upload(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PublishParams {
     location: String,

core/startos/src/registry/marketplace.rs

@@ -37,7 +37,7 @@ pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct GetParams {
     url: Url,

core/startos/src/s9pk/v1/docker.rs

@@ -13,7 +13,7 @@ use crate::util::io::from_cbor_async_reader;
 use crate::{Error, ErrorKind, ARCH};
 
 #[derive(Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct DockerMultiArch {
     pub default: String,
     pub available: BTreeSet<String>,

core/startos/src/s9pk/v1/manifest.rs

@@ -18,7 +18,7 @@ fn current_version() -> Version {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Manifest {
     #[serde(default = "current_version")]
@@ -53,7 +53,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Assets {
     #[serde(default)]
     pub license: Option<PathBuf>,

core/startos/src/s9pk/v1/mod.rs

@@ -13,7 +13,7 @@ pub mod reader;
 pub const SIG_CONTEXT: &[u8] = b"s9pk";
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct VerifyParams {
     pub path: PathBuf,

core/startos/src/s9pk/v2/manifest.rs

@@ -53,7 +53,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct HardwareRequirements {
     #[serde(default)]
     device: BTreeMap<String, Regex>,
@@ -85,7 +85,7 @@ impl Description {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Alerts {
     pub install: Option<String>,
     pub uninstall: Option<String>,

core/startos/src/service/service_effect_handler.rs

@@ -257,7 +257,7 @@ struct RemoveAddressParams {
 #[ts(export)]
 #[serde(rename_all = "kebab-case")]
 enum AllowedStatuses {
-    OnlyRunning,
+    OnlyRunning, // onlyRunning
     OnlyStopped,
     Any,
 }
@@ -1090,20 +1090,19 @@ enum DependencyKind {
 #[serde(rename_all = "camelCase", tag = "kind")]
 #[ts(export)]
 enum DependencyRequirement {
+    #[serde(rename_all = "camelCase")]
     Running {
         #[ts(type = "string")]
         id: PackageId,
         #[ts(type = "string[]")]
-        #[serde(rename = "healthChecks")]
         health_checks: BTreeSet<HealthCheckId>,
-        #[serde(rename = "versionSpec")]
         version_spec: String,
         url: String,
     },
+    #[serde(rename_all = "camelCase")]
     Exists {
         #[ts(type = "string")]
         id: PackageId,
-        #[serde(rename = "versionSpec")]
         version_spec: String,
         url: String,
     },

core/startos/src/setup.rs

@@ -100,7 +100,7 @@ async fn setup_init(
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct AttachParams {
     #[serde(rename = "embassy-password")]
     password: Option<EncryptedWire>,
@@ -185,7 +185,7 @@ pub async fn attach(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetupStatus {
     pub bytes_transferred: u64,
     pub total_bytes: Option<u64>,
@@ -211,7 +211,7 @@ pub fn cifs() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct VerifyCifsParams {
     hostname: String,
     path: PathBuf,
@@ -247,14 +247,14 @@ pub async fn verify_cifs(
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum RecoverySource {
     Migrate { guid: String },
     Backup { target: BackupTargetFS },
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ExecuteParams {
     embassy_logicalname: PathBuf,
     embassy_password: EncryptedWire,

core/startos/src/ssh.rs

@@ -48,7 +48,7 @@ impl ValueParserFactory for SshPubKey {
 }
 
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SshKeyResponse {
     pub alg: String,
     pub fingerprint: InternedString,
@@ -103,7 +103,7 @@ pub fn ssh() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     key: SshPubKey,
@@ -136,7 +136,7 @@ pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKey
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
     fingerprint: InternedString,

core/startos/src/status/health_check.rs

@@ -2,7 +2,7 @@ pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
 pub enum HealthCheckResult {
     Success,

core/startos/src/status/mod.rs

@@ -11,7 +11,7 @@ use crate::status::health_check::HealthCheckResult;
 
 pub mod health_check;
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Status {
     pub configured: bool,
@@ -21,7 +21,7 @@ pub struct Status {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, Default)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct DependencyConfigErrors(pub BTreeMap<PackageId, String>);
 impl Map for DependencyConfigErrors {
@@ -37,7 +37,7 @@ impl Map for DependencyConfigErrors {
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(tag = "status")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum MainStatus {
     Stopped,
     Restarting,

core/startos/src/system.rs

@@ -74,7 +74,7 @@ pub async fn enable_zram() -> Result<(), Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ZramParams {
     enable: bool,
@@ -136,7 +136,7 @@ fn display_governor_info(params: WithIoFormat<GovernorParams>, result: GovernorI
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct GovernorParams {
     set: Option<Governor>,
@@ -230,7 +230,7 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
     })
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
@@ -314,7 +314,7 @@ pub async fn logs_follow(
     follow_logs(ctx, LogSource::System, limit).await
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct KernelLogsParams {
     #[arg(short = 'l', long = "limit")]
@@ -509,12 +509,12 @@ impl<'de> Deserialize<'de> for GigaBytes {
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsGeneral {
     pub temperature: Option<Celsius>,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsMemory {
     pub percentage_used: Percentage,
     pub total: MebiBytes,
@@ -525,7 +525,7 @@ pub struct MetricsMemory {
     pub zram_used: MebiBytes,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsCpu {
     percentage_used: Percentage,
     idle: Percentage,
@@ -534,7 +534,7 @@ pub struct MetricsCpu {
     wait: Percentage,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsDisk {
     percentage_used: Percentage,
     used: GigaBytes,
@@ -542,7 +542,7 @@ pub struct MetricsDisk {
     capacity: GigaBytes,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metrics {
     general: MetricsGeneral,
     memory: MetricsMemory,

core/startos/src/update/mod.rs

@@ -35,7 +35,7 @@ lazy_static! {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateSystemParams {
     marketplace_url: Url,
@@ -60,7 +60,7 @@ pub async fn update_system(
 
 /// What is the status of the updates?
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum UpdateResult {
     NoUpdates,
     Updating,

core/startos/src/util/lshw.rs

@@ -8,7 +8,7 @@ const KNOWN_CLASSES: &[&str] = &["processor", "display"];
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "class")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum LshwDevice {
     Processor(LshwProcessor),
     Display(LshwDisplay),

core/startos/src/volume.rs

@@ -111,25 +111,25 @@ pub fn cert_dir(pkg_id: &PackageId, host_id: &HostId) -> PathBuf {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum Volume {
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Data {
         #[serde(skip)]
         readonly: bool,
     },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Assets {},
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Pointer {
         package_id: PackageId,
         volume_id: VolumeId,
         path: PathBuf,
         readonly: bool,
     },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Certificate { interface_id: HostId },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Backup { readonly: bool },
 }
 impl Volume {