Light, fluffy, and always free - The AWS Local Emulator alternative
feat(redshift-serverless): add UpdateSnapshot (#5537)
Vũ Thế Huya95b01020b88
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.javaindex 4e3f3dc8cb..32f9b52de6 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java@@ -188,6 +188,9 @@ class RedshiftServerlessTest {assertThat(client.getSnapshot(request -> request.snapshotArn(created.snapshotArn())).snapshot().snapshotName()).isEqualTo(snapshotName);+ assertThat(client.updateSnapshot(request -> request+ .snapshotName(snapshotName).retentionPeriod(30)).snapshot().snapshotRetentionPeriod())+ .isEqualTo(30);assertThat(client.listSnapshots(request -> request.namespaceName(namespaceName)).snapshots()).extracting(Snapshot::snapshotName).containsExactly(snapshotName);diff --git a/docs/services/index.md b/docs/services/index.mdindex 69d15b4798..9e6ff94391 100644--- a/docs/services/index.md+++ b/docs/services/index.md@@ -76,7 +76,7 @@ Operation counts are exact. For dispatch-table services (Query and JSON 1.1) eac| [DMS](dms.md) | `POST /` + `X-Amz-Target: AmazonDMSv20160101.*` | JSON 1.1 | 20 || [Redshift](redshift.md) | `POST /` with `Action=` param + PostgreSQL container | Query + PostgreSQL wire (+ CFN) | 43 || [Redshift Data API](redshift-data.md) | `POST /` + `X-Amz-Target: RedshiftData.*` | JSON 1.1 | 11 |-| [Redshift Serverless](redshift-serverless.md) | `POST /` + `X-Amz-Target: RedshiftServerless.*` | JSON 1.1 | 24 |+| [Redshift Serverless](redshift-serverless.md) | `POST /` + `X-Amz-Target: RedshiftServerless.*` | JSON 1.1 | 25 || [EMR](emr.md) | `POST /` + `X-Amz-Target: ElasticMapReduce.*` | JSON 1.1 | 37 || [EMR Serverless](emr-serverless.md) | `/applications/*`, `/tags/*` | REST JSON | 10 || [Data Firehose](firehose.md) | `POST /` + `X-Amz-Target: Firehose_20150804.*` | JSON 1.1 | 12 |diff --git a/docs/services/redshift-serverless.md b/docs/services/redshift-serverless.mdindex 8c0a384a75..4b11f98c4b 100644--- a/docs/services/redshift-serverless.md+++ b/docs/services/redshift-serverless.md@@ -25,6 +25,7 @@ For the upstream API shape, see the [Amazon Redshift Serverless API Reference](h| `CreateSnapshot` | Create an `AVAILABLE` snapshot of a namespace, dumping the workgroup's database when it is running; a snapshot created in a standby Region stands in for a cross-Region copy || `GetSnapshot` | Return a snapshot by `snapshotName` or `snapshotArn` || `ListSnapshots` | Page through the snapshots in the Region, filtered by `namespaceName`, `namespaceArn`, `ownerAccount` and a `startTime`/`endTime` window |+| `UpdateSnapshot` | Change a snapshot's `retentionPeriod` (-1 for indefinite); an omitted period leaves it unchanged || `DeleteSnapshot` | Remove a snapshot and return it || `RestoreFromSnapshot` | Restore into an existing namespace and workgroup, replaying the snapshot's dump into the workgroup's database; neither is created || `CreateUsageLimit` | Set a usage limit on a workgroup, defaulting `period` to `monthly` and `breachAction` to `log` |@@ -109,3 +110,4 @@ aws redshift-serverless delete-workgroup --workgroup-name analytics-wgaws redshift-serverless delete-namespace --namespace-name analytics```- **Snapshots dump the database.** While the namespace's workgroup is running, `CreateSnapshot` runs `pg_dump` on its container and stores the dump under `<persistent-path>/redshift-serverless-dumps/<account>/<region>/`. `RestoreFromSnapshot` drops every user schema (the catalog bootstrap schema excepted) and replays the dump with `psql`, stopping at the first failing statement, so rows written after the snapshot are gone. The current contents are dumped first and put back if the replay fails, and a restore whose recorded dump file has gone missing fails instead of reporting success. A snapshot taken with no running workgroup is metadata only, and restoring it leaves the database untouched. `DeleteSnapshot` removes the dump. Snapshot ARNs use the snapshot name as their id, snapshot names are 3-255 lowercase letters, digits and hyphens, and `retentionPeriod` is `-1` (indefinite, the default) or 1 to 3653 days. Snapshots are taggable by ARN. `snapshotName` and `snapshotArn` cannot be sent together. Floci's own `floci_internal` bootstrap schema, which feeds the `svv_external_*` views from the Glue catalog, is left out of both the dump and the reset, matching AWS where the Glue catalog is outside a namespace snapshot, so a client schema with that exact name is not captured. A real snapshot expires after its retention period; Floci reports `snapshotRemainingDays` but does not expire snapshots.+- **`UpdateSnapshot` changes only `retentionPeriod`.** It is validated like `CreateSnapshot` (`-1` or 1 to 3653 days), `-1` makes the snapshot indefinite, and an omitted period leaves the snapshot unchanged. `snapshotRemainingDays` keeps counting from the creation time, because Floci stores no separate retention start.diff --git a/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandler.javaindex 40e81e6cd4..4b6a53a99d 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandler.java@@ -86,6 +86,7 @@ public class RedshiftServerlessJsonHandler {case "CreateSnapshot" -> handleCreateSnapshot(request, region);case "GetSnapshot" -> handleGetSnapshot(request, region);case "ListSnapshots" -> handleListSnapshots(request, region);+ case "UpdateSnapshot" -> handleUpdateSnapshot(request, region);case "DeleteSnapshot" -> handleDeleteSnapshot(request, region);case "RestoreFromSnapshot" -> handleRestoreFromSnapshot(request, region);case "CreateUsageLimit" -> handleCreateUsageLimit(request, region);@@ -244,6 +245,11 @@ public class RedshiftServerlessJsonHandler {return Response.ok(response).build();}+ private Response handleUpdateSnapshot(JsonNode request, String region) {+ return snapshotResponse(service.updateSnapshot(+ text(request, "snapshotName"), parseInteger(request, "retentionPeriod"), region));+ }+private Response handleDeleteSnapshot(JsonNode request, String region) {return snapshotResponse(service.deleteSnapshot(text(request, "snapshotName"), region));}diff --git a/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessService.java b/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessService.javaindex 94bd01733c..a8506fafc4 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessService.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessService.java@@ -471,6 +471,21 @@ public class RedshiftServerlessService implements Resettable {return snapshotArn.substring(prefix.length());}+ /**+ * Changes a snapshot's retention. An omitted period leaves the snapshot as it is, and -1 makes+ * it indefinite. {@code snapshotRemainingDays} keeps counting from the creation time, because+ * the snapshot carries no separate retention start.+ */+ public synchronized RedshiftServerlessSnapshot updateSnapshot(String snapshotName, Integer retentionPeriod,+ String region) {+ RedshiftServerlessSnapshot snapshot = new RedshiftServerlessSnapshot(getSnapshot(snapshotName, region));+ if (retentionPeriod != null) {+ snapshot.setRetentionPeriod(validateRetentionPeriod(retentionPeriod));+ snapshots.put(storageKey(region, snapshotName), snapshot);+ }+ return snapshot;+ }+public synchronized RedshiftServerlessSnapshot deleteSnapshot(String snapshotName, String region) {RedshiftServerlessSnapshot deleted = getSnapshot(snapshotName, region);snapshots.delete(storageKey(region, snapshotName));diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessIntegrationTest.javaindex ae6eaa1ca8..40d8a48ac8 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessIntegrationTest.java@@ -230,6 +230,14 @@ class RedshiftServerlessIntegrationTest {.statusCode(400).body("__type", equalTo("ValidationException"));+ call("UpdateSnapshot", "{\"snapshotName\":\"snap-life\",\"retentionPeriod\":30}")+ .statusCode(200)+ .body("snapshot.snapshotRetentionPeriod", equalTo(30))+ .body("snapshot.snapshotRemainingDays", equalTo(30));+ call("UpdateSnapshot", "{\"snapshotName\":\"snap-life\",\"retentionPeriod\":0}")+ .statusCode(400)+ .body("__type", equalTo("ValidationException"));+call("ListSnapshots", "{\"namespaceName\":\"snap-life-ns\",\"maxResults\":1}").statusCode(200).body("snapshots.snapshotName", hasItem("snap-life"));diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandlerTest.javaindex 4d7ca9dac0..a0bd873dc8 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessJsonHandlerTest.java@@ -76,6 +76,9 @@ class RedshiftServerlessJsonHandlerTest {iamDbUserResolver = mock(RedshiftIamDbUserResolver.class);when(iamDbUserResolver.resolveDbUser("AUTH")).thenReturn("IAM:alice");EmulatorConfig config = mock(EmulatorConfig.class, org.mockito.Mockito.RETURNS_DEEP_STUBS);+ when(storageFactory.create(eq("redshiftserverless"), eq("redshiftserverless-snapshots.json"),+ any(TypeReference.class))).thenReturn((AccountAwareStorageBackend)+ AccountAwareStorageBackend.inMemory(ACCOUNT_ID));when(config.storage().persistentPath()).thenReturn(System.getProperty("java.io.tmpdir"));when(storageFactory.create(eq("redshiftserverless"), eq("redshiftserverless-usagelimits.json"),any(TypeReference.class))).thenReturn((AccountAwareStorageBackend)@@ -472,6 +475,29 @@ class RedshiftServerlessJsonHandlerTest {return request;}+ @Test+ void updateSnapshotReturnsTheUpdatedSnapshotAndRejectsABadRetention() {+ create("upd-handler-ns");+ body(handler.handle("CreateSnapshot",+ parse("{\"snapshotName\":\"upd-handler\",\"namespaceName\":\"upd-handler-ns\",\"retentionPeriod\":7}"),+ REGION));++ JsonNode updated = body(handler.handle("UpdateSnapshot",+ parse("{\"snapshotName\":\"upd-handler\",\"retentionPeriod\":45}"), REGION)).get("snapshot");+ assertEquals("upd-handler", updated.get("snapshotName").textValue());+ assertEquals(45, updated.get("snapshotRetentionPeriod").intValue());+ assertEquals(45, updated.get("snapshotRemainingDays").intValue());++ JsonNode indefinite = body(handler.handle("UpdateSnapshot",+ parse("{\"snapshotName\":\"upd-handler\",\"retentionPeriod\":-1}"), REGION)).get("snapshot");+ assertTrue(indefinite.path("snapshotRetentionPeriod").isMissingNode());++ assertEquals(400, handler.handle("UpdateSnapshot",+ parse("{\"snapshotName\":\"upd-handler\",\"retentionPeriod\":0}"), REGION).getStatus());+ assertEquals(400, handler.handle("UpdateSnapshot",+ parse("{\"snapshotName\":\"missing-snap\",\"retentionPeriod\":5}"), REGION).getStatus());+ }+private JsonNode body(Response response) {assertEquals(200, response.getStatus(), "expected a successful response, got " + response.getEntity());return mapper.valueToTree(response.getEntity());diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.javaindex 57a8173de6..e0f5b48fa7 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java@@ -1026,6 +1026,49 @@ class RedshiftServerlessServiceTest {assertEquals("ResourceNotFoundException", missing.getErrorCode());}+ @Test+ void updateSnapshotChangesOnlyTheRetentionPeriod() {+ create("upd-snap-ns");+ service.createSnapshot("upd-snap", "upd-snap-ns", 30, Map.of("env", "dev"), REGION);++ RedshiftServerlessSnapshot updated = service.updateSnapshot("upd-snap", 90, REGION);++ assertEquals(90, updated.getRetentionPeriod());+ assertEquals(90, service.getSnapshot("upd-snap", REGION).getRetentionPeriod());+ assertEquals("upd-snap-ns", updated.getNamespaceName());+ assertEquals(Map.of("env", "dev"), service.listTagsForResource(updated.getSnapshotArn(), REGION));+ }++ @Test+ void updateSnapshotAcceptsIndefiniteRetentionAndLeavesAnOmittedPeriodAlone() {+ create("upd-indef-ns");+ service.createSnapshot("upd-indef", "upd-indef-ns", 30, null, REGION);++ assertEquals(30, service.updateSnapshot("upd-indef", null, REGION).getRetentionPeriod());+ assertNull(service.updateSnapshot("upd-indef", -1, REGION).getRetentionPeriod());+ assertNull(service.getSnapshot("upd-indef", REGION).getRetentionPeriod());+ }++ @Test+ void updateSnapshotRejectsAnInvalidRetentionWithoutChangingTheSnapshot() {+ create("upd-bad-ns");+ service.createSnapshot("upd-bad", "upd-bad-ns", 30, null, REGION);++ for (int bad : new int[] {0, 3654, -2}) {+ AwsException rejected = assertThrows(AwsException.class,+ () -> service.updateSnapshot("upd-bad", bad, REGION));+ assertEquals("ValidationException", rejected.getErrorCode());+ }+ assertEquals(30, service.getSnapshot("upd-bad", REGION).getRetentionPeriod());+ }++ @Test+ void updateSnapshotOfAnUnknownSnapshotIsNotFound() {+ AwsException missing = assertThrows(AwsException.class, () -> service.updateSnapshot("nope-snap", 5, REGION));+ assertEquals("ResourceNotFoundException", missing.getErrorCode());+ assertThrows(AwsException.class, () -> service.updateSnapshot(null, 5, REGION));+ }+private Namespace create(String namespaceName) {return service.createNamespace(namespaceName, "admin", null, null, null, null, null, Map.of(), REGION);}