Skip to content

Commit ebcaaf5

Browse files
authored
aws: Add const for ONE_DAY_IN_SECONDS (#6871)
This was being repeated in a bunch of places so we should probably just have a constant for it. Follow up to @malfet's comment on #6870 Signed-off-by: Eli Uriegas <[email protected]>
1 parent e071937 commit ebcaaf5

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

aws/tools/cleanup-ssm/src/filter.rs

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub fn filter_old_parameters<T: TimeProvider>(
3434
#[cfg(test)]
3535
mod tests {
3636
use super::*;
37+
use crate::ONE_DAY_IN_SECONDS;
3738
use aws_sdk_ssm::types::ParameterMetadata;
3839
use aws_smithy_types::DateTime as AwsDateTime;
3940
use chrono::{DateTime, Utc};
@@ -59,7 +60,8 @@ mod tests {
5960
let parameters = vec![];
6061
let time_provider = MockTimeProvider::new(Utc::now());
6162

62-
let result = filter_old_parameters(&parameters, &time_provider, 86400.0, ".*").unwrap(); // 1 day in seconds
63+
let result =
64+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS, ".*").unwrap();
6365

6466
assert_eq!(result.len(), 0);
6567
}
@@ -77,7 +79,8 @@ mod tests {
7779
let time_provider = MockTimeProvider::new(now);
7880
let parameters = vec![parameter];
7981

80-
let result = filter_old_parameters(&parameters, &time_provider, 86400.0, ".*").unwrap(); // 1 day in seconds
82+
let result =
83+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS, ".*").unwrap();
8184

8285
assert_eq!(result.len(), 0);
8386
}
@@ -95,7 +98,8 @@ mod tests {
9598
let time_provider = MockTimeProvider::new(now);
9699
let parameters = vec![parameter];
97100

98-
let result = filter_old_parameters(&parameters, &time_provider, 86400.0, ".*").unwrap(); // 1 day in seconds
101+
let result =
102+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS, ".*").unwrap();
99103

100104
assert_eq!(result.len(), 1);
101105
assert_eq!(result[0], "old-param");
@@ -120,7 +124,9 @@ mod tests {
120124
let time_provider = MockTimeProvider::new(now);
121125
let parameters = vec![old_parameter, recent_parameter];
122126

123-
let result = filter_old_parameters(&parameters, &time_provider, 172800.0, ".*").unwrap(); // 2 days in seconds
127+
let result =
128+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS * 2.0, ".*")
129+
.unwrap();
124130

125131
assert_eq!(result.len(), 1);
126132
assert_eq!(result[0], "old-param");
@@ -135,7 +141,8 @@ mod tests {
135141
let time_provider = MockTimeProvider::new(Utc::now());
136142
let parameters = vec![parameter];
137143

138-
let result = filter_old_parameters(&parameters, &time_provider, 86400.0, ".*").unwrap(); // 1 day in seconds
144+
let result =
145+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS, ".*").unwrap();
139146

140147
assert_eq!(result.len(), 0);
141148
}
@@ -152,7 +159,8 @@ mod tests {
152159
let time_provider = MockTimeProvider::new(now);
153160
let parameters = vec![parameter];
154161

155-
let result = filter_old_parameters(&parameters, &time_provider, 86400.0, ".*").unwrap(); // 1 day in seconds
162+
let result =
163+
filter_old_parameters(&parameters, &time_provider, ONE_DAY_IN_SECONDS, ".*").unwrap();
156164

157165
assert_eq!(result.len(), 0);
158166
}
@@ -175,8 +183,13 @@ mod tests {
175183
let time_provider = MockTimeProvider::new(now);
176184
let parameters = vec![matching_parameter, non_matching_parameter];
177185

178-
let result =
179-
filter_old_parameters(&parameters, &time_provider, 86400.0, "gh-ci-i-.*").unwrap(); // 1 day in seconds
186+
let result = filter_old_parameters(
187+
&parameters,
188+
&time_provider,
189+
ONE_DAY_IN_SECONDS,
190+
"gh-ci-i-.*",
191+
)
192+
.unwrap();
180193

181194
assert_eq!(result.len(), 1);
182195
assert_eq!(result[0], "gh-ci-i-test-param");
@@ -195,8 +208,13 @@ mod tests {
195208
let time_provider = MockTimeProvider::new(now);
196209
let parameters = vec![parameter];
197210

198-
let result =
199-
filter_old_parameters(&parameters, &time_provider, 86400.0, "gh-ci-i-.*").unwrap(); // 1 day in seconds
211+
let result = filter_old_parameters(
212+
&parameters,
213+
&time_provider,
214+
ONE_DAY_IN_SECONDS,
215+
"gh-ci-i-.*",
216+
)
217+
.unwrap();
200218

201219
assert_eq!(result.len(), 0);
202220
}

aws/tools/cleanup-ssm/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use aws_sdk_ssm::types::ParameterMetadata;
22
use chrono::{DateTime, Utc};
33

4+
pub const ONE_DAY_IN_SECONDS: f64 = 86400.0;
5+
46
#[derive(Debug)]
57
pub enum CleanupError {
68
Aws(aws_sdk_ssm::Error),
@@ -166,7 +168,7 @@ mod tests {
166168
let config = CleanupConfig {
167169
region: "us-east-1".to_string(),
168170
dry_run: true,
169-
older_than_seconds: 86400.0, // 1 day in seconds
171+
older_than_seconds: ONE_DAY_IN_SECONDS,
170172
pattern: ".*".to_string(),
171173
};
172174

0 commit comments

Comments
 (0)