Light, fluffy, and always free - The AWS Local Emulator alternative
fix(memorydb): scope resources by account and region (#3261)
Niels Kootstrae02accff4a38
diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbHandler.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbHandler.javaindex 613c884835..6d730d8a3b 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbHandler.java@@ -43,15 +43,15 @@ public class MemoryDbHandler {try {return switch (action) {case "CreateCluster" -> handleCreateCluster(request, region);- case "DescribeClusters" -> handleDescribeClusters(request);- case "UpdateCluster" -> handleUpdateCluster(request);- case "DeleteCluster" -> handleDeleteCluster(request);+ case "DescribeClusters" -> handleDescribeClusters(request, region);+ case "UpdateCluster" -> handleUpdateCluster(request, region);+ case "DeleteCluster" -> handleDeleteCluster(request, region);case "CreateUser" -> handleCreateUser(request, region);case "DescribeUsers" -> handleDescribeUsers(request, region);- case "DeleteUser" -> handleDeleteUser(request);+ case "DeleteUser" -> handleDeleteUser(request, region);case "CreateACL" -> handleCreateAcl(request, region);case "DescribeACLs" -> handleDescribeAcls(request, region);- case "DeleteACL" -> handleDeleteAcl(request);+ case "DeleteACL" -> handleDeleteAcl(request, region);case "ListTags" -> handleListTags(request);case "TagResource" -> handleTagResource(request);case "UntagResource" -> handleUntagResource(request);@@ -91,24 +91,24 @@ public class MemoryDbHandler {return Response.ok(response).build();}- private Response handleDescribeClusters(JsonNode request) {+ private Response handleDescribeClusters(JsonNode request, String region) {ObjectNode response = objectMapper.createObjectNode();ArrayNode arr = response.putArray("Clusters");- for (Cluster cluster : service.describeClusters(text(request, "ClusterName"))) {+ for (Cluster cluster : service.describeClusters(text(request, "ClusterName"), region)) {arr.add(clusterNode(cluster));}return Response.ok(response).build();}- private Response handleUpdateCluster(JsonNode request) {- Cluster updated = service.updateCluster(text(request, "ClusterName"), text(request, "Description"));+ private Response handleUpdateCluster(JsonNode request, String region) {+ Cluster updated = service.updateCluster(text(request, "ClusterName"), text(request, "Description"), region);ObjectNode response = objectMapper.createObjectNode();response.set("Cluster", clusterNode(updated));return Response.ok(response).build();}- private Response handleDeleteCluster(JsonNode request) {- Cluster deleted = service.deleteCluster(text(request, "ClusterName"));+ private Response handleDeleteCluster(JsonNode request, String region) {+ Cluster deleted = service.deleteCluster(text(request, "ClusterName"), region);ObjectNode response = objectMapper.createObjectNode();response.set("Cluster", clusterNode(deleted));return Response.ok(response).build();@@ -136,8 +136,8 @@ public class MemoryDbHandler {return Response.ok(response).build();}- private Response handleDeleteUser(JsonNode request) {- User deleted = service.deleteUser(text(request, "UserName"));+ private Response handleDeleteUser(JsonNode request, String region) {+ User deleted = service.deleteUser(text(request, "UserName"), region);ObjectNode response = objectMapper.createObjectNode();response.set("User", userNode(deleted));return Response.ok(response).build();@@ -162,8 +162,8 @@ public class MemoryDbHandler {return Response.ok(response).build();}- private Response handleDeleteAcl(JsonNode request) {- Acl deleted = service.deleteAcl(text(request, "ACLName"));+ private Response handleDeleteAcl(JsonNode request, String region) {+ Acl deleted = service.deleteAcl(text(request, "ACLName"), region);ObjectNode response = objectMapper.createObjectNode();response.set("ACL", aclNode(deleted));return Response.ok(response).build();@@ -227,7 +227,7 @@ public class MemoryDbHandler {authentication.put("PasswordCount", user.getPasswords() != null ? user.getPasswords().size() : 0);}ArrayNode aclNames = node.putArray("ACLNames");- service.aclNamesForUser(user.getName()).forEach(aclNames::add);+ service.aclNamesForUser(user.getName(), user.getRegion()).forEach(aclNames::add);if (user.getArn() != null) {node.put("ARN", user.getArn());}@@ -244,7 +244,7 @@ public class MemoryDbHandler {node.put("MinimumEngineVersion", acl.getMinimumEngineVersion());}ArrayNode clustersArr = node.putArray("Clusters");- service.clustersUsingAcl(acl.getName()).forEach(clustersArr::add);+ service.clustersUsingAcl(acl.getName(), acl.getRegion()).forEach(clustersArr::add);if (acl.getArn() != null) {node.put("ARN", acl.getArn());}diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.javaindex e659d6d601..1af5c96bc3 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.elasticache.proxy.SigV4Validator;@@ -94,13 +95,14 @@ public class MemoryDbService {if (name == null || name.isBlank()) {throw new AwsException("InvalidParameterValueException", "ClusterName is required.", 400);}- if (clusters.get(name).isPresent()) {+ String resourceKey = key(region, name);+ if (clusters.get(resourceKey).isPresent() || legacyGet(clusters, name, region).isPresent()) {throw new AwsException("ClusterAlreadyExistsFault","Cluster with specified name already exists.", 400);}// Claim the name for the whole provisioning attempt so a concurrent create can't race// ahead and be stopped by this request's handle-less rollback fallback.- if (!provisioningClusterNames.add(name)) {+ if (!provisioningClusterNames.add(resourceKey)) {throw new AwsException("ClusterAlreadyExistsFault","Cluster " + name + " is already being created.", 400);}@@ -110,11 +112,13 @@ public class MemoryDbService {if (aclName == null || aclName.isBlank()) {throw new AwsException("InvalidParameterValueException", "ACLName is required.", 400);}- requireAclExists(aclName);- boolean authRequired = isAuthRequired(aclName);+ requireAclExists(aclName, region);+ boolean authRequired = isAuthRequired(aclName, region);Cluster cluster = new Cluster();cluster.setName(name);+ cluster.setAccountId(regionResolver.getAccountId());+ cluster.setRegion(region);cluster.setDescription(spec.getDescription());cluster.setStatus(ClusterStatus.AVAILABLE);cluster.setNodeType(spec.getNodeType() != null ? spec.getNodeType() : "db.t4g.small");@@ -134,56 +138,71 @@ public class MemoryDbService {startBackend(cluster, authRequired);}- clusters.put(name, cluster);+ clusters.put(resourceKey, cluster);LOG.infov("MemoryDB cluster {0} created (acl={1}, authRequired={2}), endpoint={3}:{4}",name, aclName, String.valueOf(authRequired), cluster.getClusterEndpoint().address(),String.valueOf(cluster.getClusterEndpoint().port()));return cluster;} finally {- provisioningClusterNames.remove(name);+ provisioningClusterNames.remove(resourceKey);}}public Cluster getCluster(String name) {+ return getCluster(name, currentRegion());+ }++ public Cluster getCluster(String name, String region) {if (name == null || name.isBlank()) {throw new AwsException("InvalidParameterValueException", "ClusterName is required.", 400);}- return clusters.get(name).orElseThrow(() ->+ return resourceGet(clusters, name, region).orElseThrow(() ->new AwsException("ClusterNotFoundFault", "Cluster not found.", 404));}public Collection<Cluster> describeClusters(String filterName) {+ return describeClusters(filterName, currentRegion());+ }++ public Collection<Cluster> describeClusters(String filterName, String region) {+ migrateLegacyClusters(region);if (filterName != null && !filterName.isBlank()) {- return clusters.get(filterName)- .map(List::of)- .orElseThrow(() -> new AwsException("ClusterNotFoundFault",- "Cluster not found.", 404));+ return List.of(getCluster(filterName, region));}- return clusters.scan(k -> true);+ return clusters.scan(k -> k.startsWith(region + ":"));}public Cluster updateCluster(String name, String description) {- Cluster cluster = getCluster(name);+ return updateCluster(name, description, currentRegion());+ }++ public Cluster updateCluster(String name, String description, String region) {+ Cluster cluster = getCluster(name, region);if (description != null) {cluster.setDescription(description);}- clusters.put(name, cluster);+ clusters.put(key(region, name), cluster);return cluster;}public Cluster deleteCluster(String name) {- Cluster cluster = getCluster(name);+ return deleteCluster(name, currentRegion());+ }++ public Cluster deleteCluster(String name, String region) {+ Cluster cluster = getCluster(name, region);cluster.setStatus(ClusterStatus.DELETING);+ String identity = identityName(cluster.getAccountId(), region, name);- proxyManager.stopProxy(name);+ proxyManager.stopProxy(identity);if (cluster.getContainerId() != null) {containerManager.stop(new MemoryDbContainerHandle(- cluster.getContainerId(), name, cluster.getContainerHost(), cluster.getContainerPort()));+ cluster.getContainerId(), identity, cluster.getContainerHost(), cluster.getContainerPort()));}releaseProxyPort(cluster.getProxyPort());- clusters.delete(name);+ clusters.delete(key(region, name));LOG.infov("MemoryDB cluster {0} deleted", name);return cluster;}@@ -199,7 +218,9 @@ public class MemoryDbService {throw new AwsException("InvalidParameterValueException","UserName must start with a letter and contain only letters, digits and hyphens.", 400);}- if (DEFAULT_USER.equals(name) || users.get(name).isPresent()) {+ String resourceKey = key(region, name);+ if (DEFAULT_USER.equals(name) || users.get(resourceKey).isPresent()+ || legacyGet(users, name, region).isPresent()) {throw new AwsException("UserAlreadyExistsFault","User with specified name already exists.", 400);}@@ -225,6 +246,8 @@ public class MemoryDbService {User user = new User();user.setName(name);+ user.setAccountId(regionResolver.getAccountId());+ user.setRegion(region);user.setStatus(ACTIVE);user.setAuthMode(spec.getAuthMode());user.setPasswords(spec.getPasswords());@@ -233,34 +256,39 @@ public class MemoryDbService {user.setArn(buildArn(region, "user", name));user.setCreatedAt(Instant.now());- users.put(name, user);+ users.put(resourceKey, user);LOG.infov("MemoryDB user {0} created with authMode={1}", name, user.getAuthMode());return user;}public Collection<User> describeUsers(String filterName, String region) {if (filterName != null && !filterName.isBlank()) {- return users.get(filterName)+ return resourceGet(users, filterName, region).map(List::of).or(() -> DEFAULT_USER.equals(filterName)? java.util.Optional.of(List.of(builtinDefaultUser(region))): java.util.Optional.empty()).orElseThrow(() -> new AwsException("UserNotFoundFault", "User not found.", 404));}+ migrateLegacyUsers(region);List<User> all = new ArrayList<>();all.add(builtinDefaultUser(region));- all.addAll(users.scan(k -> true));+ all.addAll(users.scan(k -> k.startsWith(region + ":")));return all;}public User deleteUser(String name) {+ return deleteUser(name, currentRegion());+ }++ public User deleteUser(String name, String region) {if (DEFAULT_USER.equals(name)) {throw new AwsException("InvalidParameterValueException","The default user cannot be deleted.", 400);}- User user = users.get(name).orElseThrow(() ->+ User user = resourceGet(users, name, region).orElseThrow(() ->new AwsException("UserNotFoundFault", "User not found.", 404));- users.delete(name);+ users.delete(key(region, name));LOG.infov("MemoryDB user {0} deleted", name);return user;}@@ -272,7 +300,9 @@ public class MemoryDbService {if (name == null || name.isBlank()) {throw new AwsException("InvalidParameterValueException", "ACLName is required.", 400);}- if (DEFAULT_ACL.equals(name) || acls.get(name).isPresent()) {+ String resourceKey = key(region, name);+ if (DEFAULT_ACL.equals(name) || acls.get(resourceKey).isPresent()+ || legacyGet(acls, name, region).isPresent()) {throw new AwsException("ACLAlreadyExistsFault","ACL with specified name already exists.", 400);}@@ -286,62 +316,74 @@ public class MemoryDbService {throw new AwsException("DuplicateUserNameFault","Duplicate user name " + userName + " in ACL.", 400);}- if (!userExists(userName)) {+ if (!userExists(userName, region)) {throw new AwsException("UserNotFoundFault", "User " + userName + " not found.", 404);}}Acl acl = new Acl();acl.setName(name);+ acl.setAccountId(regionResolver.getAccountId());+ acl.setRegion(region);acl.setStatus(ACTIVE);acl.setUserNames(new ArrayList<>(spec.getUserNames()));acl.setMinimumEngineVersion(DEFAULT_ENGINE_VERSION);acl.setArn(buildArn(region, "acl", name));acl.setCreatedAt(Instant.now());- acls.put(name, acl);+ acls.put(resourceKey, acl);LOG.infov("MemoryDB ACL {0} created with users={1}", name, acl.getUserNames());return acl;}public Collection<Acl> describeAcls(String filterName, String region) {if (filterName != null && !filterName.isBlank()) {- return acls.get(filterName)+ return resourceGet(acls, filterName, region).map(List::of).or(() -> DEFAULT_ACL.equals(filterName)? java.util.Optional.of(List.of(builtinOpenAccessAcl(region))): java.util.Optional.empty()).orElseThrow(() -> new AwsException("ACLNotFoundFault", "ACL not found.", 404));}+ migrateLegacyAcls(region);List<Acl> all = new ArrayList<>();all.add(builtinOpenAccessAcl(region));- all.addAll(acls.scan(k -> true));+ all.addAll(acls.scan(k -> k.startsWith(region + ":")));return all;}public Acl deleteAcl(String name) {+ return deleteAcl(name, currentRegion());+ }++ public Acl deleteAcl(String name, String region) {if (DEFAULT_ACL.equals(name)) {throw new AwsException("InvalidParameterValueException","The open-access ACL cannot be deleted.", 400);}- Acl acl = acls.get(name).orElseThrow(() ->+ Acl acl = resourceGet(acls, name, region).orElseThrow(() ->new AwsException("ACLNotFoundFault", "ACL not found.", 404));- if (!clustersUsingAcl(name).isEmpty()) {+ if (!clustersUsingAcl(name, region).isEmpty()) {throw new AwsException("InvalidACLStateFault","ACL " + name + " is associated with one or more clusters.", 400);}- acls.delete(name);+ acls.delete(key(region, name));LOG.infov("MemoryDB ACL {0} deleted", name);return acl;}/** Names of ACLs that include the given user; used to populate the user response. */public List<String> aclNamesForUser(String userName) {+ return aclNamesForUser(userName, currentRegion());+ }++ public List<String> aclNamesForUser(String userName, String region) {+ migrateLegacyAcls(region);List<String> result = new ArrayList<>();if (DEFAULT_USER.equals(userName)) {result.add(DEFAULT_ACL);}- acls.scan(k -> true).stream()+ acls.scan(k -> k.startsWith(region + ":")).stream().filter(a -> a.getUserNames().contains(userName)).map(Acl::getName).forEach(result::add);@@ -350,7 +392,12 @@ public class MemoryDbService {/** Names of clusters currently referencing the given ACL; used to populate the ACL response. */public List<String> clustersUsingAcl(String aclName) {- return clusters.scan(k -> true).stream()+ return clustersUsingAcl(aclName, currentRegion());+ }++ public List<String> clustersUsingAcl(String aclName, String region) {+ migrateLegacyClusters(region);+ return clusters.scan(k -> k.startsWith(region + ":")).stream().filter(c -> aclName.equals(c.getAclName())).map(Cluster::getName).toList();@@ -365,14 +412,14 @@ public class MemoryDbService {public Map<String, String> tagResource(String resourceArn, Map<String, String> tags) {Cluster cluster = clusterByArn(resourceArn);cluster.getTags().putAll(tags);- clusters.put(cluster.getName(), cluster);+ clusters.put(key(cluster.getRegion(), cluster.getName()), cluster);return cluster.getTags();}public Map<String, String> untagResource(String resourceArn, List<String> tagKeys) {Cluster cluster = clusterByArn(resourceArn);tagKeys.forEach(cluster.getTags()::remove);- clusters.put(cluster.getName(), cluster);+ clusters.put(key(cluster.getRegion(), cluster.getName()), cluster);return cluster.getTags();}@@ -386,7 +433,11 @@ public class MemoryDbService {* verified as a SigV4 presigned URL.*/public boolean authenticate(String clusterName, String username, String secret) {- Cluster cluster = clusters.get(clusterName).orElse(null);+ return authenticate(clusterName, username, secret, currentRegion());+ }++ public boolean authenticate(String clusterName, String username, String secret, String region) {+ Cluster cluster = resourceGet(clusters, clusterName, region).orElse(null);if (cluster == null) {return false;}@@ -394,7 +445,7 @@ public class MemoryDbService {if (DEFAULT_ACL.equals(aclName)) {return true;}- Acl acl = acls.get(aclName).orElse(null);+ Acl acl = resourceGet(acls, aclName, region).orElse(null);if (acl == null) {return false;}@@ -402,7 +453,7 @@ public class MemoryDbService {if (!acl.getUserNames().contains(target)) {return false;}- User user = resolveUser(target);+ User user = resolveUser(target, region);if (user == null) {return false;}@@ -414,32 +465,33 @@ public class MemoryDbService {}/** True if the ACL has at least one user that requires a credential (password or IAM). */- private boolean isAuthRequired(String aclName) {+ private boolean isAuthRequired(String aclName, String region) {if (DEFAULT_ACL.equals(aclName)) {return false;}- Acl acl = acls.get(aclName).orElse(null);+ Acl acl = resourceGet(acls, aclName, region).orElse(null);if (acl == null) {return false;}return acl.getUserNames().stream()- .map(this::resolveUser)+ .map(name -> resolveUser(name, region)).filter(java.util.Objects::nonNull).anyMatch(u -> u.getAuthMode() != AuthMode.NO_PASSWORD);}- private void requireAclExists(String aclName) {- if (!DEFAULT_ACL.equals(aclName) && acls.get(aclName).isEmpty()) {+ private void requireAclExists(String aclName, String region) {+ if (!DEFAULT_ACL.equals(aclName) && resourceGet(acls, aclName, region).isEmpty()) {throw new AwsException("ACLNotFoundFault", "ACL " + aclName + " not found.", 404);}}- private boolean userExists(String name) {- return DEFAULT_USER.equals(name) || users.get(name).isPresent();+ private boolean userExists(String name, String region) {+ return DEFAULT_USER.equals(name) || resourceGet(users, name, region).isPresent();}- private User resolveUser(String name) {- return users.get(name).orElseGet(() -> DEFAULT_USER.equals(name) ? builtinDefaultUser(null) : null);+ private User resolveUser(String name, String region) {+ return resourceGet(users, name, region)+ .orElseGet(() -> DEFAULT_USER.equals(name) ? builtinDefaultUser(region) : null);}private User builtinDefaultUser(String region) {@@ -473,7 +525,17 @@ public class MemoryDbService {if (resourceArn == null) {throw new AwsException("InvalidParameterValueException", "ResourceArn is required.", 400);}- return clusters.scan(k -> true).stream()+ try {+ var arn = io.github.hectorvent.floci.core.common.AwsArnUtils.parse(resourceArn);+ if (!"memorydb".equals(arn.service()) || !currentRegion().equals(arn.region())+ || !regionResolver.getAccountId().equals(arn.accountId())) {+ throw new IllegalArgumentException("ARN owner mismatch");+ }+ } catch (IllegalArgumentException e) {+ throw new AwsException("ClusterNotFoundFault", "Cluster not found.", 404);+ }+ migrateLegacyClusters(currentRegion());+ return clusters.scan(k -> k.startsWith(currentRegion() + ":")).stream().filter(c -> resourceArn.equals(c.getArn())).findFirst().orElseThrow(() -> new AwsException("ClusterNotFoundFault", "Cluster not found.", 404));@@ -481,6 +543,7 @@ public class MemoryDbService {private void startBackend(Cluster cluster, boolean authRequired) {String name = cluster.getName();+ String identity = identityName(cluster.getAccountId(), cluster.getRegion(), name);int proxyPort = allocateProxyPort();String image = config.services().memorydb().defaultImage();LOG.infov("Creating MemoryDB cluster {0} with authRequired={1} on proxy port {2}",@@ -492,7 +555,7 @@ public class MemoryDbService {// from configuration and need no Docker, so the cluster is created and reaches// 'available' even when no daemon is reachable. Only connecting to the cache needs// the container.- handle = containerManager.tryStart(name, image);+ handle = containerManager.tryStart(identity, image);cluster.setClusterEndpoint(new Endpoint(resolveEndpointHost(), proxyPort));cluster.setProxyPort(proxyPort);@@ -501,9 +564,9 @@ public class MemoryDbService {cluster.setContainerHost(handle.getHost());cluster.setContainerPort(handle.getPort());- proxyManager.startProxy(name, authRequired, proxyPort,+ proxyManager.startProxy(identity, authRequired, proxyPort,handle.getHost(), handle.getPort(),- (username, secret) -> authenticate(name, username, secret));+ (username, secret) -> authenticate(name, username, secret, cluster.getRegion()));} else {LOG.warnv("MemoryDB cluster {0} created without a backing container: no Docker "+ "daemon is reachable. Metadata operations work; connections to the "@@ -511,7 +574,7 @@ public class MemoryDbService {}} catch (RuntimeException e) {LOG.warnv("MemoryDB cluster {0} provisioning failed, rolling back: {1}", name, e.getMessage());- rollbackBackend(name, handle, proxyPort);+ rollbackBackend(identity, handle, proxyPort);throw e;}}@@ -550,6 +613,132 @@ public class MemoryDbService {}}+ private String key(String region, String name) {+ return region + ":" + name;+ }++ private String currentRegion() {+ String region = regionResolver.getRegion();+ if (region != null) {+ return region;+ }+ String defaultRegion = regionResolver.getDefaultRegion();+ return defaultRegion != null ? defaultRegion : "us-east-1";+ }++ private String identityName(String accountId, String region, String name) {+ String defaultAccount = regionResolver.getDefaultAccountId();+ String defaultRegion = regionResolver.getDefaultRegion();+ if ((defaultAccount == null || java.util.Objects.equals(defaultAccount, accountId))+ && (defaultRegion == null || java.util.Objects.equals(defaultRegion, region))) {+ return name;+ }+ return accountId + "-" + region + "-" + name;+ }++ private <V> java.util.Optional<V> legacyGet(StorageBackend<String, V> store, String name, String region) {+ String defaultAccount = regionResolver.getDefaultAccountId();+ String defaultRegion = regionResolver.getDefaultRegion();+ if ((defaultAccount != null && !java.util.Objects.equals(defaultAccount, regionResolver.getAccountId()))+ || (defaultRegion != null && !java.util.Objects.equals(defaultRegion, region))) {+ return java.util.Optional.empty();+ }+ return store.get(name);+ }++ private <V> java.util.Optional<V> resourceGet(StorageBackend<String, V> store, String name, String region) {+ var result = store.get(key(region, name));+ if (result.isPresent()) {+ return result;+ }+ var legacy = legacyGet(store, name, region);+ if (legacy.isPresent()) {+ setOwner(legacy.get(), region);+ store.put(key(region, name), legacy.get());+ store.delete(name);+ }+ return legacy;+ }++ private void migrateLegacyClusters(String region) {+ migrateLegacy(clusters, region, Cluster.class);+ }++ private void migrateLegacyUsers(String region) {+ migrateLegacy(users, region, User.class);+ }++ private void migrateLegacyAcls(String region) {+ migrateLegacy(acls, region, Acl.class);+ }++ private <V> void migrateLegacy(StorageBackend<String, V> store, String region, Class<V> type) {+ if (!isDefaultOwner(region) || !(store instanceof AccountAwareStorageBackend<V> aware)) {+ return;+ }+ String accountId = regionResolver.getAccountId();+ for (V legacy : aware.scanUnscopedLegacy(value -> type.isInstance(value))) {+ String name = resourceName(legacy);+ if (name == null || name.isBlank()) {+ continue;+ }+ aware.getForAccountMigratingLegacyKeys(accountId, name, List.of(), value -> type.isInstance(value))+ .ifPresent(value -> migrateLegacyValue(aware, accountId, value, region));+ }+ // A named lookup through AccountAwareStorageBackend may have already moved an old+ // unscoped record to account/name without adding the new region component. Move those+ // intermediate keys as well so unfiltered operations cannot omit them.+ for (String legacyKey : aware.keysForAccount(accountId)) {+ if (legacyKey.contains(":")) {+ continue;+ }+ aware.getForAccount(accountId, legacyKey)+ .filter(type::isInstance)+ .ifPresent(value -> migrateLegacyValue(aware, accountId, value, region));+ }+ }++ private <V> void migrateLegacyValue(AccountAwareStorageBackend<V> aware, String accountId,+ V legacy, String region) {+ String name = resourceName(legacy);+ if (name == null || name.isBlank()) {+ return;+ }+ setOwner(legacy, region);+ aware.putForAccount(accountId, key(region, name), legacy);+ aware.deleteForAccount(accountId, name);+ }++ private String resourceName(Object resource) {+ return switch (resource) {+ case Cluster cluster -> cluster.getName();+ case User user -> user.getName();+ case Acl acl -> acl.getName();+ default -> null;+ };+ }++ private boolean isDefaultOwner(String region) {+ String defaultAccount = regionResolver.getDefaultAccountId();+ String defaultRegion = regionResolver.getDefaultRegion();+ return (defaultAccount == null || java.util.Objects.equals(defaultAccount, regionResolver.getAccountId()))+ && (defaultRegion == null || java.util.Objects.equals(defaultRegion, region));+ }++ private void setOwner(Object resource, String region) {+ String accountId = regionResolver.getAccountId();+ if (resource instanceof Cluster cluster) {+ cluster.setAccountId(accountId);+ cluster.setRegion(region);+ } else if (resource instanceof User user) {+ user.setAccountId(accountId);+ user.setRegion(region);+ } else if (resource instanceof Acl acl) {+ acl.setAccountId(accountId);+ acl.setRegion(region);+ }+ }+private String buildArn(String region, String resourceType, String name) {return regionResolver.buildArn("memorydb", region, resourceType + "/" + name);}diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManager.javaindex 9e7f431d2d..1f057b7beb 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManager.java@@ -121,7 +121,7 @@ public class MemoryDbContainerManager {.withDockerNetwork(config.services().memorydb().dockerNetwork()).withLogRotation().withLabels(ContainerStorageHelper.resourceIdentityLabels(- "memorydb", clusterName, regionResolver.getAccountId(), regionResolver.getDefaultRegion()));+ "memorydb", clusterName, regionResolver.getAccountId(), resolvedRegion()));if (!containerDetector.isRunningInContainer()) {specBuilder.withDynamicPort(BACKEND_PORT);@@ -145,7 +145,7 @@ public class MemoryDbContainerManager {: info.containerId();String logGroup = "/aws/memorydb/cluster/" + clusterName + "/engine-log";String logStream = logStreamer.generateLogStreamName(shortId);- String region = regionResolver.getDefaultRegion();+ String region = resolvedRegion();Closeable logHandle = logStreamer.attach(info.containerId(), logGroup, logStream, region, "memorydb:" + clusterName);@@ -241,6 +241,11 @@ public class MemoryDbContainerManager {return ContainerStorageHelper.resourceName(config, "memorydb", null, clusterName);}+ private String resolvedRegion() {+ String region = regionResolver.getRegion();+ return region != null ? region : regionResolver.getDefaultRegion();+ }+public void stopAll() {List<MemoryDbContainerHandle> handles = new ArrayList<>(activeContainers.values());if (!handles.isEmpty()) {diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Acl.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Acl.javaindex f419c8c531..89e1681b4f 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Acl.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Acl.java@@ -19,6 +19,8 @@ import java.util.List;public class Acl {private String name;+ private String accountId;+ private String region;private String status;private List<String> userNames = new ArrayList<>();private String minimumEngineVersion;@@ -30,6 +32,12 @@ public class Acl {public String getName() { return name; }public void setName(String name) { this.name = name; }+ public String getAccountId() { return accountId; }+ public void setAccountId(String accountId) { this.accountId = accountId; }++ public String getRegion() { return region; }+ public void setRegion(String region) { this.region = region; }+public String getStatus() { return status; }public void setStatus(String status) { this.status = status; }diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Cluster.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Cluster.javaindex 04326b0105..5f92e83e12 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Cluster.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/Cluster.java@@ -12,6 +12,8 @@ import java.util.Map;public class Cluster {private String name;+ private String accountId;+ private String region;private String description;private ClusterStatus status;private String nodeType;@@ -36,6 +38,12 @@ public class Cluster {public String getName() { return name; }public void setName(String name) { this.name = name; }+ public String getAccountId() { return accountId; }+ public void setAccountId(String accountId) { this.accountId = accountId; }++ public String getRegion() { return region; }+ public void setRegion(String region) { this.region = region; }+public String getDescription() { return description; }public void setDescription(String description) { this.description = description; }diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/User.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/User.javaindex cca69606f6..836f17dc33 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/model/User.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/model/User.java@@ -17,6 +17,8 @@ import java.util.List;public class User {private String name;+ private String accountId;+ private String region;private String status;private AuthMode authMode;private List<String> passwords = new ArrayList<>();@@ -30,6 +32,12 @@ public class User {public String getName() { return name; }public void setName(String name) { this.name = name; }+ public String getAccountId() { return accountId; }+ public void setAccountId(String accountId) { this.accountId = accountId; }++ public String getRegion() { return region; }+ public void setRegion(String region) { this.region = region; }+public String getStatus() { return status; }public void setStatus(String status) { this.status = status; }diff --git a/src/test/java/io/github/hectorvent/floci/services/memorydb/MemoryDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/memorydb/MemoryDbServiceTest.javaindex e5b8d4b677..444cc4dd97 100644--- a/src/test/java/io/github/hectorvent/floci/services/memorydb/MemoryDbServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/memorydb/MemoryDbServiceTest.java@@ -464,6 +464,57 @@ class MemoryDbServiceTest {assertEquals(ClusterStatus.AVAILABLE, service.getCluster("c1").getStatus());}+ @Test+ void sameNamesAreScopedToRegion() {+ User firstUser = passwordUser("shared-user", "one");+ User secondUser = passwordUser("shared-user", "two");+ service.createUser(firstUser, "us-east-1");+ service.createUser(secondUser, "eu-west-1");++ Acl firstAcl = acl("shared-acl", "shared-user");+ Acl secondAcl = acl("shared-acl", "shared-user");+ service.createAcl(firstAcl, "us-east-1");+ service.createAcl(secondAcl, "eu-west-1");++ Cluster first = cluster("shared-cluster", "shared-acl");+ Cluster second = cluster("shared-cluster", "shared-acl");+ service.createCluster(first, "us-east-1");+ service.createCluster(second, "eu-west-1");++ assertEquals("one", service.describeUsers("shared-user", "us-east-1").iterator().next()+ .getPasswords().get(0));+ assertEquals("two", service.describeUsers("shared-user", "eu-west-1").iterator().next()+ .getPasswords().get(0));+ assertEquals("arn:aws:memorydb:us-east-1:000000000000:cluster/shared-cluster",+ service.getCluster("shared-cluster", "us-east-1").getArn());+ assertEquals("arn:aws:memorydb:eu-west-1:000000000000:cluster/shared-cluster",+ service.getCluster("shared-cluster", "eu-west-1").getArn());+ assertThrows(AwsException.class, () -> service.getCluster("shared-cluster", "ap-southeast-1"));+ }++ private User passwordUser(String name, String password) {+ User user = new User();+ user.setName(name);+ user.setAuthMode(AuthMode.PASSWORD);+ user.setPasswords(List.of(password));+ user.setAccessString("on ~* +@all");+ return user;+ }++ private Acl acl(String name, String userName) {+ Acl acl = new Acl();+ acl.setName(name);+ acl.setUserNames(List.of("default", userName));+ return acl;+ }++ private Cluster cluster(String name, String aclName) {+ Cluster cluster = new Cluster();+ cluster.setName(name);+ cluster.setAclName(aclName);+ return cluster;+ }+@Testvoid createWithoutDockerDaemonStillReachesAvailable() {// tryStart() returns null when no Docker daemon is reachable. The cluster record is