Skip to content

Commit baf3653

Browse files
authored
fix(lambda-events): derive Default on various Events (#1022)
* fix(lambda-events): derive Default on various events * fix(lambda-events): format new code
1 parent 1447217 commit baf3653

File tree

26 files changed

+89
-76
lines changed

26 files changed

+89
-76
lines changed

lambda-events/src/encodings/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use serde::{
77
use std::ops::{Deref, DerefMut};
88

99
/// Timestamp with millisecond precision.
10-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
10+
#[derive(Clone, Default, Debug, Deserialize, Eq, PartialEq, Serialize)]
1111
pub struct MillisecondTimestamp(
1212
#[serde(deserialize_with = "deserialize_milliseconds")]
1313
#[serde(serialize_with = "serialize_milliseconds")]
@@ -73,7 +73,7 @@ impl DerefMut for SecondDuration {
7373
}
7474

7575
/// Duration with minute precision.
76-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
76+
#[derive(Clone, Default, Debug, Deserialize, Eq, PartialEq, Serialize)]
7777
pub struct MinuteDuration(
7878
#[serde(deserialize_with = "deserialize_duration_minutes")]
7979
#[serde(serialize_with = "serialize_duration_minutes")]

lambda-events/src/event/activemq/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::collections::HashMap;
55

66
use crate::custom_serde::deserialize_lambda_map;
77

8-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
8+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
99
#[serde(rename_all = "camelCase")]
1010
pub struct ActiveMqEvent {
1111
#[serde(default)]
@@ -22,7 +22,7 @@ pub struct ActiveMqEvent {
2222
pub other: serde_json::Map<String, Value>,
2323
}
2424

25-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
25+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
2626
#[serde(rename_all = "camelCase")]
2727
pub struct ActiveMqMessage {
2828
#[serde(default)]
@@ -59,7 +59,7 @@ pub struct ActiveMqMessage {
5959
pub other: serde_json::Map<String, Value>,
6060
}
6161

62-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
62+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
6363
#[serde(rename_all = "camelCase")]
6464
pub struct ActiveMqDestination {
6565
#[serde(default)]

lambda-events/src/event/autoscaling/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::collections::HashMap;
66
use crate::custom_serde::deserialize_lambda_map;
77

88
/// `AutoScalingEvent` struct is used to parse the json for auto scaling event types //
9-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
9+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
1010
#[serde(rename_all = "camelCase")]
1111
pub struct AutoScalingEvent<T1 = Value>
1212
where

lambda-events/src/event/chime_bot/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
33
#[cfg(feature = "catch-all-fields")]
44
use serde_json::Value;
55

6-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
6+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
77
#[serde(rename_all = "camelCase")]
88
pub struct ChimeBotEvent {
99
#[serde(rename = "Sender")]
@@ -28,7 +28,7 @@ pub struct ChimeBotEvent {
2828
pub other: serde_json::Map<String, Value>,
2929
}
3030

31-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
31+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
3232
#[serde(rename_all = "camelCase")]
3333
pub struct ChimeBotEventSender {
3434
#[serde(default)]
@@ -46,7 +46,7 @@ pub struct ChimeBotEventSender {
4646
pub other: serde_json::Map<String, Value>,
4747
}
4848

49-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
49+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
5050
#[serde(rename_all = "camelCase")]
5151
pub struct ChimeBotEventDiscussion {
5252
#[serde(default)]
@@ -64,7 +64,7 @@ pub struct ChimeBotEventDiscussion {
6464
pub other: serde_json::Map<String, Value>,
6565
}
6666

67-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
67+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
6868
#[serde(rename_all = "camelCase")]
6969
pub struct ChimeBotEventInboundHttpsEndpoint {
7070
#[serde(default)]

lambda-events/src/event/cloudformation/mod.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ where
1919
Delete(DeleteRequest<P2>),
2020
}
2121

22-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
22+
impl Default for CloudFormationCustomResourceRequest {
23+
fn default() -> Self {
24+
CloudFormationCustomResourceRequest::Create(CreateRequest::default())
25+
}
26+
}
27+
28+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
2329
#[serde(rename_all = "PascalCase")]
2430
pub struct CreateRequest<P2 = Value>
2531
where
@@ -99,7 +105,7 @@ where
99105
pub other: serde_json::Map<String, Value>,
100106
}
101107

102-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
108+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
103109
#[serde(rename_all = "PascalCase")]
104110
pub struct CloudFormationCustomResourceResponse {
105111
pub status: CloudFormationCustomResourceResponseStatus,
@@ -119,9 +125,10 @@ pub struct CloudFormationCustomResourceResponse {
119125
pub other: serde_json::Map<String, Value>,
120126
}
121127

122-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
128+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
123129
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
124130
pub enum CloudFormationCustomResourceResponseStatus {
131+
#[default]
125132
Success,
126133
Failed,
127134
}

lambda-events/src/event/cloudformation/provider.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ where
2222
Delete(DeleteRequest<P2>),
2323
}
2424

25-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
25+
impl Default for CloudFormationCustomResourceRequest {
26+
fn default() -> Self {
27+
CloudFormationCustomResourceRequest::Create(CreateRequest::default())
28+
}
29+
}
30+
31+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
2632
#[serde(rename_all = "PascalCase")]
2733
pub struct CreateRequest<P2 = Value>
2834
where
@@ -63,7 +69,7 @@ where
6369
// No `other` catch-all here; any additional fields will be caught in `common.other` instead
6470
}
6571

66-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
72+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
6773
#[serde(rename_all = "PascalCase")]
6874
pub struct CommonRequestParams<P2 = Value>
6975
where
@@ -84,7 +90,7 @@ where
8490
pub other: serde_json::Map<String, Value>,
8591
}
8692

87-
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, Default)]
93+
#[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize)]
8894
#[serde(rename_all = "PascalCase")]
8995
pub struct CloudFormationCustomResourceResponse<D = Value>
9096
where

lambda-events/src/event/cloudwatch_events/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub mod trustedadvisor;
2121

2222
/// `CloudWatchEvent` is the outer structure of an event sent via CloudWatch Events.
2323
/// For examples of events that come via CloudWatch Events, see <https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/EventTypes.html>
24-
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
24+
#[derive(Clone, Default, Debug, Deserialize, Eq, PartialEq, Serialize)]
2525
#[serde(rename_all = "camelCase")]
2626
pub struct CloudWatchEvent<T1 = Value>
2727
where

lambda-events/src/event/code_commit/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use serde_json::Value;
66
use crate::custom_serde::deserialize_nullish_boolean;
77

88
/// `CodeCommitEvent` represents a CodeCommit event
9-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
9+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
1010
#[serde(rename_all = "camelCase")]
1111
pub struct CodeCommitEvent {
1212
#[serde(rename = "Records")]

lambda-events/src/event/codebuild/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub type CodeBuildPhaseType = String;
1212

1313
/// `CodeBuildEvent` is documented at:
1414
/// <https://docs.aws.amazon.com/codebuild/latest/userguide/sample-build-notifications.html#sample-build-notifications-ref>
15-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
15+
#[derive(Debug, Default, Clone, PartialEq, Deserialize, Serialize)]
1616
#[serde(rename_all = "camelCase")]
1717
pub struct CodeBuildEvent {
1818
/// AccountID is the id of the AWS account from which the event originated.
@@ -54,7 +54,7 @@ pub struct CodeBuildEvent {
5454
}
5555

5656
/// `CodeBuildEventDetail` represents the all details related to the code build event
57-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
57+
#[derive(Debug, Default, Clone, PartialEq, Deserialize, Serialize)]
5858
#[serde(rename_all = "camelCase")]
5959
pub struct CodeBuildEventDetail {
6060
#[serde(rename = "build-status")]
@@ -101,7 +101,7 @@ pub struct CodeBuildEventDetail {
101101
}
102102

103103
/// `CodeBuildEventAdditionalInformation` represents additional information to the code build event
104-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
104+
#[derive(Debug, Default, Clone, PartialEq, Deserialize, Serialize)]
105105
#[serde(rename_all = "camelCase")]
106106
pub struct CodeBuildEventAdditionalInformation {
107107
pub artifact: CodeBuildArtifact,
@@ -133,7 +133,7 @@ pub struct CodeBuildEventAdditionalInformation {
133133
}
134134

135135
/// `CodeBuildArtifact` represents the artifact provided to build
136-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
136+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
137137
#[serde(rename_all = "camelCase")]
138138
pub struct CodeBuildArtifact {
139139
#[serde(default)]
@@ -154,7 +154,7 @@ pub struct CodeBuildArtifact {
154154
}
155155

156156
/// `CodeBuildEnvironment` represents the environment for a build
157-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
157+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
158158
#[serde(rename_all = "camelCase")]
159159
pub struct CodeBuildEnvironment {
160160
#[serde(default)]
@@ -200,7 +200,7 @@ pub struct CodeBuildEnvironmentVariable {
200200
}
201201

202202
/// `CodeBuildSource` represent the code source will be build
203-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
203+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
204204
#[serde(rename_all = "camelCase")]
205205
pub struct CodeBuildSource {
206206
#[serde(default)]
@@ -217,7 +217,7 @@ pub struct CodeBuildSource {
217217
}
218218

219219
/// `CodeBuildLogs` gives the log details of a code build
220-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
220+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
221221
#[serde(rename_all = "camelCase")]
222222
pub struct CodeBuildLogs {
223223
#[serde(default)]

lambda-events/src/event/codedeploy/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub type CodeDeployDeploymentState = String;
77

88
/// `CodeDeployEvent` is documented at:
99
/// <https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/EventTypes.html#acd_event_types>
10-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
10+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
1111
#[serde(rename_all = "camelCase")]
1212
pub struct CodeDeployEvent {
1313
/// AccountID is the id of the AWS account from which the event originated.
@@ -49,7 +49,7 @@ pub struct CodeDeployEvent {
4949
pub other: serde_json::Map<String, Value>,
5050
}
5151

52-
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
52+
#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
5353
#[serde(rename_all = "camelCase")]
5454
pub struct CodeDeployEventDetail {
5555
/// InstanceGroupID is the ID of the instance group.
@@ -81,7 +81,7 @@ pub struct CodeDeployEventDetail {
8181
pub other: serde_json::Map<String, Value>,
8282
}
8383

84-
#[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
84+
#[derive(Debug, Default, Clone, Deserialize, Serialize, Eq, PartialEq)]
8585
#[serde(rename_all = "PascalCase")]
8686
pub struct CodeDeployLifecycleEvent {
8787
pub deployment_id: String,

0 commit comments

Comments
 (0)