Skip to content
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

Fix NPE when user identity is null for SDK v1 #264

Merged
merged 3 commits into from
Sep 2, 2021
Merged

Fix NPE when user identity is null for SDK v1 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
badf783
Fix NPE when user identity is null for SDK v1
nikrush13 Jul 31, 2021
7e45969
Null check for OldImage and NewImage in dynamo stream record
nikrush13 Aug 3, 2021
cb36c72
Merge branch 'master' into master
nikrush13 Sep 1, 2021
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
4 changes: 3 additions & 1 deletion ...ws/services/lambda/runtime/events/transformers/v1/dynamodb/DynamodbRecordTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ public static Record toRecordV1(final DynamodbEvent.DynamodbStreamRecord record)
.withEventSource(record.getEventSource())
.withEventVersion(record.getEventVersion())
.withUserIdentity(
DynamodbIdentityTransformer.toIdentityV1(record.getUserIdentity())
record.getUserIdentity() != null
? DynamodbIdentityTransformer.toIdentityV1(record.getUserIdentity())
: null
);
}
}
8 changes: 6 additions & 2 deletions ...vices/lambda/runtime/events/transformers/v1/dynamodb/DynamodbStreamRecordTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ public static StreamRecord toStreamRecordV1(final com.amazonaws.services.lambda.
DynamodbAttributeValueTransformer.toAttributeValueMapV1(streamRecord.getKeys())
)
.withNewImage(
DynamodbAttributeValueTransformer.toAttributeValueMapV1(streamRecord.getNewImage())
streamRecord.getNewImage() != null
? DynamodbAttributeValueTransformer.toAttributeValueMapV1(streamRecord.getNewImage())
: null
)
.withOldImage(
DynamodbAttributeValueTransformer.toAttributeValueMapV1(streamRecord.getOldImage())
streamRecord.getOldImage() != null
? DynamodbAttributeValueTransformer.toAttributeValueMapV1(streamRecord.getOldImage())
: null
)
.withSequenceNumber(streamRecord.getSequenceNumber())
.withSizeBytes(streamRecord.getSizeBytes())
Expand Down
11 changes: 11 additions & 0 deletions ...ervices/lambda/runtime/events/transformers/v1/dynamodb/DynamodbRecordTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.amazonaws.services.dynamodbv2.model.OperationType;
import com.amazonaws.services.dynamodbv2.model.Record;
import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
import com.amazonaws.services.lambda.runtime.events.transformers.v1.DynamodbEventTransformer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -49,4 +50,14 @@ public void testToRecordV1() {
Assertions.assertEquals(record_v1, convertedRecord);
}

@Test
public void testToRecordV1WhenUserIdentityIsNull() {
DynamodbEvent.DynamodbStreamRecord record = record_event.clone();
record.setUserIdentity(null);

Assertions.assertDoesNotThrow(() -> {
com.amazonaws.services.lambda.runtime.events.transformers.v1.dynamodb.DynamodbRecordTransformer.toRecordV1(record);
});
}

}
20 changes: 20 additions & 0 deletions ...s/lambda/runtime/events/transformers/v1/dynamodb/DynamodbStreamRecordTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,24 @@ public void testToStreamRecordV1() {
StreamRecord convertedStreamRecord = DynamodbStreamRecordTransformer.toStreamRecordV1(streamRecord_event);
Assertions.assertEquals(streamRecord_v1, convertedStreamRecord);
}

@Test
public void testToStreamRecordV1WhenOldImageIsNull() {
com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord streamRecord = streamRecord_event.clone();
streamRecord.setOldImage(null);

Assertions.assertDoesNotThrow(() -> {
com.amazonaws.services.lambda.runtime.events.transformers.v1.dynamodb.DynamodbStreamRecordTransformer.toStreamRecordV1(streamRecord);
});
}

@Test
public void testToStreamRecordV1WhenNewImageIsNull() {
com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord streamRecord = streamRecord_event.clone();
streamRecord.setNewImage(null);

Assertions.assertDoesNotThrow(() -> {
com.amazonaws.services.lambda.runtime.events.transformers.v1.dynamodb.DynamodbStreamRecordTransformer.toStreamRecordV1(streamRecord);
});
}
}