Skip to content

Commit 905a52c

Browse files
tomasoltomasol
committed
refactor: Rename wrapper to KebabWrapper 
1 parent feb4b36 commit 905a52c

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎activity-fly-http/src/machine.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::exports::obelisk_flyio::activity_fly_http::machines::{
44
use crate::obelisk_flyio::activity_fly_http::regions::Region;
55

66
use crate::machine::ser::MachineSer;
7-
use crate::serde::ToLowerWrapper;
7+
use crate::serde::KebabWrapper;
88
use crate::{API_BASE_URL, Component, request_with_api_token};
99
use anyhow::{Context, anyhow, bail, ensure};
1010
use ser::{
@@ -24,21 +24,21 @@ pub(crate) mod ser {
2424
ServiceProtocol, StopConfig,
2525
};
2626
use crate::obelisk_flyio::activity_fly_http::regions::Region;
27-
use crate::serde::ToLowerWrapper;
27+
use crate::serde::KebabWrapper;
2828
use serde::{Deserialize, Serialize};
2929
use std::collections::HashMap;
3030

3131
#[derive(Serialize, Debug)]
3232
pub(crate) struct MachineCreateRequestSer {
3333
pub(crate) name: String,
3434
pub(crate) config: MachineConfigSer,
35-
pub(crate) region: Option<ToLowerWrapper<Region>>,
35+
pub(crate) region: Option<KebabWrapper<Region>>,
3636
}
3737

3838
#[derive(Serialize, Debug)]
3939
pub(crate) struct MachineUpdateRequestSer {
4040
pub(crate) config: MachineConfigSer,
41-
pub(crate) region: Option<ToLowerWrapper<Region>>,
41+
pub(crate) region: Option<KebabWrapper<Region>>,
4242
}
4343

4444
#[derive(Deserialize, Debug)]
@@ -50,8 +50,8 @@ pub(crate) mod ser {
5050
instance_id: String,
5151
name: String,
5252
state: String,
53-
region: ToLowerWrapper<Region>,
54-
host_status: ToLowerWrapper<HostStatus>,
53+
region: KebabWrapper<Region>,
54+
host_status: KebabWrapper<HostStatus>,
5555
}
5656
impl From<MachineSer> for Machine {
5757
fn from(value: MachineSer) -> Machine {
@@ -90,7 +90,7 @@ pub(crate) mod ser {
9090
kernel_args: Option<Vec<String>>,
9191
}
9292

93-
type CpuKindWrapper = ToLowerWrapper<CpuKind>;
93+
type CpuKindWrapper = KebabWrapper<CpuKind>;
9494

9595
impl From<CpuKindWrapper> for CpuKind {
9696
fn from(value: CpuKindWrapper) -> CpuKind {
@@ -114,7 +114,7 @@ pub(crate) mod ser {
114114
policy: RestartPolicyWrapper,
115115
}
116116

117-
type RestartPolicyWrapper = ToLowerWrapper<RestartPolicy>;
117+
type RestartPolicyWrapper = KebabWrapper<RestartPolicy>;
118118
impl From<RestartPolicyWrapper> for RestartPolicy {
119119
fn from(value: RestartPolicyWrapper) -> RestartPolicy {
120120
value.0
@@ -130,13 +130,13 @@ pub(crate) mod ser {
130130
#[derive(Debug, Serialize, Deserialize)]
131131
pub(crate) struct PortConfigSer {
132132
port: u16,
133-
handlers: Vec<ToLowerWrapper<PortHandler>>,
133+
handlers: Vec<KebabWrapper<PortHandler>>,
134134
}
135135
impl From<PortConfig> for PortConfigSer {
136136
fn from(wit: PortConfig) -> Self {
137137
PortConfigSer {
138138
port: wit.port,
139-
handlers: wit.handlers.into_iter().map(ToLowerWrapper).collect(),
139+
handlers: wit.handlers.into_iter().map(KebabWrapper).collect(),
140140
}
141141
}
142142
}
@@ -152,14 +152,14 @@ pub(crate) mod ser {
152152
#[derive(Debug, Serialize, Deserialize)]
153153
pub(crate) struct ServiceConfigSer {
154154
internal_port: u16,
155-
protocol: ToLowerWrapper<ServiceProtocol>,
155+
protocol: KebabWrapper<ServiceProtocol>,
156156
ports: Vec<PortConfigSer>,
157157
}
158158
impl From<ServiceConfig> for ServiceConfigSer {
159159
fn from(wit: ServiceConfig) -> Self {
160160
ServiceConfigSer {
161161
internal_port: wit.internal_port,
162-
protocol: ToLowerWrapper(wit.protocol),
162+
protocol: KebabWrapper(wit.protocol),
163163
ports: wit.ports.into_iter().map(PortConfigSer::from).collect(),
164164
}
165165
}
@@ -344,7 +344,7 @@ async fn create(
344344
region: Option<Region>,
345345
) -> Result<String, anyhow::Error> {
346346
{
347-
let region = region.map(ToLowerWrapper);
347+
let region = region.map(KebabWrapper);
348348
let fly_config = MachineConfigSer::from(machine_config);
349349
let request_payload = MachineCreateRequestSer {
350350
name: machine_name,
@@ -400,7 +400,7 @@ async fn update(
400400
region: Option<Region>,
401401
) -> Result<(), anyhow::Error> {
402402
{
403-
let region = region.map(ToLowerWrapper);
403+
let region = region.map(KebabWrapper);
404404
let machine_config = MachineConfigSer::from(machine_config);
405405
let request_payload = MachineUpdateRequestSer {
406406
config: machine_config,
@@ -558,7 +558,7 @@ mod tests {
558558
use crate::{
559559
exports::obelisk_flyio::activity_fly_http::machines::{Machine, Region},
560560
machine::ser::MachineSer,
561-
serde::ToLowerWrapper,
561+
serde::KebabWrapper,
562562
};
563563
use insta::assert_debug_snapshot;
564564
use serde_json::json;
@@ -567,15 +567,15 @@ mod tests {
567567
fn region_ser() {
568568
assert_eq!(
569569
"\"ams\"",
570-
serde_json::to_string(&ToLowerWrapper(Region::Ams)).unwrap()
570+
serde_json::to_string(&KebabWrapper(Region::Ams)).unwrap()
571571
);
572572
}
573573

574574
#[test]
575575
fn region_de() {
576576
assert_matches::assert_matches!(
577577
serde_json::from_str("\"ams\"").unwrap(),
578-
ToLowerWrapper(Region::Ams)
578+
KebabWrapper(Region::Ams)
579579
);
580580
}
581581

‎activity-fly-http/src/serde.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned};
44
#[derive(derive_more::Debug, derive_more::From)]
55
#[debug("{_0:?}")] // Transparent debug
66
// FIXME: Remove once wit-bindgen supports path-specific derives
7-
pub(crate) struct ToLowerWrapper<T: Debug + Serialize + DeserializeOwned>(pub(crate) T);
7+
pub(crate) struct KebabWrapper<T: Debug + Serialize + DeserializeOwned>(pub(crate) T);
88

9-
impl<T: Debug + Serialize + DeserializeOwned> Serialize for ToLowerWrapper<T> {
9+
impl<T: Debug + Serialize + DeserializeOwned> Serialize for KebabWrapper<T> {
1010
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
1111
where
1212
S: serde::Serializer,
@@ -23,23 +23,23 @@ impl<T: Debug + Serialize + DeserializeOwned> Serialize for ToLowerWrapper<T> {
2323
}
2424
}
2525

26-
impl<'de, T: Debug + Serialize + DeserializeOwned> Deserialize<'de> for ToLowerWrapper<T> {
26+
impl<'de, T: Debug + Serialize + DeserializeOwned> Deserialize<'de> for KebabWrapper<T> {
2727
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
2828
where
2929
D: serde::Deserializer<'de>,
3030
{
31-
deserializer.deserialize_string(RegionVisitor {
31+
deserializer.deserialize_string(KebabVisitor {
3232
_phantom_data: Default::default(),
3333
})
3434
}
3535
}
3636

37-
struct RegionVisitor<T: Debug + Serialize + DeserializeOwned> {
37+
struct KebabVisitor<T: Debug + Serialize + DeserializeOwned> {
3838
_phantom_data: std::marker::PhantomData<T>,
3939
}
4040

41-
impl<'de, T: Debug + Serialize + DeserializeOwned> serde::de::Visitor<'de> for RegionVisitor<T> {
42-
type Value = ToLowerWrapper<T>;
41+
impl<'de, T: Debug + Serialize + DeserializeOwned> serde::de::Visitor<'de> for KebabVisitor<T> {
42+
type Value = KebabWrapper<T>;
4343

4444
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
4545
let expected_type = std::any::type_name::<T>().rsplit("::").next().unwrap();
@@ -55,7 +55,7 @@ impl<'de, T: Debug + Serialize + DeserializeOwned> serde::de::Visitor<'de> for R
5555

5656
let serde_value = serde_json::value::Value::String(camel_cased.to_string());
5757
serde_json::from_value::<T>(serde_value)
58-
.map(|inner| ToLowerWrapper(inner))
58+
.map(|inner| KebabWrapper(inner))
5959
.map_err(E::custom)
6060
}
6161
}

‎activity-fly-http/src/volume.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::exports::obelisk_flyio::activity_fly_http::volumes::{Volume, VolumeCreateRequest};
2-
use crate::serde::ToLowerWrapper;
2+
use crate::serde::KebabWrapper;
33
use crate::{API_BASE_URL, Component, request_with_api_token};
44
use anyhow::{Context, anyhow, bail};
55
use ser::{VolumeCreateRequestSer, VolumeSer};
@@ -10,7 +10,7 @@ use wstd::runtime::block_on;
1010
// These structs are internal implementation details. They are designed to serialize
1111
// into the exact JSON format expected by the Fly.io Volumes API.
1212
pub(crate) mod ser {
13-
use crate::serde::ToLowerWrapper;
13+
use crate::serde::KebabWrapper;
1414
use crate::{
1515
exports::obelisk_flyio::activity_fly_http::volumes::Volume,
1616
obelisk_flyio::activity_fly_http::regions::Region,
@@ -21,7 +21,7 @@ pub(crate) mod ser {
2121
pub(crate) struct VolumeCreateRequestSer {
2222
pub(crate) name: String,
2323
pub(crate) size_gb: u32,
24-
pub(crate) region: ToLowerWrapper<Region>,
24+
pub(crate) region: KebabWrapper<Region>,
2525
#[serde(rename = "require_unique_zone")]
2626
pub(crate) require_unique_zone: Option<bool>,
2727
}
@@ -31,7 +31,7 @@ pub(crate) mod ser {
3131
pub(crate) id: String,
3232
pub(crate) name: String,
3333
pub(crate) state: String,
34-
pub(crate) region: ToLowerWrapper<Region>,
34+
pub(crate) region: KebabWrapper<Region>,
3535
pub(crate) size_gb: u32,
3636
pub(crate) encrypted: bool,
3737
pub(crate) attached_machine_id: Option<String>,
@@ -100,7 +100,7 @@ async fn create(app_name: String, request: VolumeCreateRequest) -> Result<Volume
100100
let fly_request = VolumeCreateRequestSer {
101101
name: request.name,
102102
size_gb: request.size_gb,
103-
region: ToLowerWrapper(request.region),
103+
region: KebabWrapper(request.region),
104104
require_unique_zone: request.require_unique_zone,
105105
};
106106
let url = format!("{API_BASE_URL}/apps/{app_name}/volumes");

0 commit comments

Comments
 (0)