Light, fluffy, and always free - The AWS Local Emulator alternative
fix: persist SSE specification and return SSEDescription for encrypted tables (#1191)
Matt Van Horn9a7070992e76
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 33e07a9e28..38357827c4 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@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.dynamodb;+import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import com.fasterxml.jackson.databind.JsonNode;@@ -23,6 +24,9 @@ import java.util.*;@ApplicationScopedpublic class DynamoDbJsonHandler {+ private static final String DEFAULT_ACCOUNT_ID = "000000000000";+ private static final String SSE_TYPE_KMS = "KMS";+private final DynamoDbService dynamoDbService;private final DynamoDbStreamService dynamoDbStreamService;private final KinesisService kinesisService;@@ -189,6 +193,13 @@ public class DynamoDbJsonHandler {table.setStreamViewType(viewType);}+ JsonNode sseSpec = request.path("SSESpecification");+ if (!sseSpec.isMissingNode() && sseSpec.path("Enabled").asBoolean(false)) {+ table.setSseEnabled(true);+ table.setSseType(SSE_TYPE_KMS);+ table.setKmsMasterKeyArn(defaultKmsMasterKeyArn(region));+ }+ObjectNode response = objectMapper.createObjectNode();response.set("TableDescription", tableToNode(table));return Response.ok(response).build();@@ -1777,6 +1788,16 @@ public class DynamoDbJsonHandler {ptNode.put("NumberOfDecreasesToday", table.getProvisionedThroughput().getNumberOfDecreasesToday());node.set("ProvisionedThroughput", ptNode);+ if (table.isSseEnabled()) {+ ObjectNode sseDescription = objectMapper.createObjectNode();+ sseDescription.put("Status", "ENABLED");+ sseDescription.put("SSEType", table.getSseType() != null ? table.getSseType() : SSE_TYPE_KMS);+ sseDescription.put("KMSMasterKeyArn", table.getKmsMasterKeyArn() != null+ ? table.getKmsMasterKeyArn()+ : defaultKmsMasterKeyArn(AwsArnUtils.regionOrDefault(table.getTableArn(), "us-east-1")));+ node.set("SSEDescription", sseDescription);+ }+List<GlobalSecondaryIndex> gsis = table.getGlobalSecondaryIndexes();if (gsis != null && !gsis.isEmpty()) {ArrayNode gsiArray = objectMapper.createArrayNode();@@ -1865,6 +1886,11 @@ public class DynamoDbJsonHandler {return node;}+ private String defaultKmsMasterKeyArn(String region) {+ return AwsArnUtils.Arn.of("kms", region, DEFAULT_ACCOUNT_ID,+ "key/aws-managed-dynamodb").toString();+ }+private ObjectNode continuousBackupsDescriptionNode(TableDefinition table) {ObjectNode node = objectMapper.createObjectNode();node.put("ContinuousBackupsStatus", "ENABLED");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 06a31571c8..bce7ec54f9 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@@ -39,6 +39,9 @@ public class TableDefinition {private boolean streamEnabled;private String streamArn;private String streamViewType;+ private boolean sseEnabled;+ private String sseType;+ private String kmsMasterKeyArn;private List<KinesisStreamingDestination> kinesisStreamingDestinations;public TableDefinition() {@@ -148,6 +151,15 @@ public class TableDefinition {public String getStreamViewType() { return streamViewType; }public void setStreamViewType(String streamViewType) { this.streamViewType = streamViewType; }+ public boolean isSseEnabled() { return sseEnabled; }+ public void setSseEnabled(boolean sseEnabled) { this.sseEnabled = sseEnabled; }++ public String getSseType() { return sseType; }+ public void setSseType(String sseType) { this.sseType = sseType; }++ public String getKmsMasterKeyArn() { return kmsMasterKeyArn; }+ public void setKmsMasterKeyArn(String kmsMasterKeyArn) { this.kmsMasterKeyArn = kmsMasterKeyArn; }+public List<KinesisStreamingDestination> getKinesisStreamingDestinations() {return kinesisStreamingDestinations != null ? kinesisStreamingDestinations : new ArrayList<>();}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 1f0eb091f8..15fadc5abe 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@@ -62,7 +62,8 @@ class DynamoDbIntegrationTest {.statusCode(200).body("TableDescription.TableName", equalTo("TestTable")).body("TableDescription.TableStatus", equalTo("ACTIVE"))- .body("TableDescription.KeySchema.size()", equalTo(2));+ .body("TableDescription.KeySchema.size()", equalTo(2))+ .body("TableDescription.SSEDescription", nullValue());}@Test@@ -85,6 +86,83 @@ class DynamoDbIntegrationTest {.body("__type", equalTo("ResourceInUseException"));}+ @Test+ void createTableWithEnabledSseReturnsStableDescription() throws Exception {+ Response createResponse = given()+ .header("X-Amz-Target", "DynamoDB_20120810.CreateTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {+ "TableName": "SseTable",+ "KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],+ "AttributeDefinitions": [{"AttributeName": "pk", "AttributeType": "S"}],+ "BillingMode": "PAY_PER_REQUEST",+ "SSESpecification": {"Enabled": true}+ }+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("TableDescription.SSEDescription.Status", equalTo("ENABLED"))+ .body("TableDescription.SSEDescription.SSEType", equalTo("KMS"))+ .body("TableDescription.SSEDescription.KMSMasterKeyArn",+ startsWith("arn:aws:kms:us-east-1:000000000000:key/"))+ .extract()+ .response();++ ObjectMapper mapper = new ObjectMapper();+ JsonNode createSseDescription = mapper.readTree(createResponse.asString())+ .path("TableDescription").path("SSEDescription");++ Response firstDescribeResponse = given()+ .header("X-Amz-Target", "DynamoDB_20120810.DescribeTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "SseTable"}+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("Table.SSEDescription.Status", equalTo("ENABLED"))+ .body("Table.SSEDescription.SSEType", equalTo("KMS"))+ .extract()+ .response();++ JsonNode firstDescribeSseDescription = mapper.readTree(firstDescribeResponse.asString())+ .path("Table").path("SSEDescription");+ assertEquals(createSseDescription, firstDescribeSseDescription);++ Response secondDescribeResponse = given()+ .header("X-Amz-Target", "DynamoDB_20120810.DescribeTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "SseTable"}+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract()+ .response();++ JsonNode secondDescribeSseDescription = mapper.readTree(secondDescribeResponse.asString())+ .path("Table").path("SSEDescription");+ assertEquals(firstDescribeSseDescription, secondDescribeSseDescription);++ given()+ .header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")+ .contentType(DYNAMODB_CONTENT_TYPE)+ .body("""+ {"TableName": "SseTable"}+ """)+ .when()+ .post("/")+ .then()+ .statusCode(200);+ }+@Testvoid createTableWithGsiAndLsi() {given()