Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(dynamodb): reject ConsistentRead on GSI Scan (#2931)

Kévin Dehoux6dec21479bee
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java
index 25fceb54dd..9d65ba440e 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java
@@ -193,6 +193,10 @@ class DynamoDbAccessPathValidationTest {
.keyConditionExpression("#status = :status")
.expressionAttributeNames(Map.of("#status", "status"))
.expressionAttributeValues(Map.of(":status", value("open")))));
+ assertValidationException(() -> ddb.scan(request -> request
+ .tableName(TABLE)
+ .indexName("status-index")
+ .consistentRead(true)));
}
@Test
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.java
index 19856565fa..c4c88b9764 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
@@ -870,16 +870,7 @@ public class DynamoDbJsonHandler {
keyConditionExpr, filterExpr, queryFilter, exprAttrNames, exprAttrValues);
DynamoDbAccessPathValidator.validateSelection(queryTable, queryAccessPath, select,
projectionExpression, attributesToGet, exprAttrNames);
-
- // ConsistentRead on GSI check
- boolean consistentRead = request.path("ConsistentRead").asBoolean(false);
- if (consistentRead && indexName != null) {
- if (queryTable.findGsi(indexName).isPresent()) {
- throw new AwsException("ValidationException",
- "Consistent reads are not supported on global secondary indexes", 400);
- }
- }
-
+ rejectConsistentReadOnGsi(request, queryAccessPath);
// Validate EAN/EAV usage when using expression format
if (keyConditionExpr != null) {
// Check undefined #tokens in FilterExpression
@@ -946,6 +937,13 @@ public class DynamoDbJsonHandler {
return Response.ok(response).build();
}
+ private static void rejectConsistentReadOnGsi(JsonNode request, DynamoDbAccessPath accessPath) {
+ if (request.path("ConsistentRead").asBoolean(false) && accessPath.isGlobalSecondaryIndex()) {
+ throw new AwsException("ValidationException",
+ "Consistent reads are not supported on global secondary indexes", 400);
+ }
+ }
+
private Response handleScan(JsonNode request, String region) {
String tableName = request.path("TableName").asText();
String filterExpr = request.has("FilterExpression")
@@ -1017,6 +1015,7 @@ public class DynamoDbJsonHandler {
DynamoDbAccessPath scanAccessPath = DynamoDbAccessPath.resolve(scanTable, indexNameScan);
DynamoDbAccessPathValidator.validateSelection(scanTable, scanAccessPath, select,
projectionExpressionScan, attributesToGetScan, exprAttrNames);
+ rejectConsistentReadOnGsi(request, scanAccessPath);
if (exclusiveStartKey != null) {
validateExclusiveStartKey(exclusiveStartKey, scanTable, scanAccessPath, true);
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathIntegrationTest.java
index 7c442f6012..edac828446 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathIntegrationTest.java
@@ -286,6 +286,31 @@ class DynamoDbAccessPathIntegrationTest {
.body("message", equalTo("Consistent reads are not supported on global secondary indexes"));
}
+ @Test
+ @Order(10)
+ void scanGsiRejectsConsistentReads() {
+ request("DynamoDB_20120810.Scan", """
+ {
+ "TableName":"%s",
+ "IndexName":"status-index",
+ "ConsistentRead":true
+ }
+ """.formatted(TABLE))
+ .statusCode(400)
+ .body("__type", equalTo("ValidationException"))
+ .body("message", equalTo("Consistent reads are not supported on global secondary indexes"));
+
+ // Consistent reads stay legal on a local secondary index.
+ request("DynamoDB_20120810.Scan", """
+ {
+ "TableName":"%s",
+ "IndexName":"alternate-index",
+ "ConsistentRead":true
+ }
+ """.formatted(TABLE))
+ .statusCode(200);
+ }
+
@Test
@Order(9)
void queryAndScanRejectWrongExclusiveStartKeyTypes() {