Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

New ScheduledV2Event implementation #480

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.

Sign up for GitHub

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

Open
peniakoff wants to merge 11 commits into
base: main
Choose a base branch
Loading
from
Open

New ScheduledV2Event implementation #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
41341c6
New ScheduledV2Event implementation
tomasz-miller May 6, 2024
dbda812
Test for ScheduledV2Event loader and update for LambdaEventSerializers
peniakoff May 7, 2024
1aad3e4
Unnecessary printing in the EventLoaderTest.java removed
peniakoff May 7, 2024
442ca30
Code review related update
peniakoff Jul 9, 2024
a24ac32
Merge remote-tracking branch 'origin/main' into develop
peniakoff Jul 9, 2024
d973523
Unnecessary methods deleted
peniakoff Jul 10, 2024
0149926
Update for documentation link and import
peniakoff Jul 10, 2024
e8852a0
Merge branch 'main' into develop
peniakoff Nov 27, 2024
a52db3a
Merge branch 'main' into develop
peniakoff Feb 17, 2025
5328f4b
Merge branch 'main' into develop
peniakoff May 22, 2025
9aa8dac
Merge branch 'main' into develop
peniakoff Jun 23, 2025
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
1 change: 1 addition & 0 deletions 1 aws-lambda-java-events/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
* `S3BatchResponse`
* `S3Event`
* `ScheduledEvent`
* `ScheduledV2Event`
* `SecretsManagerRotationEvent`
* `SimpleIAMPolicyResponse`
* `SNSEvent`
Expand Down
47 changes: 47 additions & 0 deletions 47 ...a-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ScheduledV2Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
Copy link
Contributor

@smirnoal smirnoal May 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please update the header to

/*
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazonaws.services.lambda.runtime.events;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.joda.time.DateTime;

import java.io.Serializable;
import java.util.List;

/**
* Represents a Scheduled V2 event sent to Lambda
* <a href="https://docs.aws.amazon.com/lambda/latest/dg/with-eventbridge-scheduler.html">Using Lambda with Amazon EventBridge Scheduler</a>
*/
@Data
@Builder(setterPrefix = "with")
@NoArgsConstructor
@AllArgsConstructor
public class ScheduledV2Event implements Serializable, Cloneable {
msailes marked this conversation as resolved.
Show resolved Hide resolved

private static final long serialVersionUID = -463442139623175611L;

private String version;

private String account;

private String region;

private String detail;
Copy link
Contributor

@msailes msailes Jun 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we (AWS) needs to validate that there will be no events where detail will be anything other than a String for scheduled task use cases.


private String detailType;

private String source;

private String id;

private DateTime time;

private List<String> resources;

}
7 changes: 7 additions & 0 deletions 7 ...a/com/amazonaws/services/lambda/runtime/events/APIGatewayV2CustomAuthorizerEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.amazonaws.services.lambda.runtime.events;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.util.Locale;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -12,6 +14,11 @@ public class APIGatewayV2CustomAuthorizerEventTest {
private static final long TIME_EPOCH = 1601306426515L;
private static final String TIME = "28/Sep/2020:15:14:43 +0000";

@BeforeAll
static void beforeAll() {
Locale.setDefault(new Locale("en", "US"));
Copy link
Contributor

@smirnoal smirnoal May 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for this

}

@Test
public void testEpochLongAsAnInstant() {
APIGatewayV2CustomAuthorizerEvent customAuthorizerEvent = APIGatewayV2CustomAuthorizerEvent.builder()
Expand Down
2 changes: 2 additions & 0 deletions 2 ...va/com/amazonaws/services/lambda/runtime/serialization/events/LambdaEventSerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public class LambdaEventSerializers {
KinesisTimeWindowEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ScheduledEvent",
ScheduledEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ScheduledV2Event",
ScheduledEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SecretsManagerRotationEvent",
SecretsManagerRotationEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SNSEvent",
Expand Down
9 changes: 6 additions & 3 deletions 9 ...bda-java-tests/src/main/java/com/amazonaws/services/lambda/runtime/tests/EventLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
package com.amazonaws.services.lambda.runtime.tests;

import com.amazonaws.services.lambda.runtime.events.*;
import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
import com.amazonaws.services.lambda.runtime.serialization.events.LambdaEventSerializers;

import java.io.*;
peniakoff marked this conversation as resolved.
Show resolved Hide resolved

import com.amazonaws.services.lambda.runtime.events.*;

/**
* Load events from json files and serialize them in Events
*/
Expand Down Expand Up @@ -117,6 +116,10 @@ public static ScheduledEvent loadScheduledEvent(String filename) {
return loadEvent(filename, ScheduledEvent.class);
}

public static ScheduledV2Event loadScheduledV2Event(String filename) {
return loadEvent(filename, ScheduledV2Event.class);
}

public static SNSEvent loadSNSEvent(String filename) {
return loadEvent(filename, SNSEvent.class);
}
Expand Down Expand Up @@ -147,7 +150,7 @@ public static <T> T loadEvent(String filename, Class<T> targetClass) {
}
if (stream == null) {
try {
stream = new FileInputStream(new File(filename));
stream = new FileInputStream(filename);
} catch (FileNotFoundException e) {
throw new EventLoadingException("Cannot load " + filename, e);
}
Expand Down
23 changes: 20 additions & 3 deletions 23 ...java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.amazonaws.services.lambda.runtime.events.SNSEvent;
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
import com.amazonaws.services.lambda.runtime.events.ScheduledV2Event;
import com.amazonaws.services.lambda.runtime.events.SecretsManagerRotationEvent;
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.AttributeValue;
import com.amazonaws.services.lambda.runtime.events.models.dynamodb.Record;
Expand All @@ -40,13 +41,12 @@
import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

import static java.time.Instant.ofEpochSecond;
import static org.assertj.core.api.Assertions.*;


public class EventLoaderTest {

@Test
Expand Down Expand Up @@ -408,6 +408,23 @@ public void testLoadRabbitMQEvent() {
assertThat((Integer) headers.get("numberInHeader")).isEqualTo(10);
}

@Test
public void testLoadScheduledV2Event() {
msailes marked this conversation as resolved.
Show resolved Hide resolved
ScheduledV2Event event = EventLoader.loadScheduledV2Event("scheduler_event.json");

assertThat(event).isNotNull();
assertThat(event.getVersion()).isEqualTo("0");
assertThat(event.getId()).isEqualTo("4e6638b7-b892-4482-9762-8c58d4e71ecc");
assertThat(event.getDetailType()).isEqualTo("Scheduled Event");
assertThat(event.getSource()).isEqualTo("aws.scheduler");
assertThat(event.getAccount()).isEqualTo("123456789012");
assertThat(event.getTime()).isEqualTo(DateTime.parse("2024-05-07T15:58:34Z"));
assertThat(event.getRegion()).isEqualTo("eu-central-1");
assertThat(event.getResources()).isNotEmpty();
assertThat(event.getResources()).isEqualTo(Collections.singletonList("arn:aws:scheduler:eu-central-1:123456789012:schedule/default/demoschedule"));
assertThat(event.getDetail()).isEqualTo("{}");
}

@Test
public void testLoadCognitoUserPoolPreTokenGenerationEventV2() {
CognitoUserPoolPreTokenGenerationEventV2 event = EventLoader.loadCognitoUserPoolPreTokenGenerationEventV2("cognito_user_pool_pre_token_generation_event_v2.json");
Expand Down
13 changes: 13 additions & 0 deletions 13 aws-lambda-java-tests/src/test/resources/scheduler_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "0",
"id": "4e6638b7-b892-4482-9762-8c58d4e71ecc",
"detail-type": "Scheduled Event",
"source": "aws.scheduler",
"account": "123456789012",
"time": "2024-05-07T15:58:34Z",
"region": "eu-central-1",
"resources": [
"arn:aws:scheduler:eu-central-1:123456789012:schedule/default/demoschedule"
],
"detail": "{}"
}
Morty Proxy This is a proxified and sanitized view of the page, visit original site.