Skip to content

Commit d67e5a0

Browse files
committed
remove default impl for Duration
1 parent 0794c9d commit d67e5a0

3 files changed

Lines changed: 18 additions & 10 deletions

File tree

crates/stackable-operator/src/product_config_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ mod tests {
618618
env_overrides: env_overrides.unwrap_or_default(),
619619
cli_overrides: cli_overrides.unwrap_or_default(),
620620
pod_overrides: PodTemplateSpec::default(),
621-
min_secret_lifetime: Duration::default(),
621+
min_secret_lifetime: Duration::from_secs(0),
622622
}
623623
}
624624

crates/stackable-operator/src/role_utils.rs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ use kube::{runtime::reflector::ObjectRef, Resource};
101101
use schemars::JsonSchema;
102102
use serde::{Deserialize, Serialize};
103103

104-
#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
104+
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
105105
#[serde(
106106
rename_all = "camelCase",
107107
bound(deserialize = "T: Default + Deserialize<'de>")
@@ -155,6 +155,22 @@ pub struct CommonConfiguration<T> {
155155
pub min_secret_lifetime: Duration,
156156
}
157157

158+
impl<T> Default for CommonConfiguration<T>
159+
where
160+
T: Default,
161+
{
162+
fn default() -> Self {
163+
Self {
164+
config: T::default(),
165+
config_overrides: HashMap::default(),
166+
env_overrides: HashMap::default(),
167+
cli_overrides: BTreeMap::default(),
168+
pod_overrides: PodTemplateSpec::default(),
169+
min_secret_lifetime: Duration::from_secs(0),
170+
}
171+
}
172+
}
173+
158174
fn default_min_secret_lifetime() -> Duration {
159175
Duration::from_hours_unchecked(24)
160176
}

crates/stackable-operator/src/time/duration.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,14 +301,6 @@ impl Div<u32> for Duration {
301301
}
302302
}
303303

304-
/// This implementation is needed for `CommonConfiguration::min_secret_lifetime`.
305-
/// The default value is arbitrary and should probably not be assumed at call sites.
306-
impl Default for Duration {
307-
fn default() -> Self {
308-
Duration::from_hours_unchecked(1)
309-
}
310-
}
311-
312304
impl Duration {
313305
/// Creates a new [`Duration`] containing the amount of time passed since
314306
/// 1970-01-01 UTC. This can be used to calculate [`Duration`]s based on

0 commit comments

Comments
 (0)