Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix: use region consistently across service operations (#1105)

Hoang Lane5ef46d3504b
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
index b37fb50a43..582da79172 100644
--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
@@ -154,14 +154,6 @@ public class DynamoDbService {
}
}
- public TableDefinition createTable(String tableName,
- List<KeySchemaElement> keySchema,
- List<AttributeDefinition> attributeDefinitions,
- Long readCapacity, Long writeCapacity) {
- return createTable(tableName, keySchema, attributeDefinitions, readCapacity, writeCapacity,
- List.of(), List.of(), regionResolver.getDefaultRegion());
- }
-
public TableDefinition createTable(String tableName,
List<KeySchemaElement> keySchema,
List<AttributeDefinition> attributeDefinitions,
@@ -322,10 +314,6 @@ public class DynamoDbService {
return table;
}
- public TableDefinition describeTable(String tableName) {
- return describeTable(tableName, regionResolver.getDefaultRegion());
- }
-
public TableDefinition describeTable(String tableName, String region) {
String canonicalTableName = canonicalTableName(region, tableName);
String storageKey = regionKey(region, canonicalTableName);
@@ -345,10 +333,6 @@ public class DynamoDbService {
tableStore.put(regionKey(region, canonicalTableName), table);
}
- public void deleteTable(String tableName) {
- deleteTable(tableName, regionResolver.getDefaultRegion());
- }
-
public void deleteTable(String tableName, String region) {
String canonicalTableName = canonicalTableName(region, tableName);
String storageKey = regionKey(region, canonicalTableName);
@@ -367,10 +351,6 @@ public class DynamoDbService {
LOG.infov("Deleted table: {0}", canonicalTableName);
}
- public List<String> listTables() {
- return listTables(regionResolver.getDefaultRegion());
- }
-
public List<String> listTables(String region) {
String prefix = region + "::";
return tableStore.scan(k -> k.startsWith(prefix)).stream()
@@ -403,10 +383,6 @@ public class DynamoDbService {
public record ListTablesResult(List<String> tableNames, String lastEvaluatedTableName) {}
- public void putItem(String tableName, JsonNode item) {
- putItem(tableName, item, null, null, null, regionResolver.getDefaultRegion(), "NONE");
- }
-
public void putItem(String tableName, JsonNode item, String region) {
putItem(tableName, item, null, null, null, region, "NONE");
}
@@ -449,10 +425,6 @@ public class DynamoDbService {
});
}
- public JsonNode getItem(String tableName, JsonNode key) {
- return getItem(tableName, key, regionResolver.getDefaultRegion());
- }
-
public JsonNode getItem(String tableName, JsonNode key, String region) {
String canonicalTableName = canonicalTableName(region, tableName);
String storageKey = regionKey(region, canonicalTableName);
@@ -474,10 +446,6 @@ public class DynamoDbService {
return item;
}
- public JsonNode deleteItem(String tableName, JsonNode key) {
- return deleteItem(tableName, key, null, null, null, regionResolver.getDefaultRegion(), "NONE");
- }
-
public JsonNode deleteItem(String tableName, JsonNode key, String region) {
return deleteItem(tableName, key, null, null, null, region, "NONE");
}
@@ -520,14 +488,6 @@ public class DynamoDbService {
});
}
- public UpdateResult updateItem(String tableName, JsonNode key, JsonNode attributeUpdates,
- String updateExpression,
- JsonNode expressionAttrNames, JsonNode expressionAttrValues,
- String returnValues) {
- return updateItem(tableName, key, attributeUpdates, updateExpression, expressionAttrNames,
- expressionAttrValues, returnValues, null, regionResolver.getDefaultRegion(), "NONE");
- }
-
public UpdateResult updateItem(String tableName, JsonNode key, JsonNode attributeUpdates,
String updateExpression,
JsonNode expressionAttrNames, JsonNode expressionAttrValues,
@@ -677,13 +637,6 @@ public class DynamoDbService {
});
}
- public QueryResult query(String tableName, JsonNode keyConditions,
- JsonNode expressionAttrValues, String keyConditionExpression,
- String filterExpression, Integer limit) {
- return query(tableName, keyConditions, expressionAttrValues, keyConditionExpression,
- filterExpression, limit, null, null, null, null, regionResolver.getDefaultRegion());
- }
-
public QueryResult query(String tableName, JsonNode keyConditions,
JsonNode expressionAttrValues, String keyConditionExpression,
String filterExpression, Integer limit, String region) {
@@ -844,13 +797,6 @@ public class DynamoDbService {
return new QueryResult(evaluatedItems, scannedCount, lastEvaluatedKey);
}
- public ScanResult scan(String tableName, String filterExpression,
- JsonNode expressionAttrNames, JsonNode expressionAttrValues,
- JsonNode scanFilter, Integer limit, JsonNode exclusiveStartKey) {
- return scan(tableName, filterExpression, expressionAttrNames, expressionAttrValues,
- scanFilter, limit, exclusiveStartKey, regionResolver.getDefaultRegion());
- }
-
public ScanResult scan(String tableName, String filterExpression,
JsonNode expressionAttrNames, JsonNode expressionAttrValues,
JsonNode scanFilter, Integer limit, JsonNode exclusiveStartKey, String region) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java
index efdedfdf37..88f2da5913 100644
--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java
+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java
@@ -355,7 +355,7 @@ public class PipesPoller {
}
try {
String queueUrl = AwsArnUtils.arnToQueueUrl(dlqArn, baseUrl);
- sqsService.sendMessage(queueUrl, payload, 0);
+ sqsService.sendMessage(queueUrl, payload, 0, region);
LOG.infov("Pipe {0}: sent failed records to DLQ {1}", pipe.getName(), dlqArn);
return true;
} catch (Exception e) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
index 3f7bd3e806..11820639ab 100644
--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
@@ -1701,7 +1701,7 @@ public class S3Service {
return;
}
- String region = regionResolver != null ? regionResolver.getDefaultRegion() : "us-east-1";
+ String region = bucket.getRegion();
String eventJson = buildS3EventJson(bucketName, key, eventName, obj, region, bucket.isVersioningEnabled());
for (QueueNotification qn : config.getQueueConfigurations()) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java
index 273c0e3d83..f1e9abaee4 100644
--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java
+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java
@@ -60,7 +60,7 @@ public class ScheduleInvoker {
if (arn.contains(":sqs:")) {
String queueUrl = AwsArnUtils.arnToQueueUrl(arn, baseUrl);
- sqsService.sendMessage(queueUrl, payload, 0);
+ sqsService.sendMessage(queueUrl, payload, 0, targetRegion);
LOG.debugv("Scheduler delivered to SQS: {0}", arn);
} else if (arn.contains(":lambda:") || arn.contains(":function:")) {
String fnName = arn.substring(arn.lastIndexOf(':') + 1);
diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java
index 082acbe2b2..3a4e269ac2 100644
--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java
@@ -3,6 +3,8 @@ package io.github.hectorvent.floci.services.sqs;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import io.github.hectorvent.floci.core.common.RegionResolver;
import io.github.hectorvent.floci.services.sqs.model.Message;
import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;
import jakarta.inject.Inject;
@@ -11,6 +13,8 @@ import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
@@ -27,22 +31,24 @@ public class SqsInspectionController {
private final SqsService sqsService;
private final ObjectMapper objectMapper;
+ private final RegionResolver regionResolver;
@Inject
- public SqsInspectionController(SqsService sqsService, ObjectMapper objectMapper) {
+ public SqsInspectionController(SqsService sqsService, ObjectMapper objectMapper, RegionResolver regionResolver) {
this.sqsService = sqsService;
this.objectMapper = objectMapper;
+ this.regionResolver = regionResolver;
}
@GET
- public Response getMessages(@QueryParam("QueueUrl") String queueUrl) {
+ public Response getMessages(@Context HttpHeaders headers, @QueryParam("QueueUrl") String queueUrl) {
if (queueUrl == null || queueUrl.isBlank()) {
return Response.status(400)
.entity(objectMapper.createObjectNode().put("message", "QueueUrl query parameter is required"))
.build();
}
- List<Message> messages = sqsService.peekMessages(queueUrl);
+ List<Message> messages = sqsService.peekMessages(queueUrl, regionResolver.resolveRegion(headers));
ArrayNode messagesArray = objectMapper.createArrayNode();
for (Message msg : messages) {
@@ -96,14 +102,14 @@ public class SqsInspectionController {
}
@DELETE
- public Response purgeQueue(@QueryParam("QueueUrl") String queueUrl) {
+ public Response purgeQueue(@Context HttpHeaders headers, @QueryParam("QueueUrl") String queueUrl) {
if (queueUrl == null || queueUrl.isBlank()) {
return Response.status(400)
.entity(objectMapper.createObjectNode().put("message", "QueueUrl query parameter is required"))
.build();
}
- sqsService.purgeQueue(queueUrl);
+ sqsService.purgeQueue(queueUrl, regionResolver.resolveRegion(headers));
return Response.ok().build();
}
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java
index 3f922f3919..7256cf672d 100644
--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java
@@ -189,10 +189,6 @@ public class SqsService {
}
}
- public Queue createQueue(String queueName, Map<String, String> attributes) {
- return createQueue(queueName, attributes, null, regionResolver.getDefaultRegion());
- }
-
public Queue createQueue(String queueName, Map<String, String> attributes, String region) {
return createQueue(queueName, attributes, null, region);
}
@@ -263,10 +259,6 @@ public class SqsService {
return queue;
}
- public void deleteQueue(String queueUrl) {
- deleteQueue(queueUrl, regionResolver.getDefaultRegion());
- }
-
public void deleteQueue(String queueUrl, String region) {
String storageKey = regionKey(region, queueUrl);
if (queueStore.get(storageKey).isEmpty()) {
@@ -288,10 +280,6 @@ public class SqsService {
LOG.infov("Deleted queue: {0}", queueUrl);
}
- public List<Queue> listQueues(String namePrefix) {
- return listQueues(namePrefix, regionResolver.getDefaultRegion());
- }
-
public List<Queue> listQueues(String namePrefix, String region) {
String prefix = region + "::";
if (namePrefix == null || namePrefix.isEmpty()) {
@@ -307,10 +295,6 @@ public class SqsService {
});
}
- public String getQueueUrl(String queueName) {
- return getQueueUrl(queueName, regionResolver.getDefaultRegion());
- }
-
public String getQueueUrl(String queueName, String region) {
String accountId = regionResolver.getAccountId();
String queueUrl = baseUrl + "/" + accountId + "/" + queueName;
@@ -322,10 +306,6 @@ public class SqsService {
return queueUrl;
}
- public Map<String, String> getQueueAttributes(String queueUrl, List<String> attributeNames) {
- return getQueueAttributes(queueUrl, attributeNames, regionResolver.getDefaultRegion());
- }
-
public Map<String, String> getQueueAttributes(String queueUrl, List<String> attributeNames, String region) {
String storageKey = regionKey(region, queueUrl);
Queue queue = queueStore.get(storageKey)
@@ -354,20 +334,10 @@ public class SqsService {
return filtered;
}
- public Message sendMessage(String queueUrl, String body, int delaySeconds) {
- return sendMessage(queueUrl, body, delaySeconds, null, null);
- }
-
public Message sendMessage(String queueUrl, String body, int delaySeconds, String region) {
return sendMessage(queueUrl, body, delaySeconds, null, null, region);
}
- public Message sendMessage(String queueUrl, String body, int delaySeconds,
- String messageGroupId, String messageDeduplicationId) {
- return sendMessage(queueUrl, body, delaySeconds, messageGroupId, messageDeduplicationId, null,
- regionResolver.getDefaultRegion());
- }
-
public Message sendMessage(String queueUrl, String body, int delaySeconds,
String messageGroupId, String messageDeduplicationId,
String region) {
@@ -607,11 +577,6 @@ public class SqsService {
}
}
- public List<Message> receiveMessage(String queueUrl, int maxMessages, int visibilityTimeout, int waitTimeSeconds) {
- return receiveMessage(queueUrl, maxMessages, visibilityTimeout, waitTimeSeconds,
- regionResolver.getDefaultRegion());
- }
-
public List<Message> receiveMessage(String queueUrl, int maxMessages, int visibilityTimeout,
int waitTimeSeconds, String region) {
String storageKey = regionKey(region, queueUrl);
@@ -729,20 +694,12 @@ public class SqsService {
}
}
- public List<Message> peekMessages(String queueUrl) {
- return peekMessages(queueUrl, regionResolver.getDefaultRegion());
- }
-
public List<Message> peekMessages(String queueUrl, String region) {
String storageKey = regionKey(region, queueUrl);
ensureQueueExists(storageKey);
return getOrCreateQueue(storageKey).peekAll();
}
- public void deleteMessage(String queueUrl, String receiptHandle) {
- deleteMessage(queueUrl, receiptHandle, regionResolver.getDefaultRegion());
- }
-
public void deleteMessage(String queueUrl, String receiptHandle, String region) {
String storageKey = regionKey(region, queueUrl);
if (getQueueByUrl(storageKey, queueUrl).isEmpty()) {
@@ -764,10 +721,6 @@ public class SqsService {
}
}
- public void changeMessageVisibility(String queueUrl, String receiptHandle, int visibilityTimeout) {
- changeMessageVisibility(queueUrl, receiptHandle, visibilityTimeout, regionResolver.getDefaultRegion());
- }
-
public void changeMessageVisibility(String queueUrl, String receiptHandle, int visibilityTimeout, String region) {
String storageKey = regionKey(region, queueUrl);
ensureQueueExists(storageKey);
@@ -779,10 +732,6 @@ public class SqsService {
}
}
- public void purgeQueue(String queueUrl) {
- purgeQueue(queueUrl, regionResolver.getDefaultRegion());
- }
-
public void purgeQueue(String queueUrl, String region) {
String storageKey = regionKey(region, queueUrl);
ensureQueueExists(storageKey);
diff --git a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
index e39ad850c5..3cd76b775e 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
@@ -58,10 +58,6 @@ public class SsmService {
this.regionResolver = regionResolver;
}
- public long putParameter(String name, String value, String type, String description, boolean overwrite) {
- return putParameter(name, value, type, description, overwrite, regionResolver.getDefaultRegion());
- }
-
/**
* Create or update a parameter.
* Returns the version number.
@@ -91,10 +87,6 @@ public class SsmService {
return version;
}
- public Parameter getParameter(String name) {
- return getParameter(name, regionResolver.getDefaultRegion());
- }
-
public Parameter getParameter(String name, String region) {
String storageKey = regionKey(region, name);
return parameterStore.get(storageKey)
@@ -102,10 +94,6 @@ public class SsmService {
"Parameter " + name + " not found.", 400));
}
- public List<Parameter> getParameters(List<String> names) {
- return getParameters(names, regionResolver.getDefaultRegion());
- }
-
public List<Parameter> getParameters(List<String> names, String region) {
List<Parameter> result = new ArrayList<>();
for (String name : names) {
@@ -114,10 +102,6 @@ public class SsmService {
return result;
}
- public List<Parameter> getParametersByPath(String path, boolean recursive) {
- return getParametersByPath(path, recursive, regionResolver.getDefaultRegion());
- }
-
public List<Parameter> getParametersByPath(String path, boolean recursive, String region) {
String normalizedPath = path.endsWith("/") ? path : path + "/";
String prefix = region + "::";
@@ -138,10 +122,6 @@ public class SsmService {
});
}
- public void deleteParameter(String name) {
- deleteParameter(name, regionResolver.getDefaultRegion());
- }
-
public void deleteParameter(String name, String region) {
String storageKey = regionKey(region, name);
if (parameterStore.get(storageKey).isEmpty()) {
@@ -153,10 +133,6 @@ public class SsmService {
LOG.infov("Deleted parameter: {0}", name);
}
- public List<String> deleteParameters(List<String> names) {
- return deleteParameters(names, regionResolver.getDefaultRegion());
- }
-
public List<String> deleteParameters(List<String> names, String region) {
List<String> deleted = new ArrayList<>();
for (String name : names) {
@@ -170,10 +146,6 @@ public class SsmService {
return deleted;
}
- public List<ParameterHistory> getParameterHistory(String name) {
- return getParameterHistory(name, regionResolver.getDefaultRegion());
- }
-
public List<ParameterHistory> getParameterHistory(String name, String region) {
String storageKey = regionKey(region, name);
if (parameterStore.get(storageKey).isEmpty()) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java
index 4c359c9f16..3facae51a2 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java
@@ -63,11 +63,11 @@ class DynamoDbConcurrencyIntegrationTest {
null);
}
- private TableDefinition createCounterTable() {
+ private TableDefinition createCounterTable(String region) {
return service.createTable("Counters",
List.of(new KeySchemaElement("pk", "HASH")),
List.of(new AttributeDefinition("pk", "S")),
- 5L, 5L);
+ 5L, 5L, region);
}
private ObjectNode stringAttr(String value) {
@@ -124,7 +124,8 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_updateItem_arithmetic_is_atomic() throws InterruptedException {
- createCounterTable();
+ String region = "eu-west-1";
+ createCounterTable(region);
String pk = "counter-1";
ObjectNode key = pkKey(pk);
@@ -138,7 +139,7 @@ class DynamoDbConcurrencyIntegrationTest {
DynamoDbService.UpdateResult result = service.updateItem(
"Counters", key, null,
"SET cnt = if_not_exists(cnt, :start) + :inc",
- null, exprValues, "ALL_NEW");
+ null, exprValues, "ALL_NEW", region);
JsonNode newItem = result.newItem();
int value = Integer.parseInt(newItem.get("cnt").get("N").asText());
observedValues.add(value);
@@ -146,7 +147,7 @@ class DynamoDbConcurrencyIntegrationTest {
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
- JsonNode stored = service.getItem("Counters", key);
+ JsonNode stored = service.getItem("Counters", key, region);
assertNotNull(stored, "counter item must exist after updates");
assertEquals(String.valueOf(OPS_PER_SCENARIO), stored.get("cnt").get("N").asText(),
"final counter must equal number of increments");
@@ -163,7 +164,8 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_updateItem_ADD_action_is_atomic() throws InterruptedException {
- createCounterTable();
+ String region = "eu-west-1";
+ createCounterTable(region);
String pk = "counter-add";
ObjectNode key = pkKey(pk);
@@ -173,11 +175,11 @@ class DynamoDbConcurrencyIntegrationTest {
List<Throwable> errors = runConcurrently(OPS_PER_SCENARIO, () -> service.updateItem(
"Counters", key, null,
"ADD cnt :inc",
- null, exprValues, "NONE"));
+ null, exprValues, "NONE", region));
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
- JsonNode stored = service.getItem("Counters", key);
+ JsonNode stored = service.getItem("Counters", key, region);
assertNotNull(stored);
assertEquals(String.valueOf(OPS_PER_SCENARIO), stored.get("cnt").get("N").asText(),
"ADD :inc with N=1 run 50 times must yield 50");
@@ -185,7 +187,7 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_putItem_with_attribute_not_exists_allows_exactly_one() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
String pk = "unique-row";
AtomicInteger successes = new AtomicInteger();
@@ -212,7 +214,7 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_putItem_with_distinct_keys_all_succeed() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
AtomicInteger idSource = new AtomicInteger();
@@ -226,14 +228,14 @@ class DynamoDbConcurrencyIntegrationTest {
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
for (int i = 0; i < OPS_PER_SCENARIO; i++) {
- JsonNode stored = service.getItem("Counters", pkKey("distinct-" + i));
+ JsonNode stored = service.getItem("Counters", pkKey("distinct-" + i), "us-east-1");
assertNotNull(stored, "distinct-" + i + " should exist — proves per-item locking, not table-wide");
}
}
@RepeatedTest(REPEATS)
void concurrent_updateItem_and_putItem_on_same_key_is_linearisable() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
String pk = "mixed";
ObjectNode key = pkKey(pk);
@@ -249,7 +251,7 @@ class DynamoDbConcurrencyIntegrationTest {
if (id % 2 == 0) {
service.updateItem("Counters", key, null,
"SET cnt = if_not_exists(cnt, :start) + :inc",
- null, updateExprValues, "NONE");
+ null, updateExprValues, "NONE", "us-east-1");
} else {
ObjectNode item = itemWithPk(pk);
item.set("writer", stringAttr("put-" + id));
@@ -259,7 +261,7 @@ class DynamoDbConcurrencyIntegrationTest {
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
- JsonNode stored = service.getItem("Counters", key);
+ JsonNode stored = service.getItem("Counters", key, "us-east-1");
assertNotNull(stored, "item must still exist");
// Must be a well-formed single record; no half-updated state.
assertEquals("S", stored.get("pk").fieldNames().next());
@@ -272,7 +274,7 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_deleteItem_with_condition_only_one_succeeds() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
String pk = "to-delete";
ObjectNode seed = itemWithPk(pk);
@@ -299,12 +301,12 @@ class DynamoDbConcurrencyIntegrationTest {
"exactly one conditional delete should succeed");
assertEquals(OPS_PER_SCENARIO - 1, conditionalFailures.get(),
"the rest must raise ConditionalCheckFailedException");
- assertNull(service.getItem("Counters", key), "item must be gone");
+ assertNull(service.getItem("Counters", key, "us-east-1"), "item must be gone");
}
@RepeatedTest(REPEATS)
void concurrent_transactWriteItems_all_or_nothing() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
String pkA = "txA";
String pkB = "txB";
@@ -323,7 +325,7 @@ class DynamoDbConcurrencyIntegrationTest {
// Each transaction updates both keys with a condition "version = :v0" and
// sets version = :v1. Concurrent attempts must serialise: one wins, others cancel.
List<Throwable> errors = runConcurrently(OPS_PER_SCENARIO, () -> {
- JsonNode versionBefore = service.getItem("Counters", pkKey(pkA)).get("version");
+ JsonNode versionBefore = service.getItem("Counters", pkKey(pkA), "us-east-1").get("version");
int currentVersion = Integer.parseInt(versionBefore.get("N").asText());
int nextVersion = currentVersion + 1;
@@ -344,8 +346,8 @@ class DynamoDbConcurrencyIntegrationTest {
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
- JsonNode finalA = service.getItem("Counters", pkKey(pkA));
- JsonNode finalB = service.getItem("Counters", pkKey(pkB));
+ JsonNode finalA = service.getItem("Counters", pkKey(pkA), "us-east-1");
+ JsonNode finalB = service.getItem("Counters", pkKey(pkB), "us-east-1");
int versionA = Integer.parseInt(finalA.get("version").get("N").asText());
int versionB = Integer.parseInt(finalB.get("version").get("N").asText());
assertEquals(versionA, versionB,
@@ -370,7 +372,7 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_transactWriteItems_disjoint_commute() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
// Seed 2 * OPS_PER_SCENARIO keys. Each transaction touches two disjoint keys.
for (int i = 0; i < OPS_PER_SCENARIO * 2; i++) {
@@ -399,7 +401,7 @@ class DynamoDbConcurrencyIntegrationTest {
() -> "disjoint transactions must not deadlock or cancel: " + errors);
for (int i = 0; i < OPS_PER_SCENARIO * 2; i++) {
- JsonNode stored = service.getItem("Counters", pkKey("disjoint-" + i));
+ JsonNode stored = service.getItem("Counters", pkKey("disjoint-" + i), "us-east-1");
assertEquals("1", stored.get("version").get("N").asText(),
"disjoint-" + i + " should be committed");
}
@@ -407,7 +409,7 @@ class DynamoDbConcurrencyIntegrationTest {
@RepeatedTest(REPEATS)
void concurrent_batchWriteItem_accumulates_without_lost_writes() throws InterruptedException {
- createCounterTable();
+ createCounterTable("us-east-1");
AtomicInteger idSource = new AtomicInteger();
ConcurrentHashMap<String, Boolean> submittedIds = new ConcurrentHashMap<>();
@@ -433,14 +435,14 @@ class DynamoDbConcurrencyIntegrationTest {
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
for (String itemId : submittedIds.keySet()) {
- assertNotNull(service.getItem("Counters", pkKey(itemId)),
+ assertNotNull(service.getItem("Counters", pkKey(itemId), "us-east-1"),
"every batch-submitted item must land: " + itemId);
}
}
@RepeatedTest(REPEATS)
void concurrent_updateItem_preserves_stream_order() throws InterruptedException {
- TableDefinition table = createCounterTable();
+ TableDefinition table = createCounterTable("us-east-1");
StreamDescription sd = streamService.enableStream(
table.getTableName(), table.getTableArn(), "NEW_IMAGE", "us-east-1");
@@ -455,7 +457,7 @@ class DynamoDbConcurrencyIntegrationTest {
List<Throwable> errors = runConcurrently(ops, () -> service.updateItem(
"Counters", key, null,
"SET cnt = if_not_exists(cnt, :start) + :inc",
- null, exprValues, "NONE"));
+ null, exprValues, "NONE", "us-east-1"));
assertTrue(errors.isEmpty(), () -> "unexpected errors: " + errors);
@@ -481,7 +483,8 @@ class DynamoDbConcurrencyIntegrationTest {
@Test
void baseline_single_threaded_still_works() {
- createCounterTable();
+ String region = "eu-west-1";
+ createCounterTable(region);
ObjectNode key = pkKey("single");
ObjectNode exprValues = mapper.createObjectNode();
@@ -491,10 +494,10 @@ class DynamoDbConcurrencyIntegrationTest {
for (int i = 1; i <= 10; i++) {
service.updateItem("Counters", key, null,
"SET cnt = if_not_exists(cnt, :start) + :inc",
- null, exprValues, "ALL_NEW");
+ null, exprValues, "ALL_NEW", region);
}
- JsonNode stored = service.getItem("Counters", key);
+ JsonNode stored = service.getItem("Counters", key, region);
assertNotNull(stored);
assertEquals("10", stored.get("cnt").get("N").asText());
}
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.java
index 914247a99d..176349a867 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandlerTest.java
@@ -13,7 +13,6 @@ 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.*;
@@ -31,11 +30,11 @@ class DynamoDbJsonHandlerTest {
handler = new DynamoDbJsonHandler(service, null, null, mapper);
}
- private TableDefinition createUsersTable() {
+ private TableDefinition createUsersTable(String region) {
return service.createTable("Users",
List.of(new KeySchemaElement("userId", "HASH")),
List.of(new AttributeDefinition("userId", "S")),
- 5L, 5L);
+ 5L, 5L, region);
}
private ObjectNode attributeValue(String type, String value) {
@@ -70,9 +69,9 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesUpdatedNew() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
- service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));
+ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"), "us-east-1");
ObjectNode key = item("userId", "u-fallback");
@@ -110,7 +109,7 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesUpdatedNewOnNewItem() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
// Item does not exist - UpdateItem creates it
ObjectNode key = item("userId", "u-new");
@@ -147,9 +146,9 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesUpdatedOld() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
- service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));
+ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"), "us-east-1");
ObjectNode key = item("userId", "u-fallback");
@@ -187,9 +186,9 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesAllOld() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
- service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));
+ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"), "us-east-1");
ObjectNode key = item("userId", "u-fallback");
@@ -229,9 +228,9 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesAllNew() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
- service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));
+ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"), "us-east-1");
ObjectNode key = item("userId", "u-fallback");
@@ -271,9 +270,9 @@ class DynamoDbJsonHandlerTest {
@Test
void updateItemReturnValuesNone() throws Exception {
- createUsersTable();
+ createUsersTable("us-east-1");
- service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"));
+ service.putItem("Users", item("userId", "u-fallback", "delAttr", "old", "changeAttr", "val1", "sameAttr", "static"), "us-east-1");
ObjectNode key = item("userId", "u-fallback");
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
index e295996dc0..a1bd0c982e 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
@@ -28,18 +28,18 @@ class DynamoDbServiceTest {
mapper = new ObjectMapper();
}
- private TableDefinition createUsersTable() {
+ private TableDefinition createUsersTable(String region) {
return service.createTable("Users",
List.of(new KeySchemaElement("userId", "HASH")),
List.of(new AttributeDefinition("userId", "S")),
- 5L, 5L);
+ 5L, 5L, region);
}
private static String tableArn(String region, String tableName) {
return "arn:aws:dynamodb:" + region + ":000000000000:table/" + tableName;
}
- private TableDefinition createOrdersTable() {
+ private TableDefinition createOrdersTable(String region) {
return service.createTable("Orders",
List.of(
new KeySchemaElement("customerId", "HASH"),
@@ -47,7 +47,7 @@ class DynamoDbServiceTest {
List.of(
new AttributeDefinition("customerId", "S"),
new AttributeDefinition("orderId", "S")),
- 5L, 5L);
+ 5L, 5L, region);
}
private ObjectNode attributeValue(String type, String value) {
@@ -66,7 +66,7 @@ class DynamoDbServiceTest {
@Test
void createTable() {
- TableDefinition table = createUsersTable();
+ TableDefinition table = createUsersTable("eu-west-1");
assertEquals("Users", table.getTableName());
assertEquals("ACTIVE", table.getTableStatus());
assertNotNull(table.getTableArn());
@@ -76,15 +76,16 @@ class DynamoDbServiceTest {
@Test
void createTableWithSortKey() {
- TableDefinition table = createOrdersTable();
+ TableDefinition table = createOrdersTable("eu-west-1");
assertEquals("customerId", table.getPartitionKeyName());
assertEquals("orderId", table.getSortKeyName());
}
@Test
void createDuplicateTableThrows() {
- createUsersTable();
- assertThrows(AwsException.class, () -> createUsersTable());
+ String region = "eu-west-1";
+ createUsersTable(region);
+ assertThrows(AwsException.class, () -> createUsersTable(region));
}
@Test
@@ -93,42 +94,45 @@ class DynamoDbServiceTest {
service.createTable("arn:aws:dynamodb:us-east-1:000000000000:table/Users",
List.of(new KeySchemaElement("userId", "HASH")),
List.of(new AttributeDefinition("userId", "S")),
- 5L, 5L));
+ 5L, 5L, "eu-west-1"));
assertEquals("ValidationException", ex.getErrorCode());
assertEquals(400, ex.getHttpStatus());
}
@Test
void describeTable() {
- createUsersTable();
- TableDefinition table = service.describeTable("Users");
+ String region = "eu-west-1";
+ createUsersTable(region);
+ TableDefinition table = service.describeTable("Users", region);
assertEquals("Users", table.getTableName());
}
@Test
void describeTableAcceptsArn() {
- createUsersTable();
- TableDefinition table = service.describeTable(tableArn("us-east-1", "Users"));
+ createUsersTable("us-east-1");
+ TableDefinition table = service.describeTable(tableArn("us-east-1", "Users"), "us-east-1");
assertEquals("Users", table.getTableName());
}
@Test
void describeTableNotFound() {
- assertThrows(AwsException.class, () -> service.describeTable("NonExistent"));
+ assertThrows(AwsException.class, () -> service.describeTable("NonExistent", "eu-west-1"));
}
@Test
void deleteTable() {
- createUsersTable();
- service.deleteTable("Users");
- assertThrows(AwsException.class, () -> service.describeTable("Users"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.deleteTable("Users", region);
+ assertThrows(AwsException.class, () -> service.describeTable("Users", region));
}
@Test
void listTables() {
- createUsersTable();
- createOrdersTable();
- List<String> tables = service.listTables();
+ String region = "eu-west-1";
+ createUsersTable(region);
+ createOrdersTable(region);
+ List<String> tables = service.listTables(region);
assertEquals(2, tables.size());
assertTrue(tables.contains("Users"));
assertTrue(tables.contains("Orders"));
@@ -136,33 +140,34 @@ class DynamoDbServiceTest {
@Test
void putAndGetItem() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode userItem = item("userId", "user-1", "name", "Alice", "email", "[email protected]");
- service.putItem("Users", userItem);
+ service.putItem("Users", userItem, region);
ObjectNode key = item("userId", "user-1");
- JsonNode retrieved = service.getItem("Users", key);
+ JsonNode retrieved = service.getItem("Users", key, region);
assertNotNull(retrieved);
assertEquals("Alice", retrieved.get("name").get("S").asText());
}
@Test
void putAndGetItemAcceptArnTableName() {
- createUsersTable();
+ createUsersTable("us-east-1");
ObjectNode userItem = item("userId", "user-1", "name", "Alice");
String usersArn = tableArn("us-east-1", "Users");
- service.putItem(usersArn, userItem);
+ service.putItem(usersArn, userItem, "us-east-1");
- JsonNode retrieved = service.getItem(usersArn, item("userId", "user-1"));
+ JsonNode retrieved = service.getItem(usersArn, item("userId", "user-1"), "us-east-1");
assertNotNull(retrieved);
assertEquals("Alice", retrieved.get("name").get("S").asText());
}
@Test
void batchGetPreservesRequestKeyButResolvesArn() {
- createUsersTable();
- service.putItem("Users", item("userId", "user-1", "name", "Alice"));
+ createUsersTable("us-east-1");
+ service.putItem("Users", item("userId", "user-1", "name", "Alice"), "us-east-1");
ObjectNode request = mapper.createObjectNode();
request.set("Keys", mapper.createArrayNode().add(item("userId", "user-1")));
@@ -176,8 +181,8 @@ class DynamoDbServiceTest {
@Test
void transactWriteConditionChecksAcceptArnTableName() {
- createUsersTable();
- service.putItem("Users", item("userId", "user-1", "name", "Alice"));
+ createUsersTable("us-east-1");
+ service.putItem("Users", item("userId", "user-1", "name", "Alice"), "us-east-1");
String usersArn = tableArn("us-east-1", "Users");
ObjectNode exprValues = mapper.createObjectNode();
@@ -198,64 +203,69 @@ class DynamoDbServiceTest {
transactItem.set("Update", update);
assertDoesNotThrow(() -> service.transactWriteItems(List.of(transactItem), "us-east-1", null, null));
- assertEquals("Alice", service.getItem("Users", item("userId", "user-1")).get("email").get("S").asText());
+ assertEquals("Alice", service.getItem("Users", item("userId", "user-1"), "us-east-1").get("email").get("S").asText());
}
@Test
void describeTableRejectsRegionMismatchArn() {
- createUsersTable();
+ createUsersTable("us-east-1");
AwsException ex = assertThrows(AwsException.class,
- () -> service.describeTable(tableArn("eu-west-1", "Users")));
+ () -> service.describeTable(tableArn("eu-west-1", "Users"), "us-east-1"));
assertEquals("ValidationException", ex.getErrorCode());
assertEquals(400, ex.getHttpStatus());
}
@Test
void getItemNotFound() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode key = item("userId", "nonexistent");
- JsonNode result = service.getItem("Users", key);
+ JsonNode result = service.getItem("Users", key, region);
assertNull(result);
}
@Test
void putItemOverwrites() {
- createUsersTable();
- service.putItem("Users", item("userId", "user-1", "name", "Alice"));
- service.putItem("Users", item("userId", "user-1", "name", "Bob"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "user-1", "name", "Alice"), region);
+ service.putItem("Users", item("userId", "user-1", "name", "Bob"), region);
- JsonNode retrieved = service.getItem("Users", item("userId", "user-1"));
+ JsonNode retrieved = service.getItem("Users", item("userId", "user-1"), region);
assertEquals("Bob", retrieved.get("name").get("S").asText());
}
@Test
void deleteItem() {
- createUsersTable();
- service.putItem("Users", item("userId", "user-1", "name", "Alice"));
- service.deleteItem("Users", item("userId", "user-1"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "user-1", "name", "Alice"), region);
+ service.deleteItem("Users", item("userId", "user-1"), region);
- assertNull(service.getItem("Users", item("userId", "user-1")));
+ assertNull(service.getItem("Users", item("userId", "user-1"), region));
}
@Test
void putAndGetWithCompositeKey() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "o2", "total", "200"));
- service.putItem("Orders", item("customerId", "c2", "orderId", "o1", "total", "50"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o2", "total", "200"), region);
+ service.putItem("Orders", item("customerId", "c2", "orderId", "o1", "total", "50"), region);
- JsonNode result = service.getItem("Orders", item("customerId", "c1", "orderId", "o1"));
+ JsonNode result = service.getItem("Orders", item("customerId", "c1", "orderId", "o1"), region);
assertNotNull(result);
assertEquals("100", result.get("total").get("S").asText());
}
@Test
void queryByPartitionKey() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "o2", "total", "200"));
- service.putItem("Orders", item("customerId", "c2", "orderId", "o1", "total", "50"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o2", "total", "200"), region);
+ service.putItem("Orders", item("customerId", "c2", "orderId", "o1", "total", "50"), region);
// Build KeyConditions
ObjectNode keyConditions = mapper.createObjectNode();
@@ -268,16 +278,17 @@ class DynamoDbServiceTest {
pkCondition.set("AttributeValueList", attrList);
keyConditions.set("customerId", pkCondition);
- DynamoDbService.QueryResult results = service.query("Orders", keyConditions, null, null, null, null);
+ DynamoDbService.QueryResult results = service.query("Orders", keyConditions, null, null, null, null, region);
assertEquals(2, results.items().size());
}
@Test
void queryWithKeyConditionExpression() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "o2"));
- service.putItem("Orders", item("customerId", "c2", "orderId", "o1"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o2"), region);
+ service.putItem("Orders", item("customerId", "c2", "orderId", "o1"), region);
ObjectNode exprValues = mapper.createObjectNode();
ObjectNode val = mapper.createObjectNode();
@@ -285,16 +296,17 @@ class DynamoDbServiceTest {
exprValues.set(":pk", val);
DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,
- "customerId = :pk", null, null);
+ "customerId = :pk", null, null, region);
assertEquals(2, results.items().size());
}
@Test
void queryWithBeginsWith() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-01"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-15"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-02-01"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-01"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-15"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-02-01"), region);
ObjectNode exprValues = mapper.createObjectNode();
ObjectNode pkVal = mapper.createObjectNode();
@@ -305,16 +317,17 @@ class DynamoDbServiceTest {
exprValues.set(":sk", skVal);
DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,
- "customerId = :pk AND begins_with(orderId, :sk)", null, null);
+ "customerId = :pk AND begins_with(orderId, :sk)", null, null, region);
assertEquals(2, results.items().size());
}
@Test
void queryWithBetweenOnSortKey() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-01"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-15"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2024-02-01"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-01"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-01-15"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2024-02-01"), region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":pk", attributeValue("S", "c1"));
@@ -322,7 +335,7 @@ class DynamoDbServiceTest {
exprValues.set(":to", attributeValue("S", "2024-01-31"));
DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,
- "customerId = :pk AND orderId BETWEEN :from AND :to", null, null);
+ "customerId = :pk AND orderId BETWEEN :from AND :to", null, null, region);
assertEquals(1, results.items().size());
assertEquals("2024-01-15", results.items().getFirst().get("orderId").get("S").asText());
@@ -330,10 +343,10 @@ class DynamoDbServiceTest {
@Test
void queryWithScanIndexForwardFalseReturnsDescendingOrder() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "o2"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "o3"));
+ createOrdersTable("us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1"), "us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o2"), "us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o3"), "us-east-1");
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":pk", attributeValue("S", "c1"));
@@ -348,26 +361,27 @@ class DynamoDbServiceTest {
@Test
void queryAppliesFilterExpressionAfterKeyCondition() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode first = item("customerId", "c1", "orderId", "o1");
first.set("total", attributeValue("N", "100"));
- service.putItem("Orders", first);
+ service.putItem("Orders", first, region);
ObjectNode second = item("customerId", "c1", "orderId", "o2");
second.set("total", attributeValue("N", "100"));
- service.putItem("Orders", second);
+ service.putItem("Orders", second, region);
ObjectNode third = item("customerId", "c1", "orderId", "o3");
third.set("total", attributeValue("N", "99"));
- service.putItem("Orders", third);
+ service.putItem("Orders", third, region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":pk", attributeValue("S", "c1"));
exprValues.set(":min", attributeValue("N", "100"));
DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,
- "customerId = :pk", "total >= :min", null);
+ "customerId = :pk", "total >= :min", null, region);
assertEquals(2, results.items().size());
assertEquals(3, results.scannedCount());
@@ -378,19 +392,19 @@ class DynamoDbServiceTest {
@Test
void queryWithFilterExpressionAndLimitUsesPreFilterPageState() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode first = item("customerId", "c1", "orderId", "o1");
first.set("total", attributeValue("N", "100"));
- service.putItem("Orders", first);
+ service.putItem("Orders", first, "us-east-1");
ObjectNode second = item("customerId", "c1", "orderId", "o2");
second.set("total", attributeValue("N", "99"));
- service.putItem("Orders", second);
+ service.putItem("Orders", second, "us-east-1");
ObjectNode third = item("customerId", "c1", "orderId", "o3");
third.set("total", attributeValue("N", "100"));
- service.putItem("Orders", third);
+ service.putItem("Orders", third, "us-east-1");
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":pk", attributeValue("S", "c1"));
@@ -417,21 +431,23 @@ class DynamoDbServiceTest {
@Test
void scan() {
- createUsersTable();
- service.putItem("Users", item("userId", "u1", "name", "Alice"));
- service.putItem("Users", item("userId", "u2", "name", "Bob"));
- service.putItem("Users", item("userId", "u3", "name", "Charlie"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "u1", "name", "Alice"), region);
+ service.putItem("Users", item("userId", "u2", "name", "Bob"), region);
+ service.putItem("Users", item("userId", "u3", "name", "Charlie"), region);
- DynamoDbService.ScanResult result = service.scan("Users", null, null, null, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", null, null, null, null, null, null, region);
assertEquals(3, result.items().size());
}
@Test
void scanWithScanFilter() {
- createUsersTable();
- service.putItem("Users", item("userId", "u1", "name", "Alice"));
- service.putItem("Users", item("userId", "u2", "name", "Bob"));
- service.putItem("Users", item("userId", "u3", "name", "Charlie"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "u1", "name", "Alice"), region);
+ service.putItem("Users", item("userId", "u2", "name", "Bob"), region);
+ service.putItem("Users", item("userId", "u3", "name", "Charlie"), region);
ObjectNode scanFilter = mapper.createObjectNode();
ObjectNode condition = mapper.createObjectNode();
@@ -443,17 +459,18 @@ class DynamoDbServiceTest {
condition.set("AttributeValueList", attrList);
scanFilter.set("name", condition);
- DynamoDbService.ScanResult result = service.scan("Users", null, null, null, scanFilter, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", null, null, null, scanFilter, null, null, region);
assertEquals(1, result.items().size());
assertEquals("Alice", result.items().get(0).get("name").get("S").asText());
}
@Test
void scanWithScanFilterGE() {
- createUsersTable();
- service.putItem("Users", item("userId", "u1", "name", "Alice"));
- service.putItem("Users", item("userId", "u2", "name", "Bob"));
- service.putItem("Users", item("userId", "u3", "name", "Charlie"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "u1", "name", "Alice"), region);
+ service.putItem("Users", item("userId", "u2", "name", "Bob"), region);
+ service.putItem("Users", item("userId", "u3", "name", "Charlie"), region);
ObjectNode scanFilter = mapper.createObjectNode();
ObjectNode condition = mapper.createObjectNode();
@@ -465,33 +482,36 @@ class DynamoDbServiceTest {
condition.set("AttributeValueList", attrList);
scanFilter.set("name", condition);
- DynamoDbService.ScanResult result = service.scan("Users", null, null, null, scanFilter, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", null, null, null, scanFilter, null, null, region);
assertEquals(2, result.items().size());
}
@Test
void scanWithLimit() {
- createUsersTable();
- service.putItem("Users", item("userId", "u1"));
- service.putItem("Users", item("userId", "u2"));
- service.putItem("Users", item("userId", "u3"));
+ String region = "eu-west-1";
+ createUsersTable(region);
+ service.putItem("Users", item("userId", "u1"), region);
+ service.putItem("Users", item("userId", "u2"), region);
+ service.putItem("Users", item("userId", "u3"), region);
- DynamoDbService.ScanResult result = service.scan("Users", null, null, null, null, 2, null);
+ DynamoDbService.ScanResult result = service.scan("Users", null, null, null, null, 2, null, region);
assertEquals(2, result.items().size());
}
@Test
void operationsOnNonExistentTableThrow() {
- assertThrows(AwsException.class, () -> service.putItem("NoTable", item("id", "1")));
- assertThrows(AwsException.class, () -> service.getItem("NoTable", item("id", "1")));
- assertThrows(AwsException.class, () -> service.deleteItem("NoTable", item("id", "1")));
- assertThrows(AwsException.class, () -> service.query("NoTable", null, null, null, null, null));
- assertThrows(AwsException.class, () -> service.scan("NoTable", null, null, null, null, null, null));
+ String region = "eu-west-1";
+ assertThrows(AwsException.class, () -> service.putItem("NoTable", item("id", "1"), region));
+ assertThrows(AwsException.class, () -> service.getItem("NoTable", item("id", "1"), region));
+ assertThrows(AwsException.class, () -> service.deleteItem("NoTable", item("id", "1"), region));
+ assertThrows(AwsException.class, () -> service.query("NoTable", null, null, null, null, null, region));
+ assertThrows(AwsException.class, () -> service.scan("NoTable", null, null, null, null, null, null, region));
}
@Test
void updateItemSetIfNotExistsOnNonExistentItemCreatesAttribute() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode key = item("customerId", "1", "orderId", "sort1");
@@ -502,9 +522,9 @@ class DynamoDbServiceTest {
service.updateItem("Orders", key, null,
"SET price = if_not_exists(price, :val)",
- null, exprValues, null);
+ null, exprValues, null, region);
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, region);
assertNotNull(stored, "item should have been created");
assertTrue(stored.has("price"), "price attribute must be present on a newly created item");
assertEquals("100", stored.get("price").get("N").asText());
@@ -512,7 +532,8 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsPreservesExistingValue() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
// Put an item that already has price = 200
ObjectNode existing = mapper.createObjectNode();
@@ -522,7 +543,7 @@ class DynamoDbServiceTest {
existing.set("customerId", pkVal);
existing.set("orderId", skVal);
existing.set("price", priceExisting);
- service.putItem("Orders", existing);
+ service.putItem("Orders", existing, region);
ObjectNode key = item("customerId", "1", "orderId", "sort1");
@@ -532,9 +553,9 @@ class DynamoDbServiceTest {
service.updateItem("Orders", key, null,
"SET price = if_not_exists(price, :val)",
- null, exprValues, null);
+ null, exprValues, null, region);
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, region);
assertNotNull(stored);
// Existing value must NOT be overwritten
assertEquals("200", stored.get("price").get("N").asText(),
@@ -543,10 +564,11 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsSetsAttributeWhenMissingFromExistingItem() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
// Put an item that does NOT have a price attribute
- service.putItem("Orders", item("customerId", "1", "orderId", "sort1"));
+ service.putItem("Orders", item("customerId", "1", "orderId", "sort1"), region);
ObjectNode key = item("customerId", "1", "orderId", "sort1");
@@ -556,9 +578,9 @@ class DynamoDbServiceTest {
service.updateItem("Orders", key, null,
"SET price = if_not_exists(price, :val)",
- null, exprValues, null);
+ null, exprValues, null, region);
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, region);
assertNotNull(stored);
assertTrue(stored.has("price"),
"price should be set when it was absent from an existing item");
@@ -567,7 +589,8 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsMultipleAttributesOnNewItem() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode key = item("userId", "u-new");
@@ -582,9 +605,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #n = if_not_exists(#n, :name), score = if_not_exists(score, :score)",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored, "item should have been created");
assertTrue(stored.has("name"), "name attribute must be present");
assertEquals("DefaultName", stored.get("name").get("S").asText());
@@ -594,8 +617,9 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsCopiesSourceAttributeWhenAttrNameDiffersFromCheckAttr() {
+ String region = "eu-west-1";
// SET a = if_not_exists(b, :v) where b exists → a must be set to b's current value
- createUsersTable();
+ createUsersTable(region);
// Put an item that has "source" but not "target"
ObjectNode existing = mapper.createObjectNode();
@@ -603,7 +627,7 @@ class DynamoDbServiceTest {
ObjectNode sourceVal = mapper.createObjectNode(); sourceVal.put("S", "copied-value");
existing.set("userId", userIdVal);
existing.set("source", sourceVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u-copy");
@@ -617,9 +641,9 @@ class DynamoDbServiceTest {
// target = if_not_exists(source, :v) — source exists, so target should receive source's value
service.updateItem("Users", key, null,
"SET target = if_not_exists(#src, :v)",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertTrue(stored.has("target"), "target attribute must be present");
assertEquals("copied-value", stored.get("target").get("S").asText(),
@@ -628,11 +652,12 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsUsesFallbackWhenCheckAttrAbsentAndAttrNameDiffers() {
+ String region = "eu-west-1";
// SET a = if_not_exists(b, :v) where b is absent → a must be set to :v
- createUsersTable();
+ createUsersTable(region);
// Item has no "source" attribute
- service.putItem("Users", item("userId", "u-fallback"));
+ service.putItem("Users", item("userId", "u-fallback"), region);
ObjectNode key = item("userId", "u-fallback");
@@ -645,9 +670,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET target = if_not_exists(#src, :v)",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertTrue(stored.has("target"), "target attribute must be present");
assertEquals("fallback", stored.get("target").get("S").asText(),
@@ -656,7 +681,8 @@ class DynamoDbServiceTest {
@Test
void updateItemSetArithmeticIncrement() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
// Put an item with counter = 100
ObjectNode existing = mapper.createObjectNode();
@@ -664,7 +690,7 @@ class DynamoDbServiceTest {
ObjectNode counterVal = mapper.createObjectNode();
counterVal.put("N", "100");
existing.set("counter", counterVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -677,9 +703,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #cnt = #cnt + :inc",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("101", stored.get("counter").get("N").asText(),
"counter should be incremented from 100 to 101");
@@ -687,14 +713,15 @@ class DynamoDbServiceTest {
@Test
void updateItemSetArithmeticDecrement() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
ObjectNode counterVal = mapper.createObjectNode();
counterVal.put("N", "50");
existing.set("counter", counterVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -707,9 +734,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #cnt = #cnt - :dec",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("47", stored.get("counter").get("N").asText(),
"counter should be decremented from 50 to 47");
@@ -717,7 +744,8 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsWithArithmeticOnNewItem() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -733,9 +761,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #cnt = if_not_exists(#cnt, :start) + :inc",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("60000001", stored.get("counter").get("N").asText(),
"counter should be if_not_exists default (60000000) + 1 = 60000001");
@@ -743,14 +771,15 @@ class DynamoDbServiceTest {
@Test
void updateItemSetIfNotExistsWithArithmeticOnExistingItem() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
ObjectNode counterVal = mapper.createObjectNode();
counterVal.put("N", "60000005");
existing.set("counter", counterVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -766,9 +795,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #cnt = if_not_exists(#cnt, :start) + :inc",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("60000006", stored.get("counter").get("N").asText(),
"counter should be existing (60000005) + 1 = 60000006");
@@ -776,7 +805,8 @@ class DynamoDbServiceTest {
@Test
void updateItemSetArithmeticConsecutiveIncrements() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -794,10 +824,10 @@ class DynamoDbServiceTest {
for (int i = 0; i < 3; i++) {
service.updateItem("Users", key, null,
"SET #cnt = if_not_exists(#cnt, :start) + :inc",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
}
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("3", stored.get("counter").get("N").asText(),
"counter should be 3 after three increments starting from 0");
@@ -805,58 +835,61 @@ class DynamoDbServiceTest {
@Test
void scanWithBoolFilterExpression() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("deleted", boolAttributeValue(false));
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
u2.set("deleted", boolAttributeValue(true));
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
ObjectNode u3 = item("userId", "u3");
u3.set("deleted", boolAttributeValue(false));
- service.putItem("Users", u3);
+ service.putItem("Users", u3, region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":d", boolAttributeValue(true));
- DynamoDbService.ScanResult result = service.scan("Users", "deleted <> :d", null, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "deleted <> :d", null, exprValues, null, null, null, region);
assertEquals(2, result.items().size());
}
@Test
void scanContainsOnListAttribute() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("tags", listAttributeValue("a", "b"));
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
u2.set("tags", listAttributeValue("a", "c"));
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
ObjectNode u3 = item("userId", "u3");
u3.set("tags", listAttributeValue("b", "c"));
- service.putItem("Users", u3);
+ service.putItem("Users", u3, region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":v", attributeValue("S", "a"));
- DynamoDbService.ScanResult result = service.scan("Users", "contains(tags, :v)", null, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "contains(tags, :v)", null, exprValues, null, null, null, region);
assertEquals(2, result.items().size());
}
@Test
void scanContainsOnStringSetAttribute() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("roles", stringSetAttributeValue("admin", "user"));
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
u2.set("roles", stringSetAttributeValue("user"));
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":r", attributeValue("S", "admin"));
@@ -864,35 +897,36 @@ class DynamoDbServiceTest {
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#r", "roles");
- DynamoDbService.ScanResult result = service.scan("Users", "contains(#r, :r)", exprNames, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "contains(#r, :r)", exprNames, exprValues, null, null, null, region);
assertEquals(1, result.items().size());
}
@Test
void scanAttributeExistsOnNestedMapPath() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("info", mapAttributeValue("name", "Alice"));
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
ObjectNode emptyMap = mapper.createObjectNode();
ObjectNode mapWrapper = mapper.createObjectNode();
mapWrapper.set("M", emptyMap);
u2.set("info", mapWrapper);
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
ObjectNode u3 = item("userId", "u3");
u3.set("info", mapAttributeValue("name", "Bob"));
- service.putItem("Users", u3);
+ service.putItem("Users", u3, region);
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#n", "name");
- DynamoDbService.ScanResult result = service.scan("Users", "attribute_exists(info.#n)", exprNames, null, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "attribute_exists(info.#n)", exprNames, null, null, null, null, region);
assertEquals(2, result.items().size());
- DynamoDbService.ScanResult result2 = service.scan("Users", "attribute_not_exists(info.#n)", exprNames, null, null, null, null);
+ DynamoDbService.ScanResult result2 = service.scan("Users", "attribute_not_exists(info.#n)", exprNames, null, null, null, null, region);
assertEquals(1, result2.items().size());
}
@@ -952,44 +986,47 @@ class DynamoDbServiceTest {
@Test
void scanContainsOnNumberSetWithNumericNormalization() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("scores", numberSetAttributeValue("1", "2", "3"));
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
u2.set("scores", numberSetAttributeValue("4", "5"));
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
// Search for "1.0" — should match "1" via numeric comparison
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":v", attributeValue("N", "1.0"));
- DynamoDbService.ScanResult result = service.scan("Users", "contains(scores, :v)", null, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "contains(scores, :v)", null, exprValues, null, null, null, region);
assertEquals(1, result.items().size(), "contains() on NS should match 1.0 == 1 numerically");
}
@Test
void scanContainsOnBinarySet() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
u1.set("bins", binarySetAttributeValue("AQID", "BAUG")); // base64 for [1,2,3] and [4,5,6]
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
u2.set("bins", binarySetAttributeValue("BwgJ"));
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":v", attributeValue("B", "AQID"));
- DynamoDbService.ScanResult result = service.scan("Users", "contains(bins, :v)", null, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "contains(bins, :v)", null, exprValues, null, null, null, region);
assertEquals(1, result.items().size());
}
@Test
void listAppendIfNotExistsCreatesListWhenAttributeMissing() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode key = item("userId", "u-list-new");
@@ -1002,9 +1039,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #items = list_append(if_not_exists(#items, :e), :val)",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertTrue(stored.has("items"), "items attribute must be created");
assertEquals(1, stored.get("items").get("L").size());
@@ -1013,11 +1050,12 @@ class DynamoDbServiceTest {
@Test
void listAppendIfNotExistsAppendsWhenAttributePresent() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode existing = item("userId", "u-list-existing");
existing.set("items", listAttributeValue("a"));
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u-list-existing");
ObjectNode exprValues = mapper.createObjectNode();
@@ -1029,9 +1067,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #items = list_append(if_not_exists(#items, :e), :val)",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals(2, stored.get("items").get("L").size());
assertEquals("a", stored.get("items").get("L").get(0).get("S").asText());
@@ -1040,7 +1078,8 @@ class DynamoDbServiceTest {
@Test
void scanContainsOnListWithNumericElements() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode u1 = item("userId", "u1");
var list = mapper.createArrayNode();
list.add(attributeValue("N", "10"));
@@ -1048,7 +1087,7 @@ class DynamoDbServiceTest {
ObjectNode listNode = mapper.createObjectNode();
listNode.set("L", list);
u1.set("values", listNode);
- service.putItem("Users", u1);
+ service.putItem("Users", u1, region);
ObjectNode u2 = item("userId", "u2");
var list2 = mapper.createArrayNode();
@@ -1056,7 +1095,7 @@ class DynamoDbServiceTest {
ObjectNode listNode2 = mapper.createObjectNode();
listNode2.set("L", list2);
u2.set("values", listNode2);
- service.putItem("Users", u2);
+ service.putItem("Users", u2, region);
// Search for N:10.0 — should match N:10 via type-aware comparison
ObjectNode exprValues = mapper.createObjectNode();
@@ -1065,13 +1104,14 @@ class DynamoDbServiceTest {
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#vals", "values");
- DynamoDbService.ScanResult result = service.scan("Users", "contains(#vals, :v)", exprNames, exprValues, null, null, null);
+ DynamoDbService.ScanResult result = service.scan("Users", "contains(#vals, :v)", exprNames, exprValues, null, null, null, region);
assertEquals(1, result.items().size(), "contains() on List with N elements should use type-aware numeric comparison");
}
@Test
void updateItemSetAddsToStringSet() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode key = item("customerId", "1", "orderId", "sort1");
@@ -1088,7 +1128,7 @@ class DynamoDbServiceTest {
service.updateItem("Orders", key, null,
"SET price = if_not_exists(price, :val) ADD tags :newTag",
- null, exprValues, null);
+ null, exprValues, null, region);
// And add another tag to the same item, to verify that the ADD works on existing items as well
ObjectNode tagVal2 = mapper.createObjectNode();
@@ -1097,9 +1137,9 @@ class DynamoDbServiceTest {
exprValues.set(":newTag", tagVal2);
DynamoDbService.UpdateResult updateResult = service.updateItem("Orders", key, null,
"SET price = if_not_exists(price, :val) ADD tags :newTag",
- null, exprValues, null);
+ null, exprValues, null, region);
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, region);
assertNotNull(stored, "item should have been created");
assertTrue(stored.has("tags"), "tags attribute must be present on item after ADD");
@@ -1125,7 +1165,8 @@ class DynamoDbServiceTest {
*/
@Test
void testUpdateWithSetAndRemoveCombined() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
// Put initial item WITHOUT the boolean field
ObjectNode initialItem = mapper.createObjectNode();
@@ -1133,12 +1174,12 @@ class DynamoDbServiceTest {
initialItem.set("created", attributeValue("N", "1234567890"));
initialItem.set("entries", attributeValue("S", "initial"));
initialItem.set("tempField", attributeValue("S", "to be removed"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
// Verify initial state - isActive doesn't exist
ObjectNode key = mapper.createObjectNode();
key.set("userId", attributeValue("S", "user-123"));
- JsonNode beforeUpdate = service.getItem("Users", key);
+ JsonNode beforeUpdate = service.getItem("Users", key, region);
assertFalse(beforeUpdate.has("isActive"), "isActive should not exist initially");
assertTrue(beforeUpdate.has("tempField"), "tempField should exist initially");
@@ -1157,7 +1198,7 @@ class DynamoDbServiceTest {
String updateExpr = "SET #entries = :entries, #isActive = :isActive REMOVE #tempField, #created";
DynamoDbService.UpdateResult result = service.updateItem("Users", key, null,
- updateExpr, exprAttrNames, exprAttrValues, "ALL_NEW");
+ updateExpr, exprAttrNames, exprAttrValues, "ALL_NEW", region);
// Verify the result
JsonNode newItem = result.newItem();
@@ -1176,7 +1217,7 @@ class DynamoDbServiceTest {
assertFalse(newItem.has("created"), "created should be removed");
// Get item to double-check persistence
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertTrue(stored.get("isActive").get("BOOL").asBoolean(),
"isActive should still be true after get");
}
@@ -1187,7 +1228,8 @@ class DynamoDbServiceTest {
*/
@Test
void testRemoveNestedMapKey() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
// Put item with a map attribute containing two keys
ObjectNode initialItem = mapper.createObjectNode();
@@ -1198,19 +1240,19 @@ class DynamoDbServiceTest {
ObjectNode ratingsMap = mapper.createObjectNode();
ratingsMap.set("M", ratingsInner);
initialItem.set("ratings", ratingsMap);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode key = mapper.createObjectNode();
key.set("userId", attributeValue("S", "user-1"));
// Verify both keys exist
- JsonNode before = service.getItem("Users", key);
+ JsonNode before = service.getItem("Users", key, region);
assertTrue(before.get("ratings").get("M").has("foo"));
assertTrue(before.get("ratings").get("M").has("bar"));
// REMOVE ratings.foo
DynamoDbService.UpdateResult result = service.updateItem("Users", key, null,
- "REMOVE ratings.foo", null, null, "ALL_NEW");
+ "REMOVE ratings.foo", null, null, "ALL_NEW", region);
JsonNode updated = result.newItem();
assertFalse(updated.get("ratings").get("M").has("foo"),
@@ -1225,7 +1267,8 @@ class DynamoDbServiceTest {
*/
@Test
void testRemoveNestedMapKeyWithExpressionNames() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "user-2"));
@@ -1235,7 +1278,7 @@ class DynamoDbServiceTest {
ObjectNode metaMap = mapper.createObjectNode();
metaMap.set("M", metaInner);
initialItem.set("metadata", metaMap);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode key = mapper.createObjectNode();
key.set("userId", attributeValue("S", "user-2"));
@@ -1246,7 +1289,7 @@ class DynamoDbServiceTest {
exprAttrNames.put("#tmp", "temp");
DynamoDbService.UpdateResult result = service.updateItem("Users", key, null,
- "REMOVE #meta.#tmp", exprAttrNames, null, "ALL_NEW");
+ "REMOVE #meta.#tmp", exprAttrNames, null, "ALL_NEW", region);
JsonNode updated = result.newItem();
assertFalse(updated.get("metadata").get("M").has("temp"),
@@ -1260,19 +1303,20 @@ class DynamoDbServiceTest {
*/
@Test
void testRemoveNonExistentNestedPath() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "user-3"));
initialItem.set("name", attributeValue("S", "Alice"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode key = mapper.createObjectNode();
key.set("userId", attributeValue("S", "user-3"));
// REMOVE on a path where the parent map doesn't exist - should not fail
DynamoDbService.UpdateResult result = service.updateItem("Users", key, null,
- "REMOVE nonexistent.child", null, null, "ALL_NEW");
+ "REMOVE nonexistent.child", null, null, "ALL_NEW", region);
JsonNode updated = result.newItem();
assertEquals("Alice", updated.get("name").get("S").asText(),
@@ -1284,7 +1328,8 @@ class DynamoDbServiceTest {
*/
@Test
void testRemoveDeeplyNestedMapKey() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
// Build: settings.notifications.email = "on", settings.notifications.sms = "off"
ObjectNode initialItem = mapper.createObjectNode();
@@ -1302,14 +1347,14 @@ class DynamoDbServiceTest {
settingsMap.set("M", settingsInner);
initialItem.set("settings", settingsMap);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode key = mapper.createObjectNode();
key.set("userId", attributeValue("S", "user-4"));
// REMOVE settings.notifications.sms
DynamoDbService.UpdateResult result = service.updateItem("Users", key, null,
- "REMOVE settings.notifications.sms", null, null, "ALL_NEW");
+ "REMOVE settings.notifications.sms", null, null, "ALL_NEW", region);
JsonNode updated = result.newItem();
JsonNode notifs = updated.get("settings").get("M").get("notifications").get("M");
@@ -1329,7 +1374,7 @@ class DynamoDbServiceTest {
initialItem.set("userId", attributeValue("S", id));
initialItem.set("counter", attributeValue("N", Long.toString(counterValue)));
initialItem.set("name", attributeValue("S", nameValue));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, "eu-west-1");
}
private ObjectNode userIdKey(String id) {
@@ -1340,7 +1385,8 @@ class DynamoDbServiceTest {
@Test
void updateItemWithDifferentSortKeysCreatesSeparateItems() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode key1 = item("customerId", "c1", "orderId", "app1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -1349,31 +1395,32 @@ class DynamoDbServiceTest {
exprNames.put("#owner", "owner");
service.updateItem("Orders", key1, null,
- "SET #owner = :owner", exprNames, exprValues, null);
+ "SET #owner = :owner", exprNames, exprValues, null, region);
ObjectNode key2 = item("customerId", "c1", "orderId", "app2");
exprValues = mapper.createObjectNode();
exprValues.set(":owner", attributeValue("S", "owner-2"));
service.updateItem("Orders", key2, null,
- "SET #owner = :owner", exprNames, exprValues, null);
+ "SET #owner = :owner", exprNames, exprValues, null, region);
- DynamoDbService.ScanResult scanResult = service.scan("Orders", null, null, null, null, null, null);
+ DynamoDbService.ScanResult scanResult = service.scan("Orders", null, null, null, null, null, null, region);
assertEquals(2, scanResult.items().size(),
"two items with same partition key but different sort keys must be stored separately");
- JsonNode item1 = service.getItem("Orders", key1);
+ JsonNode item1 = service.getItem("Orders", key1, region);
assertNotNull(item1);
assertEquals("owner-1", item1.get("owner").get("S").asText());
- JsonNode item2 = service.getItem("Orders", key2);
+ JsonNode item2 = service.getItem("Orders", key2, region);
assertNotNull(item2);
assertEquals("owner-2", item2.get("owner").get("S").asText());
}
@Test
void updateItemMissingSortKeyThrowsValidationException() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode keyMissingSk = item("customerId", "c1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -1381,48 +1428,52 @@ class DynamoDbServiceTest {
AwsException ex = assertThrows(AwsException.class, () ->
service.updateItem("Orders", keyMissingSk, null,
- "SET name = :val", null, exprValues, null));
+ "SET name = :val", null, exprValues, null, region));
assertEquals("ValidationException", ex.getErrorCode());
}
@Test
void getItemMissingSortKeyThrowsValidationException() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"), region);
ObjectNode keyMissingSk = item("customerId", "c1");
AwsException ex = assertThrows(AwsException.class, () ->
- service.getItem("Orders", keyMissingSk));
+ service.getItem("Orders", keyMissingSk, region));
assertEquals("ValidationException", ex.getErrorCode());
}
@Test
void deleteItemMissingSortKeyThrowsValidationException() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1", "total", "100"), region);
ObjectNode keyMissingSk = item("customerId", "c1");
AwsException ex = assertThrows(AwsException.class, () ->
- service.deleteItem("Orders", keyMissingSk));
+ service.deleteItem("Orders", keyMissingSk, region));
assertEquals("ValidationException", ex.getErrorCode());
}
@Test
void putItemMissingSortKeyThrowsValidationException() {
- createOrdersTable();
+ String region = "eu-west-1";
+ createOrdersTable(region);
ObjectNode itemMissingSk = item("customerId", "c1", "total", "100");
AwsException ex = assertThrows(AwsException.class, () ->
- service.putItem("Orders", itemMissingSk));
+ service.putItem("Orders", itemMissingSk, region));
assertEquals("ValidationException", ex.getErrorCode());
}
@Test
void updateExpressionAcceptsNewlineBetweenSetAndAdd() {
+ String region = "eu-west-1";
// "SET ... \n ADD ..." — previously both clauses were silently dropped:
// applySetClause greedily consumed ":newName\nADD counter :inc" as the
// value and failed the lookup, so neither SET nor ADD ran.
- createUsersTable();
+ createUsersTable(region);
seedCounterItem("u1", 1L, "old");
ObjectNode names = mapper.createObjectNode();
@@ -1433,9 +1484,9 @@ class DynamoDbServiceTest {
values.set(":inc", attributeValue("N", "5"));
service.updateItem("Users", userIdKey("u1"), null,
- "SET #n = :newName\nADD #c :inc", names, values, "ALL_NEW");
+ "SET #n = :newName\nADD #c :inc", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u1"));
+ JsonNode stored = service.getItem("Users", userIdKey("u1"), region);
assertEquals("new", stored.get("name").get("S").asText(),
"SET clause must apply across a newline boundary");
assertEquals("6", stored.get("counter").get("N").asText(),
@@ -1444,7 +1495,8 @@ class DynamoDbServiceTest {
@Test
void updateExpressionAcceptsNewlineBetweenAddAndSet() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
seedCounterItem("u2", 10L, "old");
ObjectNode names = mapper.createObjectNode();
@@ -1455,16 +1507,17 @@ class DynamoDbServiceTest {
values.set(":inc", attributeValue("N", "3"));
service.updateItem("Users", userIdKey("u2"), null,
- "ADD #c :inc\nSET #n = :newName", names, values, "ALL_NEW");
+ "ADD #c :inc\nSET #n = :newName", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u2"));
+ JsonNode stored = service.getItem("Users", userIdKey("u2"), region);
assertEquals("new", stored.get("name").get("S").asText());
assertEquals("13", stored.get("counter").get("N").asText());
}
@Test
void updateExpressionAcceptsTabBetweenClauses() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
seedCounterItem("u3", 0L, "old");
ObjectNode names = mapper.createObjectNode();
@@ -1475,16 +1528,17 @@ class DynamoDbServiceTest {
values.set(":inc", attributeValue("N", "1"));
service.updateItem("Users", userIdKey("u3"), null,
- "SET #n = :newName\tADD #c :inc", names, values, "ALL_NEW");
+ "SET #n = :newName\tADD #c :inc", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u3"));
+ JsonNode stored = service.getItem("Users", userIdKey("u3"), region);
assertEquals("new", stored.get("name").get("S").asText());
assertEquals("1", stored.get("counter").get("N").asText());
}
@Test
void updateExpressionAcceptsCrlfBetweenClauses() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
seedCounterItem("u4", 100L, "old");
ObjectNode names = mapper.createObjectNode();
@@ -1495,17 +1549,18 @@ class DynamoDbServiceTest {
values.set(":inc", attributeValue("N", "7"));
service.updateItem("Users", userIdKey("u4"), null,
- "SET #n = :newName\r\nADD #c :inc", names, values, "ALL_NEW");
+ "SET #n = :newName\r\nADD #c :inc", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u4"));
+ JsonNode stored = service.getItem("Users", userIdKey("u4"), region);
assertEquals("new", stored.get("name").get("S").asText());
assertEquals("107", stored.get("counter").get("N").asText());
}
@Test
void updateExpressionAcceptsThreeNewlineSeparatedClauses() {
+ String region = "eu-west-1";
// Canonical Go SDK shape: SET + ADD + DELETE joined by '\n'.
- createUsersTable();
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u5"));
@@ -1513,7 +1568,7 @@ class DynamoDbServiceTest {
ObjectNode ss = mapper.createObjectNode();
ss.putArray("SS").add("keep").add("drop");
initialItem.set("tagsToClear", ss);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode names = mapper.createObjectNode();
names.put("#a", "alpha");
@@ -1530,9 +1585,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", userIdKey("u5"), null,
"SET #a = :a, #b = :b\nADD #c :inc\nDELETE #d :d",
- names, values, "ALL_NEW");
+ names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u5"));
+ JsonNode stored = service.getItem("Users", userIdKey("u5"), region);
assertEquals("A", stored.get("alpha").get("S").asText());
assertEquals("B", stored.get("beta").get("S").asText());
assertEquals("6", stored.get("counter").get("N").asText());
@@ -1544,13 +1599,14 @@ class DynamoDbServiceTest {
@Test
void updateExpressionAcceptsNewlineBetweenRemoveAndSet() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u6"));
initialItem.set("tempField", attributeValue("S", "bye"));
initialItem.set("name", attributeValue("S", "old"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode names = mapper.createObjectNode();
names.put("#t", "tempField");
@@ -1559,16 +1615,17 @@ class DynamoDbServiceTest {
values.set(":newName", attributeValue("S", "new"));
service.updateItem("Users", userIdKey("u6"), null,
- "REMOVE #t\nSET #n = :newName", names, values, "ALL_NEW");
+ "REMOVE #t\nSET #n = :newName", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u6"));
+ JsonNode stored = service.getItem("Users", userIdKey("u6"), region);
assertFalse(stored.has("tempField"), "tempField should be removed");
assertEquals("new", stored.get("name").get("S").asText());
}
@Test
void updateExpressionAcceptsNewlineBetweenDeleteAndAdd() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u7"));
@@ -1576,7 +1633,7 @@ class DynamoDbServiceTest {
ObjectNode ss = mapper.createObjectNode();
ss.putArray("SS").add("keep").add("drop");
initialItem.set("tags", ss);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode names = mapper.createObjectNode();
names.put("#c", "counter");
@@ -1588,9 +1645,9 @@ class DynamoDbServiceTest {
values.set(":d", dropSet);
service.updateItem("Users", userIdKey("u7"), null,
- "DELETE #tag :d\nADD #c :inc", names, values, "ALL_NEW");
+ "DELETE #tag :d\nADD #c :inc", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u7"));
+ JsonNode stored = service.getItem("Users", userIdKey("u7"), region);
assertEquals("12", stored.get("counter").get("N").asText());
JsonNode remaining = stored.get("tags").get("SS");
assertEquals(1, remaining.size());
@@ -1599,11 +1656,12 @@ class DynamoDbServiceTest {
@Test
void updateExpressionAddBeforeSetDoesNotSwallowSetKeywordAtIntraSetComma() {
+ String region = "eu-west-1";
// Regression for Bug 2: before the advancement alignment fix,
// applyAddClause preferred the next comma (inside the SET clause's
// "b = :b, c = :c") over the SET keyword, consuming the keyword and
// dropping the SET entirely.
- createUsersTable();
+ createUsersTable(region);
seedCounterItem("u8", 0L, "old");
ObjectNode names = mapper.createObjectNode();
@@ -1615,9 +1673,9 @@ class DynamoDbServiceTest {
values.set(":other", attributeValue("S", "x"));
service.updateItem("Users", userIdKey("u8"), null,
- "ADD #c :inc SET #n = :newName, extra = :other", names, values, "ALL_NEW");
+ "ADD #c :inc SET #n = :newName, extra = :other", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u8"));
+ JsonNode stored = service.getItem("Users", userIdKey("u8"), region);
assertEquals("1", stored.get("counter").get("N").asText(), "ADD must apply");
assertEquals("new", stored.get("name").get("S").asText(), "SET must apply");
assertEquals("x", stored.get("extra").get("S").asText(), "second SET assignment must apply");
@@ -1625,13 +1683,14 @@ class DynamoDbServiceTest {
@Test
void updateExpressionRemoveBeforeSetDoesNotSwallowSetKeywordAtIntraSetComma() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u9"));
initialItem.set("tempField", attributeValue("S", "bye"));
initialItem.set("name", attributeValue("S", "old"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode names = mapper.createObjectNode();
names.put("#t", "tempField");
@@ -1641,9 +1700,9 @@ class DynamoDbServiceTest {
values.set(":other", attributeValue("S", "x"));
service.updateItem("Users", userIdKey("u9"), null,
- "REMOVE #t SET #n = :newName, extra = :other", names, values, "ALL_NEW");
+ "REMOVE #t SET #n = :newName, extra = :other", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u9"));
+ JsonNode stored = service.getItem("Users", userIdKey("u9"), region);
assertFalse(stored.has("tempField"), "REMOVE must apply");
assertEquals("new", stored.get("name").get("S").asText(), "SET must apply");
assertEquals("x", stored.get("extra").get("S").asText(), "second SET assignment must apply");
@@ -1651,7 +1710,8 @@ class DynamoDbServiceTest {
@Test
void updateExpressionDeleteBeforeSetDoesNotSwallowSetKeywordAtIntraSetComma() {
- createUsersTable();
+ String region = "eu-west-1";
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u10"));
@@ -1659,7 +1719,7 @@ class DynamoDbServiceTest {
ObjectNode ss = mapper.createObjectNode();
ss.putArray("SS").add("keep").add("drop");
initialItem.set("tags", ss);
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode names = mapper.createObjectNode();
names.put("#tag", "tags");
@@ -1672,9 +1732,9 @@ class DynamoDbServiceTest {
values.set(":other", attributeValue("S", "x"));
service.updateItem("Users", userIdKey("u10"), null,
- "DELETE #tag :d SET #n = :newName, extra = :other", names, values, "ALL_NEW");
+ "DELETE #tag :d SET #n = :newName, extra = :other", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u10"));
+ JsonNode stored = service.getItem("Users", userIdKey("u10"), region);
JsonNode remaining = stored.get("tags").get("SS");
assertEquals(1, remaining.size());
assertEquals("keep", remaining.get(0).asText());
@@ -1684,22 +1744,23 @@ class DynamoDbServiceTest {
@Test
void updateExpressionFindsValidKeywordAfterAttributeNameSuffix() {
+ String region = "eu-west-1";
// Regression for the indexOfKeyword loop: an attribute name ending in
// a keyword substring ("oldSET") must not mask a following real clause.
- createUsersTable();
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u12"));
initialItem.set("oldSET", attributeValue("S", "bye"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode values = mapper.createObjectNode();
values.set(":v", attributeValue("S", "hi"));
service.updateItem("Users", userIdKey("u12"), null,
- "REMOVE oldSET SET newAttr = :v", null, values, "ALL_NEW");
+ "REMOVE oldSET SET newAttr = :v", null, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u12"));
+ JsonNode stored = service.getItem("Users", userIdKey("u12"), region);
assertFalse(stored.has("oldSET"), "oldSET should be removed");
assertEquals("hi", stored.get("newAttr").get("S").asText(),
"SET must still be recognised past the oldSET attribute name");
@@ -1707,14 +1768,15 @@ class DynamoDbServiceTest {
@Test
void updateExpressionDoesNotMatchKeywordInsideAttributeName() {
+ String region = "eu-west-1";
// False-positive guard for the indexOfKeyword boundary relaxation.
// An attribute literally named "prefixSET" must not be treated as a
// clause keyword, and a following comma must still split the SET clause.
- createUsersTable();
+ createUsersTable(region);
ObjectNode initialItem = mapper.createObjectNode();
initialItem.set("userId", attributeValue("S", "u11"));
- service.putItem("Users", initialItem);
+ service.putItem("Users", initialItem, region);
ObjectNode values = mapper.createObjectNode();
values.set(":v1", attributeValue("S", "one"));
@@ -1724,19 +1786,20 @@ class DynamoDbServiceTest {
names.put("#other", "other");
service.updateItem("Users", userIdKey("u11"), null,
- "SET prefixSET = :v1, #other = :v2", names, values, "ALL_NEW");
+ "SET prefixSET = :v1, #other = :v2", names, values, "ALL_NEW", region);
- JsonNode stored = service.getItem("Users", userIdKey("u11"));
+ JsonNode stored = service.getItem("Users", userIdKey("u11"), region);
assertEquals("one", stored.get("prefixSET").get("S").asText());
assertEquals("two", stored.get("other").get("S").asText());
}
@Test
void queryWithParenthesizedBetweenKeyCondition() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "2026-01-01Z#a"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2026-06-15Z#b"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2026-12-31Z#c"));
+ String region = "eu-west-1";
+ createOrdersTable(region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2026-01-01Z#a"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2026-06-15Z#b"), region);
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2026-12-31Z#c"), region);
ObjectNode exprValues = mapper.createObjectNode();
exprValues.set(":pk", attributeValue("S", "c1"));
@@ -1744,15 +1807,15 @@ class DynamoDbServiceTest {
exprValues.set(":end", attributeValue("S", "2026-12-31Z#z"));
var result = service.query("Orders", null, exprValues,
- "customerId = :pk AND (orderId BETWEEN :start AND :end)", null, null);
+ "customerId = :pk AND (orderId BETWEEN :start AND :end)", null, null, region);
assertEquals(3, result.items().size(), "parenthesized BETWEEN should work");
}
@Test
void queryWithCompactAndBetweenKeyCondition() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "2026-01-01Z#a"));
- service.putItem("Orders", item("customerId", "c1", "orderId", "2026-06-15Z#b"));
+ createOrdersTable("us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2026-01-01Z#a"), "us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "2026-06-15Z#b"), "us-east-1");
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#f0", "customerId");
@@ -1769,8 +1832,8 @@ class DynamoDbServiceTest {
@Test
void updateItemWithNestedDottedPathSetAndRemove() {
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1"));
+ createOrdersTable("us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1"), "us-east-1");
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#details", "details");
@@ -1812,8 +1875,8 @@ class DynamoDbServiceTest {
void updateItemSetFollowedByRemovePreservesAllAssignments() {
// Reproduces the bug where SET's last assignment was lost because findNextComma
// consumed into the REMOVE clause's comma-separated list.
- createOrdersTable();
- service.putItem("Orders", item("customerId", "c1", "orderId", "o1"));
+ createOrdersTable("us-east-1");
+ service.putItem("Orders", item("customerId", "c1", "orderId", "o1"), "us-east-1");
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#a", "fieldA");
@@ -1847,11 +1910,11 @@ class DynamoDbServiceTest {
@Test
void updateItemConditionFailedReturnValuesNone() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order);
+ service.putItem("Orders", order, "us-east-1");
ObjectNode exprValues = mapper.createObjectNode();
ObjectNode newVal = attributeValue("S", "newVal");
@@ -1863,7 +1926,7 @@ class DynamoDbServiceTest {
"SET newAttr = :val",
null, exprValues, "NONE", "testAttr <> :test", "us-east-1", "NONE"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
assertFalse(stored.has("newAttr"), "new attribute should not have been added");
@@ -1872,11 +1935,11 @@ class DynamoDbServiceTest {
@Test
void updateItemConditionFailedReturnValuesAllOld() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order);
+ service.putItem("Orders", order, "us-east-1");
ObjectNode exprValues = mapper.createObjectNode();
ObjectNode newVal = attributeValue("S", "newVal");
@@ -1888,7 +1951,7 @@ class DynamoDbServiceTest {
"SET newAttr = :val",
null, exprValues, "NONE", "testAttr <> :test", "us-east-1", "ALL_OLD"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
assertFalse(stored.has("newAttr"), "new attribute should not have been added");
@@ -1900,14 +1963,14 @@ class DynamoDbServiceTest {
@Test
void putItemNetNewConditionFailedReturnValuesNone() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.putItem("Orders", order, "attribute_exists(customerId)", null, null, "us-east-1", "NONE"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNull(stored, "item should not exist");
assertNull(ex.getItem());
@@ -1915,14 +1978,14 @@ class DynamoDbServiceTest {
@Test
void putItemNetNewConditionFailedReturnValuesAllOld() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.putItem("Orders", order, "attribute_exists(customerId)", null, null, "us-east-1", "ALL_OLD"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNull(stored, "item should not exist");
assertNull(ex.getItem());
@@ -1930,18 +1993,18 @@ class DynamoDbServiceTest {
@Test
void putItemExistingConditionFailedReturnValuesNone() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order1 = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode order2 = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal1");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order1);
+ service.putItem("Orders", order1, "us-east-1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.putItem("Orders", order2, "attribute_exists(someAttr)", null, null, "us-east-1", "NONE"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
assertTrue(stored.has("testAttr"), "item should have testAttr");
assertEquals("testVal", stored.get("testAttr").get("S").asText());
@@ -1951,18 +2014,18 @@ class DynamoDbServiceTest {
@Test
void putItemExistingConditionFailedReturnValuesAllOld() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order1 = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal");
ObjectNode order2 = item("customerId", "1", "orderId", "sort1", "testAttr", "testVal1");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order1);
+ service.putItem("Orders", order1, "us-east-1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.putItem("Orders", order2, "attribute_exists(someAttr)", null, null, "us-east-1", "ALL_OLD"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
assertTrue(stored.has("testAttr"), "item should have testAttr");
assertEquals("testVal", stored.get("testAttr").get("S").asText());
@@ -1977,17 +2040,17 @@ class DynamoDbServiceTest {
@Test
void deleteItemConditionFailedReturnValuesNone() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order);
+ service.putItem("Orders", order, "us-east-1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.deleteItem("Orders", key, "attribute_exists(someAttr)", null, null, "us-east-1", "NONE"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
assertNull(ex.getItem());
@@ -1995,17 +2058,17 @@ class DynamoDbServiceTest {
@Test
void deleteItemConditionFailedReturnValuesAllOld() {
- createOrdersTable();
+ createOrdersTable("us-east-1");
ObjectNode order = item("customerId", "1", "orderId", "sort1");
ObjectNode key = item("customerId", "1", "orderId", "sort1");
- service.putItem("Orders", order);
+ service.putItem("Orders", order, "us-east-1");
ConditionalCheckFailedException ex = assertThrows(ConditionalCheckFailedException.class, () ->
service.deleteItem("Orders", key, "attribute_exists(someAttr)", null, null, "us-east-1", "ALL_OLD"));
- JsonNode stored = service.getItem("Orders", key);
+ JsonNode stored = service.getItem("Orders", key, "us-east-1");
assertNotNull(stored, "item should exist");
JsonNode returnedItem = ex.getItem();
@@ -2019,16 +2082,17 @@ class DynamoDbServiceTest {
@Test
void updateItemSetCrossAttributeReferenceUsesPreUpdateValue() {
+ String region = "eu-west-1";
// "SET a = :new, b = a" must write the ORIGINAL value of a into b.
// AWS DynamoDB applies SET actions atomically; attribute references on the RHS
// resolve to pre-update values.
- createUsersTable();
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
existing.set("a", attributeValue("S", "original_a"));
existing.set("b", attributeValue("S", "original_b"));
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -2036,9 +2100,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET a = :new_a, b = a",
- null, exprValues, null);
+ null, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertNotNull(stored);
assertEquals("new_a_value", stored.get("a").get("S").asText(),
"a should be updated to the new value");
@@ -2048,14 +2112,15 @@ class DynamoDbServiceTest {
@Test
void updateItemSetCrossAttributeReferenceWithExpressionAttributeNames() {
+ String region = "eu-west-1";
// Same as above but using #placeholder names — the form most client libraries emit.
- createUsersTable();
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
existing.set("status", attributeValue("S", "ISSUED"));
existing.set("previousStatus", attributeValue("S", "NONE"));
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprAttrNames = mapper.createObjectNode();
@@ -2066,9 +2131,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #s = :v, #p = #s",
- exprAttrNames, exprValues, null);
+ exprAttrNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertEquals("VOID", stored.get("status").get("S").asText());
assertEquals("ISSUED", stored.get("previousStatus").get("S").asText(),
"previousStatus should receive the pre-update value of status");
@@ -2076,17 +2141,18 @@ class DynamoDbServiceTest {
@Test
void updateItemSetParenthesizedArithmeticAppliesSubtraction() {
+ String region = "eu-west-1";
// "SET c = (c - :v)" must subtract identically to the unwrapped form.
// Previously, findArithmeticOperator only returned operators at paren-depth 0,
// so wrapped arithmetic silently no-oped.
- createUsersTable();
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
ObjectNode counterVal = mapper.createObjectNode();
counterVal.put("N", "5");
existing.set("counter", counterVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprAttrNames = mapper.createObjectNode();
@@ -2098,19 +2164,20 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #c = (#c - :v)",
- exprAttrNames, exprValues, null);
+ exprAttrNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertEquals("4", stored.get("counter").get("N").asText(),
"parenthesized arithmetic should subtract identically to the unwrapped form");
}
@Test
void updateItemSetParenthesizedIfNotExistsArithmeticAlongsidePlainAssignment() {
+ String region = "eu-west-1";
// ElectroDB-style emission: "SET c = (if_not_exists(c, :d) - :v), other = :s".
// Previously the parenthesized arithmetic was silently dropped while the simple
// SET clause applied — a confusing partial-success outcome.
- createUsersTable();
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
@@ -2118,7 +2185,7 @@ class DynamoDbServiceTest {
counterVal.put("N", "5");
existing.set("counter", counterVal);
existing.set("other", attributeValue("S", "old"));
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprAttrNames = mapper.createObjectNode();
@@ -2133,9 +2200,9 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #c = (if_not_exists(#c, :d) - :v), #o = :s",
- exprAttrNames, exprValues, null);
+ exprAttrNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertEquals("4", stored.get("counter").get("N").asText(),
"parenthesized arithmetic should apply alongside a simple SET clause");
assertEquals("new", stored.get("other").get("S").asText(),
@@ -2144,14 +2211,15 @@ class DynamoDbServiceTest {
@Test
void updateItemSetDoubledOuterParensStillApplies() {
+ String region = "eu-west-1";
// Defence-in-depth: even multiply-wrapped expressions should parse the same as bare.
- createUsersTable();
+ createUsersTable(region);
ObjectNode existing = mapper.createObjectNode();
existing.set("userId", attributeValue("S", "u1"));
ObjectNode counterVal = mapper.createObjectNode(); counterVal.put("N", "10");
existing.set("counter", counterVal);
- service.putItem("Users", existing);
+ service.putItem("Users", existing, region);
ObjectNode key = item("userId", "u1");
ObjectNode exprValues = mapper.createObjectNode();
@@ -2163,17 +2231,17 @@ class DynamoDbServiceTest {
service.updateItem("Users", key, null,
"SET #cnt = ((#cnt - :v))",
- exprNames, exprValues, null);
+ exprNames, exprValues, null, region);
- JsonNode stored = service.getItem("Users", key);
+ JsonNode stored = service.getItem("Users", key, region);
assertEquals("7", stored.get("counter").get("N").asText());
}
@Test
void transactWriteItemsReplayWithSameTokenAndBodyIsNoOp() {
// ClientRequestToken contract: same token + same body → no re-application of writes.
- createUsersTable();
- service.putItem("Users", item("userId", "u1"));
+ createUsersTable("us-east-1");
+ service.putItem("Users", item("userId", "u1"), "us-east-1");
ObjectNode update = mapper.createObjectNode();
update.put("TableName", "Users");
@@ -2199,7 +2267,7 @@ class DynamoDbServiceTest {
// Replay must be a no-op.
service.transactWriteItems(List.of(transactItem), "us-east-1", "tok-replay", rawRequest);
- JsonNode stored = service.getItem("Users", item("userId", "u1"));
+ JsonNode stored = service.getItem("Users", item("userId", "u1"), "us-east-1");
assertEquals("1", stored.get("counter").get("N").asText(),
"replay with the same ClientRequestToken must not re-apply the write");
}
@@ -2207,8 +2275,8 @@ class DynamoDbServiceTest {
@Test
void transactWriteItemsReplayWithSameTokenButDifferentBodyThrowsIdempotentMismatch() {
// ClientRequestToken contract: same token + different body → IdempotentParameterMismatchException.
- createUsersTable();
- service.putItem("Users", item("userId", "u1"));
+ createUsersTable("us-east-1");
+ service.putItem("Users", item("userId", "u1"), "us-east-1");
ObjectNode exprNames = mapper.createObjectNode();
exprNames.put("#c", "counter");
@@ -2250,7 +2318,7 @@ class DynamoDbServiceTest {
assertEquals("IdempotentParameterMismatchException", ex.getErrorCode());
// First call applied; second was rejected — counter remains 1.
- JsonNode stored = service.getItem("Users", item("userId", "u1"));
+ JsonNode stored = service.getItem("Users", item("userId", "u1"), "us-east-1");
assertEquals("1", stored.get("counter").get("N").asText());
}
@@ -2258,8 +2326,8 @@ class DynamoDbServiceTest {
void transactWriteItemsNullClientRequestTokenSkipsIdempotencyCheck() {
// When no token is supplied, two calls with identical bodies should both apply
// (i.e. counter ends at 2). This is the pre-existing behaviour and must remain.
- createUsersTable();
- service.putItem("Users", item("userId", "u1"));
+ createUsersTable("us-east-1");
+ service.putItem("Users", item("userId", "u1"), "us-east-1");
ObjectNode update = mapper.createObjectNode();
update.put("TableName", "Users");
@@ -2277,7 +2345,7 @@ class DynamoDbServiceTest {
service.transactWriteItems(List.of(tx), "us-east-1", null, null);
service.transactWriteItems(List.of(tx), "us-east-1", null, null);
- JsonNode stored = service.getItem("Users", item("userId", "u1"));
+ JsonNode stored = service.getItem("Users", item("userId", "u1"), "us-east-1");
assertEquals("2", stored.get("counter").get("N").asText());
}
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java
index 48c734e06b..47a31fe688 100644
--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java
@@ -1,9 +1,14 @@
package io.github.hectorvent.floci.services.sqs;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.specification.RequestSpecification;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.*;
@@ -44,9 +49,11 @@ class SqsInspectionControllerIntegrationTest {
.body("messages", hasSize(0));
}
- @Test
+ @ParameterizedTest
+ @NullSource
+ @ValueSource(strings = {"us-east-1"})
@DisplayName("GET /_aws/sqs/messages returns all messages without consuming them")
- void shouldReturnMessagesWithoutConsuming() {
+ void shouldReturnMessagesWithoutConsuming(String region) {
given().contentType(CONTENT_TYPE)
.formParam("Action", "SendMessage")
.formParam("QueueUrl", queueUrl)
@@ -59,7 +66,12 @@ class SqsInspectionControllerIntegrationTest {
.formParam("MessageBody", "second message")
.when().post("/").then().statusCode(200);
- given()
+ RequestSpecification requestSpecification = given();
+ String authorization = String.format("AWS4-HMAC-SHA256 Credential=AKID/20260101/%s/textract/aws4_request", region);
+ if (region != null) {
+ requestSpecification.header("Authorization", authorization);
+ }
+ requestSpecification
.queryParam("QueueUrl", queueUrl)
.when().get("/_aws/sqs/messages")
.then()
@@ -72,7 +84,11 @@ class SqsInspectionControllerIntegrationTest {
.body("messages[0].Attributes.ApproximateReceiveCount", equalTo("0"));
// messages must still be there after peek
- given()
+ requestSpecification = given();
+ if (region != null) {
+ requestSpecification.header("Authorization", authorization);
+ }
+ requestSpecification
.queryParam("QueueUrl", queueUrl)
.when().get("/_aws/sqs/messages")
.then()
@@ -111,4 +127,26 @@ class SqsInspectionControllerIntegrationTest {
.then()
.statusCode(400);
}
+
+ @Test
+ @DisplayName("GET /_aws/sqs/messages returns 400 when retrieving messages from a queue in a different region")
+ void shouldReturn400WhenRetrievingMessagesFromQueueInDifferentRegion() {
+ given()
+ .header("Authorization", "AWS4-HMAC-SHA256 Credential=AKID/20260101/eu-west-1/textract/aws4_request")
+ .queryParam("QueueUrl", queueUrl)
+ .when().get("/_aws/sqs/messages")
+ .then()
+ .statusCode(400);
+ }
+
+ @Test
+ @DisplayName("DELETE /_aws/sqs/messages returns 400 retrieving messages from a queue in a different region")
+ void shouldReturn400WhenPurgingMessagesFromQueueInDifferentRegion() {
+ given()
+ .header("Authorization", "AWS4-HMAC-SHA256 Credential=AKID/20260101/eu-west-1/textract/aws4_request")
+ .queryParam("QueueUrl", queueUrl)
+ .when().delete("/_aws/sqs/messages")
+ .then()
+ .statusCode(400);
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java
index e38b44090e..1da5064d3a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java
@@ -29,7 +29,7 @@ class SqsServiceTest {
@Test
void createQueue() {
- Queue queue = sqsService.createQueue("test-queue", null);
+ Queue queue = sqsService.createQueue("test-queue", null, "eu-west-1");
assertEquals("test-queue", queue.getQueueName());
assertEquals(BASE_URL + "/000000000000/test-queue", queue.getQueueUrl());
assertNotNull(queue.getCreatedTimestamp());
@@ -37,15 +37,16 @@ class SqsServiceTest {
@Test
void createQueueIsIdempotent() {
- Queue q1 = sqsService.createQueue("test-queue", null);
- Queue q2 = sqsService.createQueue("test-queue", null);
+ String region = "eu-west-1";
+ Queue q1 = sqsService.createQueue("test-queue", null, region);
+ Queue q2 = sqsService.createQueue("test-queue", null, region);
assertEquals(q1.getQueueUrl(), q2.getQueueUrl());
}
@Test
void createQueueWithAttributes() {
Queue queue = sqsService.createQueue("test-queue",
- Map.of("VisibilityTimeout", "60"));
+ Map.of("VisibilityTimeout", "60"), "eu-west-1");
assertEquals("60", queue.getAttributes().get("VisibilityTimeout"));
}
@@ -65,52 +66,56 @@ class SqsServiceTest {
@Test
void deleteQueue() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.deleteQueue(queue.getQueueUrl());
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.deleteQueue(queue.getQueueUrl(), region);
assertThrows(AwsException.class, () ->
- sqsService.getQueueUrl("test-queue"));
+ sqsService.getQueueUrl("test-queue", region));
}
@Test
void deleteQueueNotFound() {
assertThrows(AwsException.class, () ->
- sqsService.deleteQueue(BASE_URL + "/000000000000/nonexistent"));
+ sqsService.deleteQueue(BASE_URL + "/000000000000/nonexistent", "eu-west-1"));
}
@Test
void listQueues() {
- sqsService.createQueue("alpha-queue", null);
- sqsService.createQueue("beta-queue", null);
- sqsService.createQueue("alpha-other", null);
+ String region = "eu-west-1";
+ sqsService.createQueue("alpha-queue", null, region);
+ sqsService.createQueue("beta-queue", null, region);
+ sqsService.createQueue("alpha-other", null, region);
- List<Queue> all = sqsService.listQueues(null);
+ List<Queue> all = sqsService.listQueues(null, region);
assertEquals(3, all.size());
- List<Queue> alpha = sqsService.listQueues("alpha");
+ List<Queue> alpha = sqsService.listQueues("alpha", region);
assertEquals(2, alpha.size());
}
@Test
void getQueueUrl() {
- sqsService.createQueue("my-queue", null);
- String url = sqsService.getQueueUrl("my-queue");
+ String region = "eu-west-1";
+ sqsService.createQueue("my-queue", null, region);
+ String url = sqsService.getQueueUrl("my-queue", region);
assertEquals(BASE_URL + "/000000000000/my-queue", url);
}
@Test
void getQueueUrlNotFound() {
assertThrows(AwsException.class, () ->
- sqsService.getQueueUrl("nonexistent"));
+ sqsService.getQueueUrl("nonexistent", "eu-west-1"));
}
@Test
void sendAndReceiveMessage() {
- Queue queue = sqsService.createQueue("test-queue", null);
- Message sent = sqsService.sendMessage(queue.getQueueUrl(), "Hello World", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ Message sent = sqsService.sendMessage(queue.getQueueUrl(), "Hello World", 0, region);
assertNotNull(sent.getMessageId());
assertNotNull(sent.getMd5OfBody());
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, "eu-west-1");
assertEquals(1, received.size());
assertEquals("Hello World", received.getFirst().getBody());
assertNotNull(received.getFirst().getReceiptHandle());
@@ -119,96 +124,104 @@ class SqsServiceTest {
@Test
void receiveMessageReturnsEmptyWhenNoMessages() {
- Queue queue = sqsService.createQueue("empty-queue", null);
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("empty-queue", null, region);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
assertTrue(received.isEmpty());
}
@Test
void messageBecomesInvisibleAfterReceive() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, region);
// First receive should get the message
- List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
assertEquals(1, first.size());
// Second receive should get nothing (message is invisible)
- List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
assertTrue(second.isEmpty());
}
@Test
void deleteMessage() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "to-delete", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "to-delete", 0, region);
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
- sqsService.deleteMessage(queue.getQueueUrl(), received.getFirst().getReceiptHandle());
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
+ sqsService.deleteMessage(queue.getQueueUrl(), received.getFirst().getReceiptHandle(), region);
// Message should be permanently gone; even after visibility would expire
// it shouldn't reappear
- List<Message> afterDelete = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0);
+ List<Message> afterDelete = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0, region);
assertTrue(afterDelete.isEmpty());
}
@Test
void deleteMessageInvalidHandle() {
- Queue queue = sqsService.createQueue("test-queue", null);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, "eu-west-1");
assertThrows(AwsException.class, () ->
- sqsService.deleteMessage(queue.getQueueUrl(), "invalid-handle"));
+ sqsService.deleteMessage(queue.getQueueUrl(), "invalid-handle", region));
}
@Test
void sendMessageToNonExistentQueue() {
assertThrows(AwsException.class, () ->
- sqsService.sendMessage(BASE_URL + "/000000000000/nonexistent", "msg", 0));
+ sqsService.sendMessage(BASE_URL + "/000000000000/nonexistent", "msg", 0, "eu-west-1"));
}
@Test
void receiveMultipleMessages() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0);
- sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0);
- sqsService.sendMessage(queue.getQueueUrl(), "msg3", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg3", 0, region);
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 3, 30, 0);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 3, 30, 0, region);
assertEquals(3, received.size());
}
@Test
void purgeQueue() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0);
- sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0, region);
- sqsService.purgeQueue(queue.getQueueUrl());
+ sqsService.purgeQueue(queue.getQueueUrl(), region);
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertTrue(received.isEmpty());
}
@Test
void changeMessageVisibility() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, region);
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
String receiptHandle = received.getFirst().getReceiptHandle();
// Set visibility to 0 — message becomes visible immediately
- sqsService.changeMessageVisibility(queue.getQueueUrl(), receiptHandle, 0);
+ sqsService.changeMessageVisibility(queue.getQueueUrl(), receiptHandle, 0, region);
- List<Message> reReceived = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0);
+ List<Message> reReceived = sqsService.receiveMessage(queue.getQueueUrl(), 1, 30, 0, region);
assertEquals(1, reReceived.size());
}
@Test
void getQueueAttributes() {
- Queue queue = sqsService.createQueue("test-queue", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test-queue", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, region);
- Map<String, String> attrs = sqsService.getQueueAttributes(queue.getQueueUrl(), List.of("All"));
+ Map<String, String> attrs = sqsService.getQueueAttributes(queue.getQueueUrl(), List.of("All"), region);
assertNotNull(attrs.get("QueueArn"));
assertNotNull(attrs.get("CreatedTimestamp"));
assertEquals("1", attrs.get("ApproximateNumberOfMessages"));
@@ -218,7 +231,7 @@ class SqsServiceTest {
@Test
void createFifoQueue() {
- Queue queue = sqsService.createQueue("test-queue.fifo", null);
+ Queue queue = sqsService.createQueue("test-queue.fifo", null, "eu-west-1");
assertTrue(queue.isFifo());
assertEquals("true", queue.getAttributes().get("FifoQueue"));
assertEquals("false", queue.getAttributes().get("ContentBasedDeduplication"));
@@ -226,8 +239,9 @@ class SqsServiceTest {
@Test
void createFifoQueueWithExplicitAttribute() {
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("test-queue.fifo",
- Map.of("FifoQueue", "true", "ContentBasedDeduplication", "true"));
+ Map.of("FifoQueue", "true", "ContentBasedDeduplication", "true"), "eu-west-1");
assertTrue(queue.isFifo());
assertEquals("true", queue.getAttributes().get("ContentBasedDeduplication"));
}
@@ -235,7 +249,7 @@ class SqsServiceTest {
@Test
void createFifoQueueWithContentBasedDeduplicationFalse() {
Queue queue = sqsService.createQueue("test-queue.fifo",
- Map.of("ContentBasedDeduplication", "false"));
+ Map.of("ContentBasedDeduplication", "false"), "eu-west-1");
assertTrue(queue.isFifo());
assertEquals("false", queue.getAttributes().get("ContentBasedDeduplication"));
}
@@ -243,7 +257,7 @@ class SqsServiceTest {
@Test
void createFifoQueueWithoutContentBasedDeduplication() {
Queue queue = sqsService.createQueue("test-queue.fifo",
- Map.of("VisibilityTimeout", "60"));
+ Map.of("VisibilityTimeout", "60"), "eu-west-1");
assertTrue(queue.isFifo());
assertEquals("false", queue.getAttributes().get("ContentBasedDeduplication"));
}
@@ -251,22 +265,24 @@ class SqsServiceTest {
@Test
void createFifoQueueWithoutSuffixFails() {
assertThrows(AwsException.class, () ->
- sqsService.createQueue("test-queue", Map.of("FifoQueue", "true")));
+ sqsService.createQueue("test-queue", Map.of("FifoQueue", "true"), "eu-west-1"));
}
@Test
void sendMessageToFifoQueueRequiresGroupId() {
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("test.fifo",
- Map.of("ContentBasedDeduplication", "true"));
+ Map.of("ContentBasedDeduplication", "true"), region);
assertThrows(AwsException.class, () ->
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, null, null));
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, null, null, region));
}
@Test
void sendMessageToFifoQueueWithContentBasedDedup() {
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("test.fifo",
- Map.of("ContentBasedDeduplication", "true"));
- Message msg = sqsService.sendMessage(queue.getQueueUrl(), "Hello FIFO", 0, "group1", null);
+ Map.of("ContentBasedDeduplication", "true"), region);
+ Message msg = sqsService.sendMessage(queue.getQueueUrl(), "Hello FIFO", 0, "group1", null, region);
assertNotNull(msg.getMessageId());
assertEquals("group1", msg.getMessageGroupId());
assertTrue(msg.getSequenceNumber() > 0);
@@ -275,20 +291,22 @@ class SqsServiceTest {
@Test
void sendMessageToFifoQueueWithExplicitDedupId() {
- Queue queue = sqsService.createQueue("test.fifo", null);
- Message msg = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test.fifo", null, region);
+ Message msg = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertEquals("dedup-1", msg.getMessageDeduplicationId());
}
@Test
void fifoDeduplicationReturnsExistingMessage() {
- Queue queue = sqsService.createQueue("test.fifo", null);
- Message msg1 = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
- Message msg2 = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test.fifo", null, region);
+ Message msg1 = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
+ Message msg2 = sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertEquals(msg1.getMessageId(), msg2.getMessageId());
// Only one message should be in the queue
- List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(1, received.size());
}
@@ -297,12 +315,13 @@ class SqsServiceTest {
// AWS FIFO: a single ReceiveMessage call may return multiple messages
// from the same MessageGroupId (in order), up to MaxNumberOfMessages.
// The group lock only blocks subsequent ReceiveMessage calls.
- Queue queue = sqsService.createQueue("test.fifo", null);
- sqsService.sendMessage(queue.getQueueUrl(), "g1-msg1", 0, "group1", "d1");
- sqsService.sendMessage(queue.getQueueUrl(), "g1-msg2", 0, "group1", "d2");
- sqsService.sendMessage(queue.getQueueUrl(), "g2-msg1", 0, "group2", "d3");
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test.fifo", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "g1-msg1", 0, "group1", "d1", region);
+ sqsService.sendMessage(queue.getQueueUrl(), "g1-msg2", 0, "group1", "d2", region);
+ sqsService.sendMessage(queue.getQueueUrl(), "g2-msg1", 0, "group2", "d3", region);
- List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(3, first.size(),
"Single FIFO ReceiveMessage should drain all visible messages up to MaxNumberOfMessages");
List<String> bodies = first.stream().map(Message::getBody).toList();
@@ -314,38 +333,41 @@ class SqsServiceTest {
assertTrue(g1m1Idx < g1m2Idx, "group1 messages must be in insertion order");
// Both groups are now in-flight; second call returns empty.
- List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertTrue(second.isEmpty());
}
@Test
void fifoQueueRequiresDedupIdWhenContentBasedDisabled() {
- Queue queue = sqsService.createQueue("test.fifo", null);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("test.fifo", null, region);
// ContentBasedDeduplication is false by default
assertThrows(AwsException.class, () ->
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", null));
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", null, region));
}
@Test
void receiveMessageUsesQueueVisibilityTimeoutWhenNotSpecified() {
+ String region = "eu-west-1";
+
// Create queue with a short visibility timeout (1 second)
Queue queue = sqsService.createQueue("short-vt-queue",
- Map.of("VisibilityTimeout", "1"));
- sqsService.sendMessage(queue.getQueueUrl(), "test-msg", 0);
+ Map.of("VisibilityTimeout", "1"), region);
+ sqsService.sendMessage(queue.getQueueUrl(), "test-msg", 0, region);
// Receive without specifying visibility timeout (-1 means "use queue default")
- List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);
+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0, region);
assertEquals(1, first.size());
// Message should be invisible immediately after receive
- List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);
+ List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0, region);
assertTrue(second.isEmpty());
// Wait for the queue's visibility timeout (1s) to expire, not the global default (30s)
try { Thread.sleep(1100); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
// Message should now be visible again
- List<Message> third = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);
+ List<Message> third = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0, region);
assertEquals(1, third.size(), "Message should become visible after queue's VisibilityTimeout (1s), not global default (30s)");
}
@@ -353,17 +375,19 @@ class SqsServiceTest {
@Test
void queueLevelDelaySecondsAppliesToFifoQueue() {
+ String region = "eu-west-1";
+
Queue queue = sqsService.createQueue("delay-fifo.fifo",
- Map.of("ContentBasedDeduplication", "true", "DelaySeconds", "1"));
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", null);
+ Map.of("ContentBasedDeduplication", "true", "DelaySeconds", "1"), region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", null, region);
- List<Message> immediate = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0);
+ List<Message> immediate = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0, region);
assertTrue(immediate.isEmpty(),
"FIFO queue should honor queue-level DelaySeconds (issue #475)");
try { Thread.sleep(1100); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
- List<Message> later = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0);
+ List<Message> later = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0, region);
assertEquals(1, later.size(),
"Message should become visible once DelaySeconds elapses");
}
@@ -374,11 +398,12 @@ class SqsServiceTest {
// per-message value is ignored. Here the queue default is 0 and the
// caller passes a positive per-message delay -- the message must be
// immediately visible.
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("fifo-ignores-per-msg.fifo",
- Map.of("ContentBasedDeduplication", "true"));
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 60, "group1", null);
+ Map.of("ContentBasedDeduplication", "true"), region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 60, "group1", null, region);
- List<Message> immediate = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0);
+ List<Message> immediate = sqsService.receiveMessage(queue.getQueueUrl(), 1, 0, 0, region);
assertEquals(1, immediate.size(),
"FIFO queues must ignore per-message DelaySeconds");
}
@@ -387,95 +412,101 @@ class SqsServiceTest {
@Test
void purgeQueueClearsFifoDeduplicationCacheWhenEnabled() {
+ String region = "eu-west-1";
final var service = new SqsService(
new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),
30, 262144, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, null);
- final var queue = service.createQueue("dedup-clear.fifo", Map.of("ContentBasedDeduplication", "true"));
+ final var queue = service.createQueue("dedup-clear.fifo", Map.of("ContentBasedDeduplication", "true"), region);
// First send — message M1 added, dedup cache populated with "dedup-1"
- final var m1 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ final var m1 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertNotNull(m1.getMessageId());
// Purge clears both messages and the dedup cache
- service.purgeQueue(queue.getQueueUrl());
- assertTrue(service.receiveMessage(queue.getQueueUrl(), 10, 0, 0).isEmpty(),
+ service.purgeQueue(queue.getQueueUrl(), region);
+ assertTrue(service.receiveMessage(queue.getQueueUrl(), 10, 0, 0, region).isEmpty(),
"Queue must be empty after purge");
// Re-send with the same dedup ID — cache was cleared so this is treated as a fresh send
- final var m2 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ final var m2 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertNotNull(m2.getMessageId());
- final var received = service.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ final var received = service.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(1, received.size(), "One message must be in the queue after re-send");
// Third send with same dedup ID — fresh cache entry from m2 deduplicates correctly
- final var m3 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ final var m3 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertEquals(m2.getMessageId(), m3.getMessageId(),
"Dedup must work with the fresh cache entry after purge");
}
@Test
void purgeQueuePreservesFifoDeduplicationCacheByDefault() {
+ String region = "eu-west-1";
// Default service has clearFifoDeduplicationCacheOnPurge=false
final var queue = sqsService.createQueue("dedup-preserve.fifo",
- Map.of("ContentBasedDeduplication", "true"));
+ Map.of("ContentBasedDeduplication", "true"), region);
// Send and then purge — messages are gone but dedup cache is intact
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
- sqsService.purgeQueue(queue.getQueueUrl());
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
+ sqsService.purgeQueue(queue.getQueueUrl(), region);
- assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 0, 0).isEmpty(),
+ assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 0, 0, region).isEmpty(),
"Queue must be empty after purge");
// Re-send with same dedup ID — dedup cache fires but finds no message (purged),
// so it falls through and creates a new message
- sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
- final var received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ final var received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(1, received.size(),
"Re-send after purge must produce exactly one message in the queue");
}
@Test
void purgeQueueClearsDedupStoreWhenEnabled() {
+ String region = "eu-west-1";
+
final var dedupStore = new InMemoryStorage<String, Map<String, Long>>();
final var service = new SqsService(
new InMemoryStorage<>(), new InMemoryStorage<>(), dedupStore,
30, 262144, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, null);
final var queue = service.createQueue("dedup-store-clear.fifo",
- Map.of("ContentBasedDeduplication", "true"));
+ Map.of("ContentBasedDeduplication", "true"), region);
// Send a message — dedup entry must be persisted to the store
- service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1");
+ service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);
assertFalse(dedupStore.keys().isEmpty(),
"Dedup store must have an entry after sending a FIFO message");
// Purge with flag enabled — dedupStore entry for the queue must be removed
- service.purgeQueue(queue.getQueueUrl());
+ service.purgeQueue(queue.getQueueUrl(), region);
assertTrue(dedupStore.keys().isEmpty(),
"Dedup store must be empty after purge with clearFifoDeduplicationCacheOnPurge=true");
}
@Test
void sendMessage_usesQueueMaximumMessageSizeAttribute() {
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("big-queue",
- Map.of("MaximumMessageSize", "524288"));
+ Map.of("MaximumMessageSize", "524288"), region);
String body = "x".repeat(300_000);
- assertDoesNotThrow(() -> sqsService.sendMessage(queue.getQueueUrl(), body, 0),
+ assertDoesNotThrow(() -> sqsService.sendMessage(queue.getQueueUrl(), body, 0, region),
"Body within the queue's MaximumMessageSize must be accepted");
}
@Test
void sendMessage_oversize_errorReportsQueueLimit() {
+ String region = "eu-west-1";
Queue queue = sqsService.createQueue("limited-queue",
- Map.of("MaximumMessageSize", "2048"));
+ Map.of("MaximumMessageSize", "2048"), region);
String oversized = "x".repeat(3000);
AwsException ex = assertThrows(AwsException.class,
- () -> sqsService.sendMessage(queue.getQueueUrl(), oversized, 0));
+ () -> sqsService.sendMessage(queue.getQueueUrl(), oversized, 0, region));
assertTrue(ex.getMessage().contains("2048"),
"Error message must reference the queue's configured MaximumMessageSize, got: " + ex.getMessage());
}
@@ -483,7 +514,7 @@ class SqsServiceTest {
@Test
void sendMessage_attributesCountTowardsLimit() {
Queue queue = sqsService.createQueue("attr-limit-queue",
- Map.of("MaximumMessageSize", "2048"));
+ Map.of("MaximumMessageSize", "2048"), "us-west-1");
String body = "x".repeat(2040);
Map<String, MessageAttributeValue> attrs = Map.of(
"key", new MessageAttributeValue("value", "String"));
@@ -495,7 +526,7 @@ class SqsServiceTest {
@Test
void addPermission_appendsLabelledStatementToPolicy() {
- Queue queue = sqsService.createQueue("perm-queue", null);
+ Queue queue = sqsService.createQueue("perm-queue", null, "us-east-1");
sqsService.addPermission(queue.getQueueUrl(), "share",
List.of("111122223333"), List.of("SendMessage", "ReceiveMessage"), "us-east-1");
@@ -510,7 +541,7 @@ class SqsServiceTest {
@Test
void addPermission_duplicateLabel_throws() {
- Queue queue = sqsService.createQueue("perm-queue", null);
+ Queue queue = sqsService.createQueue("perm-queue", null, "us-east-1");
sqsService.addPermission(queue.getQueueUrl(), "share",
List.of("111122223333"), List.of("SendMessage"), "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
@@ -529,7 +560,7 @@ class SqsServiceTest {
@Test
void removePermission_removesLabelledStatement() {
- Queue queue = sqsService.createQueue("perm-queue", null);
+ Queue queue = sqsService.createQueue("perm-queue", null, "us-east-1");
sqsService.addPermission(queue.getQueueUrl(), "a",
List.of("111122223333"), List.of("SendMessage"), "us-east-1");
sqsService.addPermission(queue.getQueueUrl(), "b",
@@ -546,7 +577,7 @@ class SqsServiceTest {
@Test
void removePermission_lastStatement_removesPolicyAttribute() {
- Queue queue = sqsService.createQueue("perm-queue", null);
+ Queue queue = sqsService.createQueue("perm-queue", null, "us-east-1");
sqsService.addPermission(queue.getQueueUrl(), "only",
List.of("111122223333"), List.of("SendMessage"), "us-east-1");
sqsService.removePermission(queue.getQueueUrl(), "only", "us-east-1");
@@ -558,7 +589,7 @@ class SqsServiceTest {
@Test
void removePermission_unknownLabel_throws() {
- Queue queue = sqsService.createQueue("perm-queue", null);
+ Queue queue = sqsService.createQueue("perm-queue", null, "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.removePermission(queue.getQueueUrl(), "ghost", "us-east-1"));
assertEquals("InvalidParameterValue", ex.getErrorCode());
@@ -573,41 +604,43 @@ class SqsServiceTest {
@Test
void fifoQueueGroupLockBlocksAcrossCallsButNotWithin() {
- Queue queue = sqsService.createQueue("group-lock.fifo", null);
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("group-lock.fifo", null, region);
for (int i = 1; i <= 5; i++) {
- sqsService.sendMessage(queue.getQueueUrl(), "msg" + i, 0, "g1", "d" + i);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg" + i, 0, "g1", "d" + i, region);
}
// First call drains all five from the single group.
- List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(5, first.size());
// Second call returns nothing because g1 is in-flight.
- assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0).isEmpty());
+ assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region).isEmpty());
}
@Test
void fifoQueueGroupUnlocksAfterAllInFlightMessagesDeleted() {
- Queue queue = sqsService.createQueue("unlock-test.fifo", null);
- sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, "g1", "d1");
- sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0, "g1", "d2");
- sqsService.sendMessage(queue.getQueueUrl(), "msg3", 0, "g1", "d3");
+ String region = "eu-west-1";
+ Queue queue = sqsService.createQueue("unlock-test.fifo", null, region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg1", 0, "g1", "d1", region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg2", 0, "g1", "d2", region);
+ sqsService.sendMessage(queue.getQueueUrl(), "msg3", 0, "g1", "d3", region);
// Partial drain: MaxNumberOfMessages=2 returns msg1 + msg2
- List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 2, 30, 0);
+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 2, 30, 0, region);
assertEquals(2, first.size());
assertEquals("msg1", first.get(0).getBody());
assertEquals("msg2", first.get(1).getBody());
// Group still locked — msg3 is not returned
- assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0).isEmpty());
+ assertTrue(sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region).isEmpty());
// Delete both in-flight messages → group unlocks
- sqsService.deleteMessage(queue.getQueueUrl(), first.get(0).getReceiptHandle());
- sqsService.deleteMessage(queue.getQueueUrl(), first.get(1).getReceiptHandle());
+ sqsService.deleteMessage(queue.getQueueUrl(), first.get(0).getReceiptHandle(), region);
+ sqsService.deleteMessage(queue.getQueueUrl(), first.get(1).getReceiptHandle(), region);
// Now msg3 should be available
- List<Message> third = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0);
+ List<Message> third = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);
assertEquals(1, third.size());
assertEquals("msg3", third.get(0).getBody());
}
@@ -618,12 +651,12 @@ class SqsServiceTest {
@Test
void startMessageMoveTask_storesTaskRetrievableByListMessageMoveTasks() {
- sqsService.createQueue("orders-dlq", null);
+ sqsService.createQueue("orders-dlq", null, "us-east-1");
String dlqArn = queueArn("orders-dlq");
sqsService.createQueue("orders",
Map.of("RedrivePolicy",
- "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"));
- sqsService.createQueue("orders-replay", null);
+ "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"), "us-east-1");
+ sqsService.createQueue("orders-replay", null, "us-east-1");
String destArn = queueArn("orders-replay");
String taskHandle = sqsService.startMessageMoveTask(dlqArn, destArn, 25, "us-east-1");
@@ -639,11 +672,11 @@ class SqsServiceTest {
@Test
void startMessageMoveTask_destinationDoesNotExist_throwsResourceNotFound() {
- sqsService.createQueue("a-dlq", null);
+ sqsService.createQueue("a-dlq", null, "us-east-1");
String dlqArn = queueArn("a-dlq");
sqsService.createQueue("a",
Map.of("RedrivePolicy",
- "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"));
+ "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"), "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.startMessageMoveTask(dlqArn, queueArn("nope"), 0, "us-east-1"));
@@ -652,8 +685,8 @@ class SqsServiceTest {
@Test
void startMessageMoveTask_sourceIsNotDeadLetterQueue_throwsInvalidParameterValue() {
- sqsService.createQueue("just-a-queue", null);
- sqsService.createQueue("dest", null);
+ sqsService.createQueue("just-a-queue", null, "us-east-1");
+ sqsService.createQueue("dest", null, "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.startMessageMoveTask(queueArn("just-a-queue"),
@@ -667,16 +700,16 @@ class SqsServiceTest {
// substring-match the raw RedrivePolicy JSON, so a queue named "foo"
// would be falsely treated as a DLQ when another queue's redrive policy
// referenced ":foo-bar". Now both look at the parsed deadLetterTargetArn.
- sqsService.createQueue("dlq-real", null);
+ sqsService.createQueue("dlq-real", null, "us-east-1");
String realDlqArn = queueArn("dlq-real");
sqsService.createQueue("main-real",
Map.of("RedrivePolicy",
- "{\"deadLetterTargetArn\":\"" + realDlqArn + "\",\"maxReceiveCount\":\"1\"}"));
+ "{\"deadLetterTargetArn\":\"" + realDlqArn + "\",\"maxReceiveCount\":\"1\"}"), "us-east-1");
// Create a queue whose ARN is a strict prefix of realDlqArn.
- sqsService.createQueue("dlq", null);
+ sqsService.createQueue("dlq", null, "us-east-1");
String prefixArn = queueArn("dlq");
- sqsService.createQueue("dest", null);
+ sqsService.createQueue("dest", null, "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.startMessageMoveTask(prefixArn, queueArn("dest"), 0, "us-east-1"));
@@ -692,12 +725,12 @@ class SqsServiceTest {
@Test
void startMessageMoveTask_concurrentSecondTaskOnSameSource_throwsInvalidParameterValue() {
- sqsService.createQueue("d-concurrent", null);
+ sqsService.createQueue("d-concurrent", null, "us-east-1");
String dlqArn = queueArn("d-concurrent");
sqsService.createQueue("p-concurrent",
Map.of("RedrivePolicy",
- "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"));
- sqsService.createQueue("dest-concurrent", null);
+ "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"), "us-east-1");
+ sqsService.createQueue("dest-concurrent", null, "us-east-1");
String destArn = queueArn("dest-concurrent");
sqsService.startMessageMoveTask(dlqArn, destArn, 0, "us-east-1");
@@ -717,18 +750,18 @@ class SqsServiceTest {
@Test
void cancelMessageMoveTask_knownHandle_stopsBackgroundWorker() throws Exception {
- Queue dlq = sqsService.createQueue("d", null);
+ Queue dlq = sqsService.createQueue("d", null, "us-east-1");
String dlqArn = queueArn("d");
sqsService.createQueue("p",
Map.of("RedrivePolicy",
- "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"));
- sqsService.createQueue("dest", null);
+ "{\"deadLetterTargetArn\":\"" + dlqArn + "\",\"maxReceiveCount\":\"1\"}"), "us-east-1");
+ sqsService.createQueue("dest", null, "us-east-1");
String destArn = queueArn("dest");
// Load enough messages that, at the throttled rate, the worker can't possibly
// drain the queue before cancel is observed.
for (int i = 0; i < 50; i++) {
- sqsService.sendMessage(dlq.getQueueUrl(), "msg-" + i, 0, null, null);
+ sqsService.sendMessage(dlq.getQueueUrl(), "msg-" + i, 0, null, null, "us-east-1");
}
String taskHandle = sqsService.startMessageMoveTask(dlqArn, destArn, 1, "us-east-1");
@@ -747,13 +780,14 @@ class SqsServiceTest {
@Test
void fifoDedup_scopedToMessageGroup_acceptsSameDedupIdAcrossGroups() {
+ String region = "eu-west-1";
Queue fifo = sqsService.createQueue("fair.fifo",
Map.of("FifoQueue", "true",
"DeduplicationScope", "messageGroup",
- "FifoThroughputLimit", "perMessageGroupId"));
- sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "groupA", "sameDedup");
- sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "groupB", "sameDedup");
- List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0);
+ "FifoThroughputLimit", "perMessageGroupId"), region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "groupA", "sameDedup", region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "groupB", "sameDedup", region);
+ List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0, region);
assertEquals(2, received.size());
}
@@ -763,35 +797,37 @@ class SqsServiceTest {
// MessageDeduplicationId, so a naive "group|dedup" cache key could collide:
// (group="a", dedup="b|c") and (group="a|b", dedup="c") both yield "a|b|c".
// Both pairs must be treated as distinct messages.
+ String region = "eu-west-1";
Queue fifo = sqsService.createQueue("collision.fifo",
Map.of("FifoQueue", "true",
"DeduplicationScope", "messageGroup",
- "FifoThroughputLimit", "perMessageGroupId"));
- sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "a", "b|c");
- sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "a|b", "c");
- List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0);
+ "FifoThroughputLimit", "perMessageGroupId"), region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "a", "b|c", region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "a|b", "c", region);
+ List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0, region);
assertEquals(2, received.size());
}
@Test
void fifoDedup_queueScope_rejectsSameDedupIdAcrossGroups() {
+ String region = "eu-west-1";
Queue fifo = sqsService.createQueue("queue-scoped.fifo",
- Map.of("FifoQueue", "true"));
- sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "groupA", "sameDedup");
- sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "groupB", "sameDedup");
- List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0);
+ Map.of("FifoQueue", "true"), region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "A", 0, "groupA", "sameDedup", region);
+ sqsService.sendMessage(fifo.getQueueUrl(), "B", 0, "groupB", "sameDedup", region);
+ List<Message> received = sqsService.receiveMessage(fifo.getQueueUrl(), 10, 30, 0, region);
assertEquals(1, received.size());
}
@Test
void validateBatchPayloadSize_underQueueLimit_succeeds() {
- Queue queue = sqsService.createQueue("batch-q", null);
+ Queue queue = sqsService.createQueue("batch-q", null, "us-east-1");
sqsService.validateBatchPayloadSize(queue.getQueueUrl(), "us-east-1", 100_000);
}
@Test
void validateBatchPayloadSize_overQueueLimit_throwsBatchRequestTooLong() {
- Queue queue = sqsService.createQueue("batch-q", null);
+ Queue queue = sqsService.createQueue("batch-q", null, "us-east-1");
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.validateBatchPayloadSize(queue.getQueueUrl(), "us-east-1", 300_000));
assertEquals("BatchRequestTooLong", ex.getErrorCode());
@@ -801,7 +837,7 @@ class SqsServiceTest {
@Test
void validateBatchPayloadSize_respectsCustomMaximumMessageSize() {
Queue queue = sqsService.createQueue("batch-q",
- Map.of("MaximumMessageSize", "1048576"));
+ Map.of("MaximumMessageSize", "1048576"), "us-east-1");
sqsService.validateBatchPayloadSize(queue.getQueueUrl(), "us-east-1", 1_000_000);
AwsException ex = assertThrows(AwsException.class, () ->
sqsService.validateBatchPayloadSize(queue.getQueueUrl(), "us-east-1", 1_048_577));
@@ -810,49 +846,53 @@ class SqsServiceTest {
@Test
void sendMessage_withAwsTraceHeader_isStoredAndReturnedOnReceive() {
- Queue q = sqsService.createQueue("traced", null);
+ Queue q = sqsService.createQueue("traced", null, "us-east-1");
sqsService.sendMessage(q.getQueueUrl(), "hi", 0, null, null, null,
"Root=1-abc-def", "us-east-1");
- var received = sqsService.receiveMessage(q.getQueueUrl(), 1, 30, 0);
+ var received = sqsService.receiveMessage(q.getQueueUrl(), 1, 30, 0, "us-east-1");
assertEquals(1, received.size());
assertEquals("Root=1-abc-def", received.get(0).getAwsTraceHeader());
}
@Test
void purgeQueueWithClearFifoDelegatesToSnsForFifoDedupOnSubscribedTopics() {
+ String region = "us-east-1";
final var sns = mock(SnsService.class);
final var service = new SqsService(
new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),
30, 262144, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, sns);
- final var queue = service.createQueue("sns-dedup-delegate.fifo", Map.of("FifoQueue", "true"));
- service.purgeQueue(queue.getQueueUrl());
+ final var queue = service.createQueue("sns-dedup-delegate.fifo", Map.of("FifoQueue", "true"),region);
+ service.purgeQueue(queue.getQueueUrl(), region);
verify(sns).clearFifoDeduplicationCacheForSqsQueueSubscriptions(
queue.getQueueUrl(), "us-east-1");
}
@Test
void sendAndReceiveMessage_bareQueueName() {
- sqsService.createQueue("bare-name-queue", null);
+ String region = "eu-west-1";
+ sqsService.createQueue("bare-name-queue", null, region);
- Message sent = sqsService.sendMessage("bare-name-queue", "hello", 0);
+ Message sent = sqsService.sendMessage("bare-name-queue", "hello", 0, region);
assertNotNull(sent.getMessageId());
- List<Message> received = sqsService.receiveMessage("bare-name-queue", 1, 30, 0);
+ List<Message> received = sqsService.receiveMessage("bare-name-queue", 1, 30, 0, region);
assertEquals(1, received.size());
assertEquals("hello", received.get(0).getBody());
}
@Test
void deleteQueue_bareQueueName() {
- sqsService.createQueue("delete-bare", null);
- assertDoesNotThrow(() -> sqsService.deleteQueue("delete-bare"));
- assertThrows(AwsException.class, () -> sqsService.deleteQueue("delete-bare"));
+ String region = "eu-west-1";
+ sqsService.createQueue("delete-bare", null, region);
+ assertDoesNotThrow(() -> sqsService.deleteQueue("delete-bare", region));
+ assertThrows(AwsException.class, () -> sqsService.deleteQueue("delete-bare", region));
}
@Test
void getQueueAttributes_bareQueueName() {
- sqsService.createQueue("attrs-bare", Map.of("VisibilityTimeout", "45"));
- Map<String, String> attrs = sqsService.getQueueAttributes("attrs-bare", List.of("VisibilityTimeout"));
+ String region = "eu-west-1";
+ sqsService.createQueue("attrs-bare", Map.of("VisibilityTimeout", "45"), region);
+ Map<String, String> attrs = sqsService.getQueueAttributes("attrs-bare", List.of("VisibilityTimeout"), region);
assertEquals("45", attrs.get("VisibilityTimeout"));
}
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
index 0f076dbd9e..fa536890bc 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
@@ -26,8 +26,9 @@ class SsmServiceTest {
@Test
void putAndGetParameter() {
- ssmService.putParameter("/app/db/host", "localhost", "String", null, false);
- Parameter param = ssmService.getParameter("/app/db/host");
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/db/host", "localhost", "String", null, false, region);
+ Parameter param = ssmService.getParameter("/app/db/host", region);
assertEquals("/app/db/host", param.getName());
assertEquals("localhost", param.getValue());
@@ -38,9 +39,10 @@ class SsmServiceTest {
@Test
void putParameterOverwrite() {
- ssmService.putParameter("/app/key", "v1", "String", null, false);
- ssmService.putParameter("/app/key", "v2", "String", null, true);
- Parameter param = ssmService.getParameter("/app/key");
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/key", "v1", "String", null, false, region);
+ ssmService.putParameter("/app/key", "v2", "String", null, true, region);
+ Parameter param = ssmService.getParameter("/app/key", region);
assertEquals("v2", param.getValue());
assertEquals(2, param.getVersion());
@@ -48,78 +50,85 @@ class SsmServiceTest {
@Test
void putParameterWithoutOverwriteThrows() {
- ssmService.putParameter("/app/key", "v1", "String", null, false);
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/key", "v1", "String", null, false, region);
assertThrows(AwsException.class, () ->
- ssmService.putParameter("/app/key", "v2", "String", null, false));
+ ssmService.putParameter("/app/key", "v2", "String", null, false, region));
}
@Test
void getParameterNotFound() {
AwsException ex = assertThrows(AwsException.class, () ->
- ssmService.getParameter("/nonexistent"));
+ ssmService.getParameter("/nonexistent", "eu-west-1"));
assertEquals("ParameterNotFound", ex.getErrorCode());
}
@Test
void getParameters() {
- ssmService.putParameter("/a", "1", "String", null, false);
- ssmService.putParameter("/b", "2", "String", null, false);
- ssmService.putParameter("/c", "3", "String", null, false);
+ String region = "eu-west-1";
+ ssmService.putParameter("/a", "1", "String", null, false, region);
+ ssmService.putParameter("/b", "2", "String", null, false, region);
+ ssmService.putParameter("/c", "3", "String", null, false, region);
- List<Parameter> params = ssmService.getParameters(List.of("/a", "/c", "/missing"));
+ List<Parameter> params = ssmService.getParameters(List.of("/a", "/c", "/missing"), region);
assertEquals(2, params.size());
}
@Test
void getParametersByPathRecursive() {
- ssmService.putParameter("/app/db/host", "localhost", "String", null, false);
- ssmService.putParameter("/app/db/port", "5432", "String", null, false);
- ssmService.putParameter("/app/db/nested/deep", "value", "String", null, false);
- ssmService.putParameter("/app/cache/host", "redis", "String", null, false);
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/db/host", "localhost", "String", null, false, region);
+ ssmService.putParameter("/app/db/port", "5432", "String", null, false, region);
+ ssmService.putParameter("/app/db/nested/deep", "value", "String", null, false, region);
+ ssmService.putParameter("/app/cache/host", "redis", "String", null, false, region);
- List<Parameter> results = ssmService.getParametersByPath("/app/db", true);
+ List<Parameter> results = ssmService.getParametersByPath("/app/db", true, region);
assertEquals(3, results.size());
}
@Test
void getParametersByPathNonRecursive() {
- ssmService.putParameter("/app/db/host", "localhost", "String", null, false);
- ssmService.putParameter("/app/db/port", "5432", "String", null, false);
- ssmService.putParameter("/app/db/nested/deep", "value", "String", null, false);
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/db/host", "localhost", "String", null, false, region);
+ ssmService.putParameter("/app/db/port", "5432", "String", null, false, region);
+ ssmService.putParameter("/app/db/nested/deep", "value", "String", null, false, region);
- List<Parameter> results = ssmService.getParametersByPath("/app/db", false);
+ List<Parameter> results = ssmService.getParametersByPath("/app/db", false, region);
assertEquals(2, results.size());
}
@Test
void deleteParameter() {
- ssmService.putParameter("/app/key", "value", "String", null, false);
- ssmService.deleteParameter("/app/key");
- assertThrows(AwsException.class, () -> ssmService.getParameter("/app/key"));
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/key", "value", "String", null, false, region);
+ ssmService.deleteParameter("/app/key", region);
+ assertThrows(AwsException.class, () -> ssmService.getParameter("/app/key", region));
}
@Test
void deleteParameterNotFoundThrows() {
- assertThrows(AwsException.class, () -> ssmService.deleteParameter("/missing"));
+ assertThrows(AwsException.class, () -> ssmService.deleteParameter("/missing", "eu-west-1"));
}
@Test
void deleteParameters() {
- ssmService.putParameter("/a", "1", "String", null, false);
- ssmService.putParameter("/b", "2", "String", null, false);
+ String region = "eu-west-1";
+ ssmService.putParameter("/a", "1", "String", null, false, region);
+ ssmService.putParameter("/b", "2", "String", null, false, region);
- List<String> deleted = ssmService.deleteParameters(List.of("/a", "/missing"));
+ List<String> deleted = ssmService.deleteParameters(List.of("/a", "/missing"), region);
assertEquals(1, deleted.size());
assertEquals("/a", deleted.getFirst());
}
@Test
void getParameterHistory() {
- ssmService.putParameter("/app/key", "v1", "String", null, false);
- ssmService.putParameter("/app/key", "v2", "String", null, true);
- ssmService.putParameter("/app/key", "v3", "String", null, true);
+ String region = "eu-west-1";
+ ssmService.putParameter("/app/key", "v1", "String", null, false, region);
+ ssmService.putParameter("/app/key", "v2", "String", null, true, region);
+ ssmService.putParameter("/app/key", "v3", "String", null, true, region);
- List<ParameterHistory> history = ssmService.getParameterHistory("/app/key");
+ List<ParameterHistory> history = ssmService.getParameterHistory("/app/key", region);
assertEquals(3, history.size());
assertEquals("v1", history.get(0).getValue());
assertEquals("v3", history.get(2).getValue());
@@ -127,11 +136,12 @@ class SsmServiceTest {
@Test
void parameterHistoryIsTrimmedToMax() {
+ String region = "eu-west-1";
for (int i = 1; i <= 7; i++) {
- ssmService.putParameter("/app/key", "v" + i, "String", null, i == 1 ? false : true);
+ ssmService.putParameter("/app/key", "v" + i, "String", null, i == 1 ? false : true, region);
}
- List<ParameterHistory> history = ssmService.getParameterHistory("/app/key");
+ List<ParameterHistory> history = ssmService.getParameterHistory("/app/key", region);
assertEquals(5, history.size());
assertEquals("v3", history.get(0).getValue());
assertEquals("v7", history.get(4).getValue());