Light, fluffy, and always free - The AWS Local Emulator alternative
fix(secretsmanager): return KmsKeyId in DescribeSecret and improve ListSecrets (#195)
Hector Ventura1e44f39c7c3f
diff --git a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.javaindex c4e7e22283..4defa51c44 100644--- a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java@@ -127,13 +127,18 @@ public class SecretsManagerJsonHandler {Secret secret = service.updateSecret(secretId, description, kmsKeyId, region);+ String versionId = null;if (secretString != null || secretBinary != null) {- service.putSecretValue(secretId, secretString, secretBinary, region);+ SecretVersion version = service.putSecretValue(secretId, secretString, secretBinary, region);+ versionId = version.getVersionId();}ObjectNode response = objectMapper.createObjectNode();response.put("ARN", secret.getArn());response.put("Name", secret.getName());+ if (versionId != null) {+ response.put("VersionId", versionId);+ }return Response.ok(response).build();}@@ -147,6 +152,9 @@ public class SecretsManagerJsonHandler {if (secret.getDescription() != null) {response.put("Description", secret.getDescription());}+ if (secret.getKmsKeyId() != null) {+ response.put("KmsKeyId", secret.getKmsKeyId());+ }response.put("RotationEnabled", secret.isRotationEnabled());if (secret.getCreatedDate() != null) {response.put("CreatedDate", secret.getCreatedDate().toEpochMilli() / 1000.0);@@ -196,9 +204,19 @@ public class SecretsManagerJsonHandler {if (secret.getDescription() != null) {node.put("Description", secret.getDescription());}+ if (secret.getKmsKeyId() != null) {+ node.put("KmsKeyId", secret.getKmsKeyId());+ }+ node.put("RotationEnabled", secret.isRotationEnabled());+ if (secret.getCreatedDate() != null) {+ node.put("CreatedDate", secret.getCreatedDate().toEpochMilli() / 1000.0);+ }if (secret.getLastChangedDate() != null) {node.put("LastChangedDate", secret.getLastChangedDate().toEpochMilli() / 1000.0);}+ if (secret.getLastAccessedDate() != null) {+ node.put("LastAccessedDate", secret.getLastAccessedDate().toEpochMilli() / 1000.0);+ }ArrayNode tagsArray = objectMapper.createArrayNode();if (secret.getTags() != null) {for (Secret.Tag tag : secret.getTags()) {diff --git a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandlerTest.javaindex 8002217444..effad9479f 100644--- a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandlerTest.java@@ -124,4 +124,36 @@ class SecretsManagerJsonHandlerTest {request.put("RequireEachIncludedType", false);assertThat(getRandomPassword(request), matchesPattern("[0-9]+"));}++ @Test+ void describeSecretResponseIncludesKmsKeyId() {+ ObjectNode createReq = MAPPER.createObjectNode();+ createReq.put("Name", "kms-secret");+ createReq.put("KmsKeyId", "my-kms-key");+ handler.handle("CreateSecret", createReq, REGION);++ ObjectNode describeReq = MAPPER.createObjectNode();+ describeReq.put("SecretId", "kms-secret");+ Response response = handler.handle("DescribeSecret", describeReq, REGION);++ assertThat(response.getStatus(), is(200));+ ObjectNode body = (ObjectNode) response.getEntity();+ assertThat(body.get("KmsKeyId").asText(), is("my-kms-key"));+ }++ @Test+ void listSecretsResponseIncludesKmsKeyId() {+ ObjectNode createReq = MAPPER.createObjectNode();+ createReq.put("Name", "list-kms-secret");+ createReq.put("KmsKeyId", "list-kms-key");+ handler.handle("CreateSecret", createReq, REGION);++ Response response = handler.handle("ListSecrets", MAPPER.createObjectNode(), REGION);++ assertThat(response.getStatus(), is(200));+ ObjectNode body = (ObjectNode) response.getEntity();+ ObjectNode secret = (ObjectNode) body.get("SecretList").get(0);+ assertThat(secret.get("KmsKeyId").asText(), is("list-kms-key"));+ assertThat(secret.has("CreatedDate"), is(true));+ }}diff --git a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.javaindex af329a4c84..79844e40fe 100644--- a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java@@ -200,4 +200,21 @@ class SecretsManagerServiceTest {SecretVersion fetched = service.getSecretValue("my-secret", v1Id, null, REGION);assertEquals("v1", fetched.getSecretString());}-}\ No newline at end of file++ @Test+ void kmsKeyIdIsPreserved() {+ String kmsKeyId = "arn:aws:kms:us-east-1:000000000000:key/my-key";+ // Signature: name, secretString, secretBinary, description, kmsKeyId, tags, region+ Secret secret = service.createSecret("kms-secret", "value", null,+ "desc", kmsKeyId, null, REGION);++ assertEquals(kmsKeyId, secret.getKmsKeyId());++ Secret described = service.describeSecret("kms-secret", REGION);+ assertEquals(kmsKeyId, described.getKmsKeyId());++ service.updateSecret("kms-secret", "new desc", "arn:aws:kms:us-east-1:000000000000:key/other-key", REGION);+ Secret updated = service.describeSecret("kms-secret", REGION);+ assertEquals("arn:aws:kms:us-east-1:000000000000:key/other-key", updated.getKmsKeyId());+ }+}