Light, fluffy, and always free - The AWS Local Emulator alternative
feat: support DynamoDB UPDATED_OLD and UPDATED_NEW ReturnValues (#477)
bkindersleytrulioo3ebff5a701fc
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.javaindex 0af3a2501d..198af1fc16 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java@@ -291,11 +291,36 @@ public class DynamoDbJsonHandler {response.set("Attributes", result.newItem());} else if ("ALL_OLD" .equals(returnValues) && result.oldItem() != null) {response.set("Attributes", result.oldItem());+ } else if ("UPDATED_NEW".equals(returnValues) && result.oldItem() != null && result.newItem() != null) {+ response.set("Attributes", getChangedAttributes(result.newItem(), result.oldItem()));+ } else if ("UPDATED_OLD".equals(returnValues) && result.oldItem() != null && result.newItem() != null) {+ response.set("Attributes", getChangedAttributes(result.oldItem(), result.newItem()));}addConsumedCapacity(response, request, tableName, 1, true);return Response.ok(response).build();}+ private JsonNode getChangedAttributes(JsonNode preferredItem, JsonNode secondaryItem){+ ObjectNode changedAttributes = objectMapper.createObjectNode();+ Iterator<Map.Entry<String, JsonNode>> fields = preferredItem.fields();+ while (fields.hasNext()) {+ var entry = fields.next();+ String attrName = entry.getKey();+ JsonNode value = entry.getValue();++ if (secondaryItem.has(attrName)){+ JsonNode secondaryValue = secondaryItem.get(attrName);+ if (!value.equals(secondaryValue)){+ changedAttributes.put(attrName, value);+ }+ }+ else {+ changedAttributes.put(attrName, value);+ }+ }+ return changedAttributes;+ }+private Response handleQuery(JsonNode request, String region) {String tableName = request.path("TableName").asText();JsonNode keyConditions = request.has("KeyConditions") ? request.get("KeyConditions") : null;diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandlerTest.javanew file mode 100644index 0000000000..e909c8d33f--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandlerTest.java@@ -0,0 +1,261 @@+package io.github.hectorvent.floci.services.dynamodb;++import io.github.hectorvent.floci.core.storage.InMemoryStorage;+import io.github.hectorvent.floci.services.dynamodb.model.AttributeDefinition;+import io.github.hectorvent.floci.services.dynamodb.model.KeySchemaElement;+import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;+++import jakarta.ws.rs.core.Response;++import java.util.Arrays;+import java.util.List;++import static org.junit.jupiter.api.Assertions.*;++class DynamoDbJsonHandlerTest {++ private DynamoDbService service;+ private ObjectMapper mapper;+ private DynamoDbJsonHandler handler;++ @BeforeEach+ void setUp() {+ service = new DynamoDbService(new InMemoryStorage<>());+ mapper = new ObjectMapper();+ handler = new DynamoDbJsonHandler(service, null, null, mapper);+ }++ private TableDefinition createUsersTable() {+ return service.createTable("Users",+ List.of(new KeySchemaElement("userId", "HASH")),+ List.of(new AttributeDefinition("userId", "S")),+ 5L, 5L);+ }++ private ObjectNode attributeValue(String type, String value) {+ ObjectNode attrValue = mapper.createObjectNode();+ attrValue.put(type, value);+ return attrValue;+ }++ private ObjectNode item(String... kvPairs) {+ ObjectNode node = mapper.createObjectNode();+ for (int i = 0; i < kvPairs.length; i += 2) {+ node.set(kvPairs[i], attributeValue("S", kvPairs[i + 1]));+ }+ return node;+ }++ private JsonNode createRequest(String tableName, JsonNode key, String updateExpression,+ JsonNode exprAttrNames, JsonNode exprAttrValues, String returnValues){+ ObjectNode node = mapper.createObjectNode();+ node.put("TableName", tableName);+ node.set("Key", key);+ node.put("UpdateExpression", updateExpression);+ if (exprAttrNames != null){+ node.set("ExpressionAttributeNames", exprAttrNames);+ }+ if (exprAttrValues != null){+ node.set("ExpressionAttributeValues", exprAttrValues);+ }+ node.put("ReturnValues", returnValues);+ return node;+ }++ @Test+ void updateItemReturnValuesUpdatedNew() throws Exception {+ createUsersTable();++ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));++ ObjectNode key = item("userId", "u-fallback");++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.put(":changeVal", attributeValue("S", "val2"));+ exprValues.put(":newVal", attributeValue("S", "newVal"));++ JsonNode request = createRequest("Users", key,+ "SET changeAttr = :changeVal, newAttr = :newVal, REMOVE delAttr",+ null, exprValues, "UPDATED_NEW");++ Response response = null;++ response = handler.handle("UpdateItem", request, "us-east-1");+ assertNotNull(response);++ JsonNode responseData = mapper.convertValue(response.getEntity(), JsonNode.class);++ assertNotNull(responseData);+ assertTrue(responseData.has("Attributes"), "Attributes property must be present");+ JsonNode attr = responseData.get("Attributes");++ assertTrue(attr.has("changeAttr"), "Attributes should have changeAttr");+ assertTrue(attr.get("changeAttr").has("S"), "changeAttr should have S");+ assertEquals("val2", attr.get("changeAttr").get("S").asText());++ assertTrue(attr.has("newAttr"), "Attributes should have newAttr");+ assertTrue(attr.get("newAttr").has("S"), "newAttr should have S");+ assertEquals("newVal", attr.get("newAttr").get("S").asText());++ assertFalse(attr.has("delAttr"), "Attributes should not have delAttr");++ assertFalse(attr.has("sameAttr"), "Attributes should not have sameAttr");+ }++ @Test+ void updateItemReturnValuesUpdatedOld() throws Exception {+ createUsersTable();++ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));++ ObjectNode key = item("userId", "u-fallback");++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.put(":changeVal", attributeValue("S", "val2"));+ exprValues.put(":newVal", attributeValue("S", "newVal"));++ JsonNode request = createRequest("Users", key,+ "SET changeAttr = :changeVal, newAttr = :newVal, REMOVE delAttr",+ null, exprValues, "UPDATED_OLD");++ Response response = null;++ response = handler.handle("UpdateItem", request, "us-east-1");+ assertNotNull(response);++ JsonNode responseData = mapper.convertValue(response.getEntity(), JsonNode.class);++ assertNotNull(responseData);+ assertTrue(responseData.has("Attributes"), "Attributes property must be present");+ JsonNode attr = responseData.get("Attributes");++ assertTrue(attr.has("changeAttr"), "Attributes should have changeAttr");+ assertTrue(attr.get("changeAttr").has("S"), "changeAttr should have S");+ assertEquals("val1", attr.get("changeAttr").get("S").asText());++ assertFalse(attr.has("newAttr"), "Attributes should not have newAttr");++ assertTrue(attr.has("delAttr"), "Attributes should have delAttr");+ assertTrue(attr.get("delAttr").has("S"), "delAttr should have S");+ assertEquals("old", attr.get("delAttr").get("S").asText());++ assertFalse(attr.has("sameAttr"), "Attributes should not have sameAttr");+ }++ @Test+ void updateItemReturnValuesAllOld() throws Exception {+ createUsersTable();++ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));++ ObjectNode key = item("userId", "u-fallback");++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.put(":changeVal", attributeValue("S", "val2"));+ exprValues.put(":newVal", attributeValue("S", "newVal"));++ JsonNode request = createRequest("Users", key,+ "SET changeAttr = :changeVal, newAttr = :newVal, REMOVE delAttr",+ null, exprValues, "ALL_OLD");++ Response response = null;++ response = handler.handle("UpdateItem", request, "us-east-1");+ assertNotNull(response);++ JsonNode responseData = mapper.convertValue(response.getEntity(), JsonNode.class);++ assertNotNull(responseData);+ assertTrue(responseData.has("Attributes"), "Attributes property must be present");+ JsonNode attr = responseData.get("Attributes");++ assertTrue(attr.has("changeAttr"), "Attributes should have changeAttr");+ assertTrue(attr.get("changeAttr").has("S"), "changeAttr should have S");+ assertEquals("val1", attr.get("changeAttr").get("S").asText());++ assertFalse(attr.has("newAttr"), "Attributes should not have newAttr");++ assertTrue(attr.has("delAttr"), "Attributes should have delAttr");+ assertTrue(attr.get("delAttr").has("S"), "delAttr should have S");+ assertEquals("old", attr.get("delAttr").get("S").asText());++ assertTrue(attr.has("sameAttr"), "Attributes should have sameAttr");+ assertTrue(attr.get("sameAttr").has("S"), "sameAttr should have S");+ assertEquals("static", attr.get("sameAttr").get("S").asText());+ }++ @Test+ void updateItemReturnValuesAllNew() throws Exception {+ createUsersTable();++ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));++ ObjectNode key = item("userId", "u-fallback");++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.put(":changeVal", attributeValue("S", "val2"));+ exprValues.put(":newVal", attributeValue("S", "newVal"));++ JsonNode request = createRequest("Users", key,+ "SET changeAttr = :changeVal, newAttr = :newVal, REMOVE delAttr",+ null, exprValues, "ALL_NEW");++ Response response = null;++ response = handler.handle("UpdateItem", request, "us-east-1");+ assertNotNull(response);++ JsonNode responseData = mapper.convertValue(response.getEntity(), JsonNode.class);++ assertNotNull(responseData);+ assertTrue(responseData.has("Attributes"), "Attributes property must be present");+ JsonNode attr = responseData.get("Attributes");++ assertTrue(attr.has("changeAttr"), "Attributes should have changeAttr");+ assertTrue(attr.get("changeAttr").has("S"), "changeAttr should have S");+ assertEquals("val2", attr.get("changeAttr").get("S").asText());++ assertTrue(attr.has("newAttr"), "Attributes should have newAttr");+ assertTrue(attr.get("newAttr").has("S"), "newAttr should have S");+ assertEquals("newVal", attr.get("newAttr").get("S").asText());++ assertFalse(attr.has("delAttr"), "Attributes should not have delAttr");++ assertTrue(attr.has("sameAttr"), "Attributes should have sameAttr");+ assertTrue(attr.get("sameAttr").has("S"), "sameAttr should have S");+ assertEquals("static", attr.get("sameAttr").get("S").asText());+ }++ @Test+ void updateItemReturnValuesNone() throws Exception {+ createUsersTable();++ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));++ ObjectNode key = item("userId", "u-fallback");++ ObjectNode exprValues = mapper.createObjectNode();+ exprValues.put(":changeVal", attributeValue("S", "val2"));+ exprValues.put(":newVal", attributeValue("S", "newVal"));++ JsonNode request = createRequest("Users", key,+ "SET changeAttr = :changeVal, newAttr = :newVal, REMOVE delAttr",+ null, exprValues, "NONE");++ Response response = null;++ response = handler.handle("UpdateItem", request, "us-east-1");+ assertNotNull(response);++ JsonNode responseData = mapper.convertValue(response.getEntity(), JsonNode.class);++ assertNotNull(responseData);+ assertFalse(responseData.has("Attributes"), "Attributes property must not be present");+ }+}