Light, fluffy, and always free - The AWS Local Emulator alternative
fix(dynamodb): enforce DeletionProtectionEnabled on create, update, and delete (#583)
Christine Nguyen2d1fe19d88a5
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.javaindex 6414cdccf9..155ea3035c 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbJsonHandler.java@@ -139,9 +139,13 @@ public class DynamoDbJsonHandler {String billingMode = request.has("BillingMode")? request.get("BillingMode").asText() : null;+ boolean deletionProtection = request.path("DeletionProtectionEnabled").asBoolean(false);+TableDefinition table = dynamoDbService.createTable(tableName, keySchema, attrDefs,readCapacity, writeCapacity, gsis, lsis, region);+ table.setDeletionProtectionEnabled(deletionProtection);+if ("PAY_PER_REQUEST".equals(billingMode)) {table.setBillingMode("PAY_PER_REQUEST");table.getProvisionedThroughput().setReadCapacityUnits(0L);@@ -176,6 +180,10 @@ public class DynamoDbJsonHandler {private Response handleDeleteTable(JsonNode request, String region) {String tableName = request.path("TableName").asText();TableDefinition table = dynamoDbService.describeTable(tableName, region);+ if (table.isDeletionProtectionEnabled()) {+ throw new AwsException("ResourceInUseException",+ "Table " + tableName + " can't be deleted while DeletionProtectionEnabled is set to true", 400);+ }dynamoDbService.deleteTable(tableName, region);table.setTableStatus("DELETING");@@ -507,6 +515,11 @@ public class DynamoDbJsonHandler {TableDefinition table = dynamoDbService.updateTable(tableName, readCapacity, writeCapacity,gsiCreates, gsiDeletes, newAttrDefs, region);+ JsonNode deletionProtectionNode = request.path("DeletionProtectionEnabled");+ if (!deletionProtectionNode.isMissingNode()) {+ table.setDeletionProtectionEnabled(deletionProtectionNode.asBoolean());+ }+String billingMode = request.has("BillingMode")? request.get("BillingMode").asText() : null;if (billingMode != null) {@@ -851,7 +864,7 @@ public class DynamoDbJsonHandler {node.put("CreationDateTime", table.getCreationDateTime().getEpochSecond());node.put("ItemCount", table.getItemCount());node.put("TableSizeBytes", table.getTableSizeBytes());- node.put("DeletionProtectionEnabled", false);+ node.put("DeletionProtectionEnabled", table.isDeletionProtectionEnabled());if ("PAY_PER_REQUEST".equals(table.getBillingMode())) {ObjectNode billing = objectMapper.createObjectNode();diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/TableDefinition.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/TableDefinition.javaindex ccfddfefc6..db8cd426e6 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/TableDefinition.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/TableDefinition.java@@ -34,6 +34,7 @@ public class TableDefinition {private boolean ttlEnabled;private boolean pointInTimeRecoveryEnabled;private int pointInTimeRecoveryRecoveryPeriodInDays;+ private boolean deletionProtectionEnabled;private boolean streamEnabled;private String streamArn;private String streamViewType;@@ -134,6 +135,9 @@ public class TableDefinition {this.pointInTimeRecoveryRecoveryPeriodInDays = pointInTimeRecoveryRecoveryPeriodInDays;}+ public boolean isDeletionProtectionEnabled() { return deletionProtectionEnabled; }+ public void setDeletionProtectionEnabled(boolean deletionProtectionEnabled) { this.deletionProtectionEnabled = deletionProtectionEnabled; }+public boolean isStreamEnabled() { return streamEnabled; }public void setStreamEnabled(boolean streamEnabled) { this.streamEnabled = streamEnabled; }diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.javaindex 08d38b6b8a..0441a837be 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java@@ -1682,6 +1682,87 @@ given().then().statusCode(200);}+ @Test+ @Order(32)+ void deletionProtectionEnabled() {+ String tableName = "deletion-protection-test";++ // Create table with DeletionProtectionEnabled = true+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.CreateTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {+ "TableName": "%s",+ "KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],+ "AttributeDefinitions": [{"AttributeName": "pk", "AttributeType": "S"}],+ "BillingMode": "PAY_PER_REQUEST",+ "DeletionProtectionEnabled": true+ }+ """.formatted(tableName))+ .when().post("/")+ .then().statusCode(200);++ // DescribeTable returns DeletionProtectionEnabled = true+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.DescribeTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "%s"}+ """.formatted(tableName))+ .when().post("/")+ .then()+ .statusCode(200)+ .body("Table.DeletionProtectionEnabled", equalTo(true));++ // DeleteTable is blocked+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "%s"}+ """.formatted(tableName))+ .when().post("/")+ .then()+ .statusCode(400)+ .body("__type", equalTo("ResourceInUseException"));++ // UpdateTable to disable deletion protection+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.UpdateTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {+ "TableName": "%s",+ "DeletionProtectionEnabled": false+ }+ """.formatted(tableName))+ .when().post("/")+ .then().statusCode(200);++ // DescribeTable returns DeletionProtectionEnabled = false+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.DescribeTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "%s"}+ """.formatted(tableName))+ .when().post("/")+ .then()+ .statusCode(200)+ .body("Table.DeletionProtectionEnabled", equalTo(false));++ // DeleteTable now succeeds+ given()+ .header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "%s"}+ """.formatted(tableName))+ .when().post("/")+ .then().statusCode(200);+ }+private static long crc32Of(byte[] bytes) {CRC32 crc = new CRC32();crc.update(bytes);