Light, fluffy, and always free - The AWS Local Emulator alternative
fix: enforce Glue table version checks (#1211)
David Phillipsec8e1cf85e40
diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.javaindex 7320620a5a..42992a7f12 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java@@ -79,8 +79,7 @@ public class GlueJsonHandler {case "UpdateTable" -> {String dbName = request.get("DatabaseName").asText();Table table = mapper.treeToValue(request.get("TableInput"), Table.class);- String versionId = request.path("VersionId").asText(null);- glueService.updateTable(dbName, table, versionId);+ glueService.updateTable(dbName, table, request.path("VersionId").asText(null));yield Response.ok().build();}case "GetTableVersions" -> {diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/GlueService.java b/src/main/java/io/github/hectorvent/floci/services/glue/GlueService.javaindex c18b36dcb8..d7914ba320 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/GlueService.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/GlueService.java@@ -141,7 +141,7 @@ public class GlueService {"Table not found: " + databaseName + "." + table.getName(), 400));if (versionId != null && !versionId.equals(existing.getVersionId())) {throw new AwsException("ConcurrentModificationException",- "Table was modified concurrently: " + databaseName + "." + table.getName(), 400);+ "Update table failed due to concurrent modifications.", 400);}validateSchemaReference(table);table.setDatabaseName(databaseName);@@ -418,4 +418,5 @@ public class GlueService {private static Map<String, String> copyMap(Map<String, String> source) {return source != null ? new LinkedHashMap<>(source) : null;}+}diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.javaindex e572042236..538101caef 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java@@ -213,6 +213,56 @@ class GlueServiceTest {assertEquals("b", fetched.getStorageDescriptor().getColumns().get(0).getName());}+ @Test+ void updateTableChecksVersionId() {+ Table table = new Table();+ table.setName("plain");+ glueService.createTable("db1", table);+ assertEquals("0", glueService.getTable("db1", "plain").getVersionId());++ Table nonCanonicalVersionReplacement = new Table();+ nonCanonicalVersionReplacement.setName("plain");+ AwsException nonCanonicalVersionEx = assertThrows(AwsException.class,+ () -> glueService.updateTable("db1", nonCanonicalVersionReplacement, "00"));+ assertEquals("ConcurrentModificationException", nonCanonicalVersionEx.getErrorCode());+ assertEquals("0", glueService.getTable("db1", "plain").getVersionId());++ Table nonNumericVersionReplacement = new Table();+ nonNumericVersionReplacement.setName("plain");+ AwsException nonNumericVersionEx = assertThrows(AwsException.class,+ () -> glueService.updateTable("db1", nonNumericVersionReplacement, "invalid"));+ assertEquals("ConcurrentModificationException", nonNumericVersionEx.getErrorCode());+ assertEquals("0", glueService.getTable("db1", "plain").getVersionId());++ Table firstReplacement = new Table();+ firstReplacement.setName("plain");+ firstReplacement.setDescription("first");+ glueService.updateTable("db1", firstReplacement, "0");+ assertEquals("1", glueService.getTable("db1", "plain").getVersionId());++ Table staleReplacement = new Table();+ staleReplacement.setName("plain");+ AwsException ex = assertThrows(AwsException.class,+ () -> glueService.updateTable("db1", staleReplacement, "0"));++ assertEquals("ConcurrentModificationException", ex.getErrorCode());+ assertEquals("Update table failed due to concurrent modifications.", ex.getMessage());+ }++ @Test+ void updateTableIncrementsMissingVersionId() {+ Table existing = new Table();+ existing.setName("plain");+ existing.setDatabaseName("db1");+ tableStore.put("db1:plain", existing);++ Table replacement = new Table();+ replacement.setName("plain");+ glueService.updateTable("db1", replacement);++ assertEquals("1", glueService.getTable("db1", "plain").getVersionId());+ }+@Testvoid getTableReturnsViewFieldsUnchanged() {Table table = new Table();