Skip to content

fix(lambda-events): impl Default for all Kinesis Event structs #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lambda-events/src/encodings/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl DerefMut for MillisecondTimestamp {
}

/// Timestamp with second precision.
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
pub struct SecondTimestamp(
#[serde(deserialize_with = "deserialize_seconds")]
#[serde(serialize_with = "serialize_seconds")]
Expand Down
18 changes: 12 additions & 6 deletions lambda-events/src/event/kinesis/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct KinesisEvent {

/// `KinesisTimeWindowEvent` represents an Amazon Dynamodb event when using time windows
/// ref. <https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html#services-kinesis-windows>
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct KinesisTimeWindowEvent {
#[serde(rename = "KinesisEvent")]
Expand All @@ -34,7 +34,7 @@ pub struct KinesisTimeWindowEventResponse {
// pub batch_item_failures: Vec<KinesisBatchItemFailure>,
}

#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct KinesisEventRecord {
/// nolint: stylecheck
Expand All @@ -59,7 +59,7 @@ pub struct KinesisEventRecord {
pub kinesis: KinesisRecord,
}

#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct KinesisRecord {
pub approximate_arrival_timestamp: SecondTimestamp,
Expand Down Expand Up @@ -110,10 +110,16 @@ mod test {
assert_eq!(parsed, reparsed);
}

/// `cargo lambda init` autogenerates code that relies on `Default` being implemented for event structs.
///
/// This test validates that `Default` is implemented for each KinesisEvent struct.
#[test]
#[cfg(feature = "kinesis")]
fn default_kinesis_event() {
let event = KinesisEvent::default();
assert_eq!(event.records, vec![]);
fn test_ensure_default_implemented_for_structs() {
let _kinesis_event = KinesisEvent::default();
let _kinesis_time_window_event = KinesisTimeWindowEvent::default();
let _kinesis_event_record = KinesisEventRecord::default();
let _kinesis_record = KinesisRecord::default();
let _kinesis_encryption_type = KinesisEncryptionType::default();
}
}