Skip to content

armgit / floci

Public Imported from GitHub
0

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

feat(kms): support KeyId filter on ListAliases (#1651)

Mikel Amuchasteguicd7370c73035
diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
index ebd3682f79..1d864f8368 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
@@ -384,7 +384,9 @@ public class KmsJsonHandler {
}
private Response handleListAliases(JsonNode request, String region) {
- List<KmsAlias> aliases = service.listAliases(region);
+ JsonNode keyIdNode = request.path("KeyId");
+ String keyId = (keyIdNode.isMissingNode() || keyIdNode.isNull()) ? null : keyIdNode.asText();
+ List<KmsAlias> aliases = service.listAliases(keyId, region);
ObjectNode response = objectMapper.createObjectNode();
ArrayNode array = response.putArray("Aliases");
for (KmsAlias a : aliases) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
index 99668a0a46..a5f717635c 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
@@ -593,8 +593,19 @@ public class KmsService {
}
public List<KmsAlias> listAliases(String region) {
+ return listAliases(null, region);
+ }
+
+ public List<KmsAlias> listAliases(String keyId, String region) {
String prefix = region + "::";
- return aliasStore.scan(k -> k.startsWith(prefix));
+ List<KmsAlias> all = aliasStore.scan(k -> k.startsWith(prefix));
+ if (keyId == null || keyId.isBlank()) {
+ return all;
+ }
+ KmsKey key = resolveKey(keyId, region);
+ return all.stream()
+ .filter(a -> key.getKeyId().equals(a.getTargetKeyId()))
+ .toList();
}
// ──────────────────────────── Crypto Ops (Mocks) ────────────────────────────
diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
index 59ed08dd06..43fa45ee7c 100644
--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
@@ -533,6 +533,50 @@ class KmsServiceTest {
assertEquals(key.getKeyId(), resolved.getKeyId());
}
+ @Test
+ void listAliasesFilteredByKeyId() {
+ KmsKey key1 = kmsService.createKey(null, REGION);
+ KmsKey key2 = kmsService.createKey(null, REGION);
+ kmsService.createAlias("alias/key1-a", key1.getKeyId(), REGION);
+ kmsService.createAlias("alias/key1-b", key1.getKeyId(), REGION);
+ kmsService.createAlias("alias/key2-a", key2.getKeyId(), REGION);
+
+ List<KmsAlias> filtered = kmsService.listAliases(key1.getKeyId(), REGION);
+ assertEquals(2, filtered.size());
+ assertTrue(filtered.stream().allMatch(a -> key1.getKeyId().equals(a.getTargetKeyId())));
+ }
+
+ @Test
+ void listAliasesFilteredByKeyIdWithArn() {
+ KmsKey key1 = kmsService.createKey(null, REGION);
+ KmsKey key2 = kmsService.createKey(null, REGION);
+ kmsService.createAlias("alias/key1-a", key1.getKeyId(), REGION);
+ kmsService.createAlias("alias/key2-a", key2.getKeyId(), REGION);
+
+ List<KmsAlias> filtered = kmsService.listAliases(key1.getArn(), REGION);
+ assertEquals(1, filtered.size());
+ assertEquals("alias/key1-a", filtered.getFirst().getAliasName());
+ }
+
+ @Test
+ void listAliasesFilteredByKeyIdReturnsEmptyWhenNoAliases() {
+ KmsKey key1 = kmsService.createKey(null, REGION);
+ KmsKey key2 = kmsService.createKey(null, REGION);
+ kmsService.createAlias("alias/key2-a", key2.getKeyId(), REGION);
+
+ List<KmsAlias> filtered = kmsService.listAliases(key1.getKeyId(), REGION);
+ assertTrue(filtered.isEmpty());
+ }
+
+ @Test
+ void listAliasesFilteredByKeyIdWithAliasCreatedByArn() {
+ KmsKey key = kmsService.createKey(null, REGION);
+ kmsService.createAlias("alias/by-arn", key.getArn(), REGION);
+
+ List<KmsAlias> filtered = kmsService.listAliases(key.getKeyId(), REGION);
+ assertEquals(1, filtered.size());
+ }
+
@Test
void encryptAndDecryptWithId() {
KmsKey key = kmsService.createKey(null, REGION);