Skip to content

Commit 6a731b6

Browse files
authored
[ENH]: make config field renames backwards compatible (#3849)
## Description of changes Config fields that were renamed in #3838 are now aliased instead so that either casing can be provided. After merge, I'll create a task to switch back to `rename_all = "snake_case"` in a few weeks. ## Test plan *How are these changes tested?* - [x] Tests pass locally with `pytest` for python, `yarn test` for js, `cargo test` for rust
1 parent 5be8e66 commit 6a731b6

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

rust/blockstore/src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use serde::{Deserialize, Serialize};
22

33
#[derive(Deserialize, Debug, Clone, Serialize)]
4-
#[serde(rename_all = "snake_case")]
54
pub enum BlockfileProviderConfig {
5+
#[serde(alias = "arrow")]
66
Arrow(Box<super::arrow::config::ArrowBlockfileProviderConfig>),
7+
#[serde(alias = "memory")]
78
Memory,
89
}
910

rust/config/src/assignment/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ pub enum HasherType {
1010
}
1111

1212
#[derive(Deserialize, Clone, Serialize, Debug)]
13-
#[serde(rename_all = "snake_case")]
1413
/// The configuration for the assignment policy.
1514
/// # Options
1615
/// - RendezvousHashing: The rendezvous hashing assignment policy.
1716
/// # Notes
1817
/// See config.rs in the root of the worker crate for an example of how to use
1918
/// config files to configure the worker.
2019
pub enum AssignmentPolicyConfig {
20+
#[serde(alias = "rendezvous_hashing")]
2121
RendezvousHashing(RendezvousHashingAssignmentPolicyConfig),
2222
}
2323

rust/frontend/src/executor/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ pub struct DistributedExecutorConfig {
3232
pub struct LocalExecutorConfig {}
3333

3434
#[derive(Deserialize, Clone, Serialize, Debug)]
35-
#[serde(rename_all = "snake_case")]
3635
pub enum ExecutorConfig {
36+
#[serde(alias = "distributed")]
3737
Distributed(DistributedExecutorConfig),
38+
#[serde(alias = "local")]
3839
Local(LocalExecutorConfig),
3940
}
4041

rust/log/src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ impl Default for SqliteLogConfig {
5757
}
5858

5959
#[derive(Deserialize, Clone, Serialize, Debug)]
60-
#[serde(rename_all = "snake_case")]
6160
pub enum LogConfig {
61+
#[serde(alias = "grpc")]
6262
Grpc(GrpcLogConfig),
63+
#[serde(alias = "sqlite")]
6364
Sqlite(SqliteLogConfig),
6465
}
6566

rust/memberlist/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub(crate) enum MemberlistProviderType {
1313
/// # Options
1414
/// - CustomResource: Use a custom resource to get the memberlist
1515
#[derive(Deserialize, Clone, Serialize, Debug)]
16-
#[serde(rename_all = "snake_case")]
1716
pub enum MemberlistProviderConfig {
17+
#[serde(alias = "custom_resource")]
1818
CustomResource(CustomResourceMemberlistProviderConfig),
1919
}
2020

rust/storage/src/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use serde::{Deserialize, Serialize};
22

33
#[derive(Deserialize, Debug, Serialize)]
4-
#[serde(rename_all = "snake_case")]
54
/// The configuration for the chosen storage.
65
/// # Options
76
/// - S3: The configuration for the s3 storage.
@@ -17,6 +16,7 @@ pub enum StorageConfig {
1716
#[serde(alias = "local")]
1817
Local(LocalStorageConfig),
1918
#[serde(alias = "admissioncontrolleds3")]
19+
#[serde(alias = "admission_controlled_s3")]
2020
AdmissionControlledS3(AdmissionControlledS3StorageConfig),
2121
}
2222

@@ -165,8 +165,8 @@ impl Default for CountBasedPolicyConfig {
165165
}
166166

167167
#[derive(Deserialize, Debug, Clone, Serialize)]
168-
#[serde(rename_all = "snake_case")]
169168
pub enum RateLimitingConfig {
169+
#[serde(alias = "count_based_policy")]
170170
CountBasedPolicy(CountBasedPolicyConfig),
171171
}
172172

rust/sysdb/src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ impl Default for SqliteSysDbConfig {
7777
//////////////////////// SYSDB CONFIG ////////////////////////
7878

7979
#[derive(Deserialize, Debug, Clone, Serialize)]
80-
#[serde(rename_all = "snake_case")]
8180
pub enum SysDbConfig {
81+
#[serde(alias = "grpc")]
8282
Grpc(GrpcSysDbConfig),
83+
#[serde(alias = "sqlite")]
8384
Sqlite(SqliteSysDbConfig),
8485
}
8586

0 commit comments

Comments
 (0)