Light, fluffy, and always free - The AWS Local Emulator alternative
feat(kms): add EnableKey support (#1381)
James Nethertonca5fb043a7e3
diff --git a/docs/services/kms.md b/docs/services/kms.mdindex bf9d8dbe0b..448c56263e 100644--- a/docs/services/kms.md+++ b/docs/services/kms.md@@ -26,6 +26,7 @@| `ListAliases` | List all aliases || `ScheduleKeyDeletion` | Mark a key for deletion || `CancelKeyDeletion` | Cancel pending deletion |+| `EnableKey` | Enable a key || `DisableKey` | Disable a key || `TagResource` | Tag a key || `UntagResource` | Remove tags |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.javaindex d35601b21c..40d1fd5592 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@@ -69,6 +69,7 @@ public class KmsJsonHandler {case "GetKeyRotationStatus" -> handleGetKeyRotationStatus(request, region);case "EnableKeyRotation" -> handleEnableKeyRotation(request, region);case "DisableKeyRotation" -> handleDisableKeyRotation(request, region);+ case "EnableKey" -> handleEnableKey(request, region);case "DisableKey" -> handleDisableKey(request, region);case "RotateKeyOnDemand" -> handleRotateKeyOnDemand(request, region);default -> Response.status(400)@@ -511,6 +512,11 @@ public class KmsJsonHandler {return Response.ok(objectMapper.createObjectNode()).build();}+ private Response handleEnableKey(JsonNode request, String region) {+ service.enableKey(request.path("KeyId").asText(), region);+ return Response.ok(objectMapper.createObjectNode()).build();+ }+private Response handleDisableKey(JsonNode request, String region) {service.disableKey(request.path("KeyId").asText(), region);return Response.ok(objectMapper.createObjectNode()).build();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.javaindex 2a5e9b8fb3..c53d46c028 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@@ -523,6 +523,18 @@ public class KmsService {LOG.infov("Disabled key rotation for KMS key: {0} in {1}", key.getKeyId(), region);}+ public void enableKey(String keyId, String region) {+ KmsKey key = resolveKey(keyId, region);+ if ("PendingDeletion".equals(key.getKeyState())) {+ throw new AwsException("KMSInvalidStateException",+ "KMS key " + key.getKeyId() + " is pending deletion.", 400);+ }+ key.setEnabled(true);+ key.setKeyState("Enabled");+ keyStore.put(region + "::" + key.getKeyId(), key);+ LOG.infov("Enabled KMS key: {0} in {1}", key.getKeyId(), region);+ }+public void disableKey(String keyId, String region) {KmsKey key = resolveKey(keyId, region);key.setEnabled(false);diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.javaindex 539b3f735f..abaaaddd8c 100644--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java@@ -381,6 +381,92 @@ class KmsIntegrationTest {.body("KeyMetadata.KeyState", equalTo("Disabled"));}+ @Test+ void enableKeyRestoresKeyState() {+ String keyId = given()+ .header("X-Amz-Target", "TrentService.CreateKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("{\"Description\":\"enable-key\"}")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract()+ .path("KeyMetadata.KeyId");++ given()+ .header("X-Amz-Target", "TrentService.DisableKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("""+ {"KeyId":"%s"}+ """.formatted(keyId))+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .header("X-Amz-Target", "TrentService.EnableKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("""+ {"KeyId":"%s"}+ """.formatted(keyId))+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .header("X-Amz-Target", "TrentService.DescribeKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("""+ {"KeyId":"%s"}+ """.formatted(keyId))+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("KeyMetadata.Enabled", equalTo(true))+ .body("KeyMetadata.KeyState", equalTo("Enabled"));+ }++ @Test+ void enableKeyOnPendingDeletionKeyFails() {+ String keyId = given()+ .header("X-Amz-Target", "TrentService.CreateKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("{\"Description\":\"enable-pending-deletion\"}")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract()+ .path("KeyMetadata.KeyId");++ given()+ .header("X-Amz-Target", "TrentService.ScheduleKeyDeletion")+ .contentType(KMS_CONTENT_TYPE)+ .body("""+ {"KeyId":"%s","PendingWindowInDays":7}+ """.formatted(keyId))+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .header("X-Amz-Target", "TrentService.EnableKey")+ .contentType(KMS_CONTENT_TYPE)+ .body("""+ {"KeyId":"%s"}+ """.formatted(keyId))+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("__type", equalTo("KMSInvalidStateException"));+ }+@Testvoid updateKeyDescriptionRequiresDescription() {String keyId = given()