Skip to content

Commit 05827e0

Browse files
msailesmsailes
committed
Separated the events to two different Java classes
Moved the tests to the test module
1 parent 5c53c44 commit 05827e0

File tree

8 files changed

+388
-2
lines changed

8 files changed

+388
-2
lines changed

Diff for: ‎aws-lambda-java-events/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
* `AppSyncLambdaAuthorizerResponse`
1717
* `CloudFormationCustomResourceEvent`
1818
* `CloudFrontEvent`
19+
* `CloudWatchCompositeAlarmEvent`
1920
* `CloudWatchLogsEvent`
21+
* `CloudWatchMetricAlarmEvent`
2022
* `CodeCommitEvent`
2123
* `CognitoEvent`
2224
* `CognitoUserPoolCreateAuthChallengeEvent`

Diff for: ‎aws-lambda-java-events/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
<maven.compiler.target>1.8</maven.compiler.target>
3737
<lombok.version>1.18.22</lombok.version>
38+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3840
</properties>
3941

4042
<distributionManagement>

Diff for: ‎aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CloudWatchCompositeAlarmEvent.java

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package com.amazonaws.services.lambda.runtime.events;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import lombok.NoArgsConstructor;
7+
8+
/**
9+
* Represents an CloudWatch Composite Alarm event. This event occurs when a composite alarm is triggered.
10+
*
11+
* @see <a href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#alarms-and-actions">Using Amazon CloudWatch alarms</a>
12+
*/
13+
@Data
14+
@Builder(setterPrefix = "with")
15+
@NoArgsConstructor
16+
@AllArgsConstructor
17+
public class CloudWatchCompositeAlarmEvent {
18+
private String source;
19+
private String alarmArn;
20+
private String accountId;
21+
private String time;
22+
private String region;
23+
private AlarmData alarmData;
24+
25+
@Data
26+
@Builder(setterPrefix = "with")
27+
@NoArgsConstructor
28+
@AllArgsConstructor
29+
public static class AlarmData {
30+
private String alarmName;
31+
private State state;
32+
private PreviousState previousState;
33+
private Configuration configuration;
34+
}
35+
36+
@Data
37+
@Builder(setterPrefix = "with")
38+
@NoArgsConstructor
39+
@AllArgsConstructor
40+
public static class State {
41+
private String value;
42+
private String reason;
43+
private String reasonData;
44+
private String timestamp;
45+
}
46+
47+
@Data
48+
@Builder(setterPrefix = "with")
49+
@NoArgsConstructor
50+
@AllArgsConstructor
51+
public static class PreviousState {
52+
private String value;
53+
private String reason;
54+
private String reasonData;
55+
private String timestamp;
56+
private String actionsSuppressedBy;
57+
private String actionsSuppressedReason;
58+
}
59+
60+
@Data
61+
@Builder(setterPrefix = "with")
62+
@NoArgsConstructor
63+
@AllArgsConstructor
64+
public static class Configuration {
65+
private String alarmRule;
66+
private String actionsSuppressor;
67+
private Integer actionsSuppressorWaitPeriod;
68+
private Integer actionsSuppressorExtensionPeriod;
69+
}
70+
}

Diff for: ‎aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CloudWatchMetricAlarmEvent.java

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
package com.amazonaws.services.lambda.runtime.events;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import lombok.NoArgsConstructor;
7+
8+
import java.util.List;
9+
import java.util.Map;
10+
11+
/**
12+
* Represents an CloudWatch Metric Alarm event. This event occurs when a metric alarm is triggered.
13+
*
14+
* @see <a href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#alarms-and-actions">Using Amazon CloudWatch alarms</a>
15+
*/
16+
@Data
17+
@Builder(setterPrefix = "with")
18+
@NoArgsConstructor
19+
@AllArgsConstructor
20+
public class CloudWatchMetricAlarmEvent {
21+
private String source;
22+
private String alarmArn;
23+
private String accountId;
24+
private String time;
25+
private String region;
26+
private AlarmData alarmData;
27+
28+
@Data
29+
@Builder(setterPrefix = "with")
30+
@NoArgsConstructor
31+
@AllArgsConstructor
32+
public static class AlarmData {
33+
private String alarmName;
34+
private State state;
35+
private PreviousState previousState;
36+
private Configuration configuration;
37+
}
38+
39+
@Data
40+
@Builder(setterPrefix = "with")
41+
@NoArgsConstructor
42+
@AllArgsConstructor
43+
public static class State {
44+
private String value;
45+
private String reason;
46+
private String timestamp;
47+
}
48+
49+
@Data
50+
@Builder(setterPrefix = "with")
51+
@NoArgsConstructor
52+
@AllArgsConstructor
53+
public static class PreviousState {
54+
private String value;
55+
private String reason;
56+
private String reasonData;
57+
private String timestamp;
58+
}
59+
60+
@Data
61+
@Builder(setterPrefix = "with")
62+
@NoArgsConstructor
63+
@AllArgsConstructor
64+
public static class Configuration {
65+
private String description;
66+
private List<Metric> metrics;
67+
}
68+
69+
@Data
70+
@Builder(setterPrefix = "with")
71+
@NoArgsConstructor
72+
@AllArgsConstructor
73+
public static class Metric {
74+
private String id;
75+
private MetricStat metricStat;
76+
private Boolean returnData;
77+
}
78+
79+
@Data
80+
@Builder(setterPrefix = "with")
81+
@NoArgsConstructor
82+
@AllArgsConstructor
83+
public static class MetricStat {
84+
private MetricDetail metric;
85+
private Integer period;
86+
private String stat;
87+
private String unit;
88+
}
89+
90+
@Data
91+
@Builder(setterPrefix = "with")
92+
@NoArgsConstructor
93+
@AllArgsConstructor
94+
public static class MetricDetail {
95+
private String namespace;
96+
private String name;
97+
private Map<String, String> dimensions;
98+
}
99+
}

Diff for: ‎aws-lambda-java-tests/src/main/java/com/amazonaws/services/lambda/runtime/tests/EventLoader.java

+8
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,18 @@ public static CloudFrontEvent loadCloudFrontEvent(String filename) {
4545
return loadEvent(filename, CloudFrontEvent.class);
4646
}
4747

48+
public static CloudWatchCompositeAlarmEvent loadCloudWatchCompositeAlarmEvent(String filename) {
49+
return loadEvent(filename, CloudWatchCompositeAlarmEvent.class);
50+
}
51+
4852
public static CloudWatchLogsEvent loadCloudWatchLogsEvent(String filename) {
4953
return loadEvent(filename, CloudWatchLogsEvent.class);
5054
}
5155

56+
public static CloudWatchMetricAlarmEvent loadCloudWatchMetricAlarmEvent(String filename) {
57+
return loadEvent(filename, CloudWatchMetricAlarmEvent.class);
58+
}
59+
5260
public static CodeCommitEvent loadCodeCommitEvent(String filename) {
5361
return loadEvent(filename, CodeCommitEvent.class);
5462
}

Diff for: ‎aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java

+135-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
/* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
22
package com.amazonaws.services.lambda.runtime.tests;
33

4+
import com.amazonaws.services.lambda.runtime.events.APIGatewayCustomAuthorizerEvent;
5+
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
6+
import com.amazonaws.services.lambda.runtime.events.APIGatewayV2CustomAuthorizerEvent;
7+
import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
8+
import com.amazonaws.services.lambda.runtime.events.ActiveMQEvent;
9+
import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerRequestEvent;
10+
import com.amazonaws.services.lambda.runtime.events.CloudFormationCustomResourceEvent;
11+
import com.amazonaws.services.lambda.runtime.events.CloudFrontEvent;
12+
import com.amazonaws.services.lambda.runtime.events.CloudWatchCompositeAlarmEvent;
13+
import com.amazonaws.services.lambda.runtime.events.CloudWatchCompositeAlarmEvent.AlarmData;
14+
import com.amazonaws.services.lambda.runtime.events.CloudWatchCompositeAlarmEvent.Configuration;
15+
import com.amazonaws.services.lambda.runtime.events.CloudWatchCompositeAlarmEvent.PreviousState;
16+
import com.amazonaws.services.lambda.runtime.events.CloudWatchCompositeAlarmEvent.State;
17+
import com.amazonaws.services.lambda.runtime.events.CloudWatchLogsEvent;
18+
import com.amazonaws.services.lambda.runtime.events.CloudWatchMetricAlarmEvent;
19+
import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent;
20+
import com.amazonaws.services.lambda.runtime.events.CognitoUserPoolPreTokenGenerationEventV2;
21+
import com.amazonaws.services.lambda.runtime.events.ConfigEvent;
22+
import com.amazonaws.services.lambda.runtime.events.ConnectEvent;
23+
import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
24+
import com.amazonaws.services.lambda.runtime.events.KafkaEvent;
25+
import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
26+
import com.amazonaws.services.lambda.runtime.events.KinesisFirehoseEvent;
27+
import com.amazonaws.services.lambda.runtime.events.LambdaDestinationEvent;
28+
import com.amazonaws.services.lambda.runtime.events.LexEvent;
29+
import com.amazonaws.services.lambda.runtime.events.RabbitMQEvent;
30+
import com.amazonaws.services.lambda.runtime.events.S3Event;
31+
import com.amazonaws.services.lambda.runtime.events.SNSEvent;
32+
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
33+
import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
34+
import com.amazonaws.services.lambda.runtime.events.SecretsManagerRotationEvent;
435
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.AttributeValue;
536
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.Record;
637
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord;
@@ -15,8 +46,6 @@
1546
import static java.time.Instant.ofEpochSecond;
1647
import static org.assertj.core.api.Assertions.*;
1748

18-
import com.amazonaws.services.lambda.runtime.events.*;
19-
2049
public class EventLoaderTest {
2150

2251
@Test
@@ -376,4 +405,108 @@ public void testLoadCognitoUserPoolPreTokenGenerationEventV2() {
376405
String[] requestScopes = request.getScopes();
377406
assertThat("aws.cognito.signin.user.admin").isEqualTo(requestScopes[0]);
378407
}
408+
409+
@Test
410+
public void testCloudWatchCompositeAlarmEvent() {
411+
CloudWatchCompositeAlarmEvent event = EventLoader.loadCloudWatchCompositeAlarmEvent("cloudwatch_composite_alarm.json");
412+
assertThat(event).isNotNull();
413+
assertThat(event)
414+
.returns("aws.cloudwatch", from(CloudWatchCompositeAlarmEvent::getSource))
415+
.returns("arn:aws:cloudwatch:us-east-1:111122223333:alarm:SuppressionDemo.Main", from(CloudWatchCompositeAlarmEvent::getAlarmArn))
416+
.returns("111122223333", from(CloudWatchCompositeAlarmEvent::getAccountId))
417+
.returns("2023-08-04T12:56:46.138+0000", from(CloudWatchCompositeAlarmEvent::getTime))
418+
.returns("us-east-1", from(CloudWatchCompositeAlarmEvent::getRegion));
419+
420+
AlarmData alarmData = event.getAlarmData();
421+
assertThat(alarmData).isNotNull();
422+
assertThat(alarmData)
423+
.returns("CompositeDemo.Main", from(AlarmData::getAlarmName));
424+
425+
State state = alarmData.getState();
426+
assertThat(state).isNotNull();
427+
assertThat(state)
428+
.returns("ALARM", from(State::getValue))
429+
.returns("arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild transitioned to ALARM at Friday 04 August, 2023 12:54:46 UTC", from(State::getReason))
430+
.returns("{\"triggeringAlarms\":[{\"arn\":\"arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild\",\"state\":{\"value\":\"ALARM\",\"timestamp\":\"2023-08-04T12:54:46.138+0000\"}}]}", from(State::getReasonData))
431+
.returns("2023-08-04T12:56:46.138+0000", from(State::getTimestamp));
432+
433+
PreviousState previousState = alarmData.getPreviousState();
434+
assertThat(previousState).isNotNull();
435+
assertThat(previousState)
436+
.returns("ALARM", from(PreviousState::getValue))
437+
.returns("arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild transitioned to ALARM at Friday 04 August, 2023 12:54:46 UTC", from(PreviousState::getReason))
438+
.returns("{\"triggeringAlarms\":[{\"arn\":\"arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild\",\"state\":{\"value\":\"ALARM\",\"timestamp\":\"2023-08-04T12:54:46.138+0000\"}}]}", from(PreviousState::getReasonData))
439+
.returns("2023-08-04T12:54:46.138+0000", from(PreviousState::getTimestamp))
440+
.returns("WaitPeriod", from(PreviousState::getActionsSuppressedBy))
441+
.returns("Actions suppressed by WaitPeriod", from(PreviousState::getActionsSuppressedReason));
442+
443+
Configuration configuration = alarmData.getConfiguration();
444+
assertThat(configuration).isNotNull();
445+
assertThat(configuration)
446+
.returns("ALARM(CompositeDemo.FirstChild) OR ALARM(CompositeDemo.SecondChild)", from(Configuration::getAlarmRule))
447+
.returns("CompositeDemo.ActionsSuppressor", from(Configuration::getActionsSuppressor))
448+
.returns(120, from(Configuration::getActionsSuppressorWaitPeriod))
449+
.returns(180, from(Configuration::getActionsSuppressorExtensionPeriod));
450+
}
451+
452+
@Test
453+
public void testCloudWatchMetricAlarmEvent() {
454+
CloudWatchMetricAlarmEvent event = EventLoader.loadCloudWatchMetricAlarmEvent("cloudwatch_metric_alarm.json");
455+
assertThat(event).isNotNull();
456+
assertThat(event)
457+
.returns("aws.cloudwatch", from(CloudWatchMetricAlarmEvent::getSource))
458+
.returns("arn:aws:cloudwatch:us-east-1:444455556666:alarm:lambda-demo-metric-alarm", from(CloudWatchMetricAlarmEvent::getAlarmArn))
459+
.returns("444455556666", from(CloudWatchMetricAlarmEvent::getAccountId))
460+
.returns("2023-08-04T12:36:15.490+0000", from(CloudWatchMetricAlarmEvent::getTime))
461+
.returns("us-east-1", from(CloudWatchMetricAlarmEvent::getRegion));
462+
463+
CloudWatchMetricAlarmEvent.AlarmData alarmData = event.getAlarmData();
464+
assertThat(alarmData).isNotNull();
465+
assertThat(alarmData)
466+
.returns("lambda-demo-metric-alarm", from(CloudWatchMetricAlarmEvent.AlarmData::getAlarmName));
467+
468+
CloudWatchMetricAlarmEvent.State state = alarmData.getState();
469+
assertThat(state).isNotNull();
470+
assertThat(state)
471+
.returns("ALARM", from(CloudWatchMetricAlarmEvent.State::getValue))
472+
.returns("test", from(CloudWatchMetricAlarmEvent.State::getReason))
473+
.returns("2023-08-04T12:36:15.490+0000", from(CloudWatchMetricAlarmEvent.State::getTimestamp));
474+
475+
CloudWatchMetricAlarmEvent.PreviousState previousState = alarmData.getPreviousState();
476+
assertThat(previousState).isNotNull();
477+
assertThat(previousState)
478+
.returns("INSUFFICIENT_DATA", from(CloudWatchMetricAlarmEvent.PreviousState::getValue))
479+
.returns("Insufficient Data: 5 datapoints were unknown.", from(CloudWatchMetricAlarmEvent.PreviousState::getReason))
480+
.returns("{\"version\":\"1.0\",\"queryDate\":\"2023-08-04T12:31:29.591+0000\",\"statistic\":\"Average\",\"period\":60,\"recentDatapoints\":[],\"threshold\":5.0,\"evaluatedDatapoints\":[{\"timestamp\":\"2023-08-04T12:30:00.000+0000\"},{\"timestamp\":\"2023-08-04T12:29:00.000+0000\"},{\"timestamp\":\"2023-08-04T12:28:00.000+0000\"},{\"timestamp\":\"2023-08-04T12:27:00.000+0000\"},{\"timestamp\":\"2023-08-04T12:26:00.000+0000\"}]}", from(CloudWatchMetricAlarmEvent.PreviousState::getReasonData))
481+
.returns("2023-08-04T12:31:29.595+0000", from(CloudWatchMetricAlarmEvent.PreviousState::getTimestamp));
482+
483+
CloudWatchMetricAlarmEvent.Configuration configuration = alarmData.getConfiguration();
484+
assertThat(configuration).isNotNull();
485+
assertThat(configuration)
486+
.returns("Metric Alarm to test Lambda actions", from(CloudWatchMetricAlarmEvent.Configuration::getDescription));
487+
488+
List<CloudWatchMetricAlarmEvent.Metric> metrics = configuration.getMetrics();
489+
assertThat(metrics).hasSize(1);
490+
CloudWatchMetricAlarmEvent.Metric metric = metrics.get(0);
491+
assertThat(metric)
492+
.returns("1234e046-06f0-a3da-9534-EXAMPLEe4c", from(CloudWatchMetricAlarmEvent.Metric::getId));
493+
494+
CloudWatchMetricAlarmEvent.MetricStat metricStat = metric.getMetricStat();
495+
assertThat(metricStat).isNotNull();
496+
assertThat(metricStat)
497+
.returns(60, from(CloudWatchMetricAlarmEvent.MetricStat::getPeriod))
498+
.returns("Average", from(CloudWatchMetricAlarmEvent.MetricStat::getStat))
499+
.returns("Percent", from(CloudWatchMetricAlarmEvent.MetricStat::getUnit));
500+
501+
CloudWatchMetricAlarmEvent.MetricDetail metricDetail = metricStat.getMetric();
502+
assertThat(metricDetail).isNotNull();
503+
assertThat(metricDetail)
504+
.returns("AWS/Logs", from(CloudWatchMetricAlarmEvent.MetricDetail::getNamespace))
505+
.returns("CallCount", from(CloudWatchMetricAlarmEvent.MetricDetail::getName));
506+
507+
Map<String, String> dimensions = metricDetail.getDimensions();
508+
assertThat(dimensions).isNotEmpty().hasSize(1);
509+
assertThat(dimensions)
510+
.contains(entry("InstanceId", "i-12345678"));
511+
}
379512
}

Diff for: ‎aws-lambda-java-tests/src/test/resources/cloudwatch_composite_alarm.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"source": "aws.cloudwatch",
3+
"alarmArn": "arn:aws:cloudwatch:us-east-1:111122223333:alarm:SuppressionDemo.Main",
4+
"accountId": "111122223333",
5+
"time": "2023-08-04T12:56:46.138+0000",
6+
"region": "us-east-1",
7+
"alarmData": {
8+
"alarmName": "CompositeDemo.Main",
9+
"state": {
10+
"value": "ALARM",
11+
"reason": "arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild transitioned to ALARM at Friday 04 August, 2023 12:54:46 UTC",
12+
"reasonData": "{\"triggeringAlarms\":[{\"arn\":\"arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild\",\"state\":{\"value\":\"ALARM\",\"timestamp\":\"2023-08-04T12:54:46.138+0000\"}}]}",
13+
"timestamp": "2023-08-04T12:56:46.138+0000"
14+
},
15+
"previousState": {
16+
"value": "ALARM",
17+
"reason": "arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild transitioned to ALARM at Friday 04 August, 2023 12:54:46 UTC",
18+
"reasonData": "{\"triggeringAlarms\":[{\"arn\":\"arn:aws:cloudwatch:us-east-1:111122223333:alarm:CompositeDemo.FirstChild\",\"state\":{\"value\":\"ALARM\",\"timestamp\":\"2023-08-04T12:54:46.138+0000\"}}]}",
19+
"timestamp": "2023-08-04T12:54:46.138+0000",
20+
"actionsSuppressedBy": "WaitPeriod",
21+
"actionsSuppressedReason": "Actions suppressed by WaitPeriod"
22+
},
23+
"configuration": {
24+
"alarmRule": "ALARM(CompositeDemo.FirstChild) OR ALARM(CompositeDemo.SecondChild)",
25+
"actionsSuppressor": "CompositeDemo.ActionsSuppressor",
26+
"actionsSuppressorWaitPeriod": 120,
27+
"actionsSuppressorExtensionPeriod": 180
28+
}
29+
}
30+
}

0 commit comments

Comments
 (0)